From 90a13a6c5a0742288db251c9ca23c36c1a57ea04 Mon Sep 17 00:00:00 2001
From: Bill Menees <13545825+menees@users.noreply.github.com>
Date: Sat, 18 Jul 2020 03:59:30 -0500
Subject: [PATCH 01/19] Fix SFTP file UTC time handling (#356)

* Improved SFTP file UTC time handling
---
 ...achedFollowedBySuccessInAlternateBranch.cs |   2 +-
 .../Classes/Common/BigIntegerTest.cs          |   2 +
 .../ChannelExtendedDataMessageTest.cs         |   2 +-
 .../Classes/Sftp/SftpFileReaderTestBase.cs    |   3 +-
 ...est_Ctor_FileModeAppend_FileAccessWrite.cs |   4 +-
 ...eadBuffer_NewLengthGreatherThanPosition.cs |   6 +-
 ...aInReadBuffer_NewLengthLessThanPosition.cs |   4 +-
 ...iteBuffer_NewLengthGreatherThanPosition.cs |   4 +-
 ...InWriteBuffer_NewLengthLessThanPosition.cs |   4 +-
 ...tLength_SessionOpen_FIleAccessReadWrite.cs |   4 +-
 ...t_SetLength_SessionOpen_FIleAccessWrite.cs |   4 +-
 ...tGreatherThanTwoTimesTheWriteBufferSize.cs |   4 +-
 .../Classes/SftpClientTest.cs                 |  10 +-
 src/Renci.SshNet.Tests/Common/Extensions.cs   |   4 +-
 .../Common/SftpFileAttributesBuilder.cs       |  10 +-
 src/Renci.SshNet/Sftp/SftpFile.cs             |   8 +-
 src/Renci.SshNet/Sftp/SftpFileAttributes.cs   | 118 +++++++++++++++---
 17 files changed, 144 insertions(+), 49 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest_Success_MultiList_PartialSuccessLimitReachedFollowedBySuccessInAlternateBranch.cs b/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest_Success_MultiList_PartialSuccessLimitReachedFollowedBySuccessInAlternateBranch.cs
index d60549e5..16f08ba9 100644
--- a/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest_Success_MultiList_PartialSuccessLimitReachedFollowedBySuccessInAlternateBranch.cs
+++ b/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest_Success_MultiList_PartialSuccessLimitReachedFollowedBySuccessInAlternateBranch.cs
@@ -181,4 +181,4 @@ namespace Renci.SshNet.Tests.Classes
             PublicKeyAuthenticationMethodMock.Verify(p => p.Authenticate(SessionMock.Object), Times.Exactly(2));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
index 8cca838d..c99fb2a6 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
@@ -1506,10 +1506,12 @@ namespace Renci.SshNet.Tests.Classes.Common
             Assert.AreEqual("0", a.ToString(), "#4");
 
             a = new BigInteger();
+#pragma warning disable CS1718 // Comparison made to same variable
             Assert.AreEqual(true, a == a, "#5");
 
             a = new BigInteger();
             Assert.AreEqual(false, a < a, "#6");
+#pragma warning restore CS1718 // Comparison made to same variable
 
             a = new BigInteger();
             Assert.AreEqual(true, a < 10L, "#7");
diff --git a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelExtendedDataMessageTest.cs b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelExtendedDataMessageTest.cs
index e50f5fa4..469908ea 100644
--- a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelExtendedDataMessageTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelExtendedDataMessageTest.cs
@@ -30,7 +30,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
         [Ignore] // placeholder
         public void ChannelExtendedDataMessageConstructorTest1()
         {
-            uint localChannelNumber = 0; // TODO: Initialize to an appropriate value
+            //uint localChannelNumber = 0; // TODO: Initialize to an appropriate value
             //ChannelExtendedDataMessage target = new ChannelExtendedDataMessage(localChannelNumber, null, null);
             Assert.Inconclusive("TODO: Implement code to verify target");
         }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
index fe73f9a6..2f2f1bbf 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
@@ -38,7 +38,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
 
         protected static SftpFileAttributes CreateSftpFileAttributes(long size)
         {
-            return new SftpFileAttributes(default(DateTime), default(DateTime), size, default(int), default(int), default(uint), null);
+            var utcDefault = DateTime.SpecifyKind(default(DateTime), DateTimeKind.Utc);
+            return new SftpFileAttributes(utcDefault, utcDefault, size, default(int), default(int), default(uint), null);
         }
 
         protected static byte[] CreateByteArray(Random random, int length)
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
index d8c4904c..87183067 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
@@ -34,8 +34,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _readBufferSize = (uint) _random.Next(5, 1000);
             _writeBufferSize = (uint) _random.Next(5, 1000);
             _handle = GenerateRandom(_random.Next(1, 10), _random);
-            _fileAttributes = new SftpFileAttributesBuilder().WithLastAccessTime(DateTime.Now.AddSeconds(_random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(_random.Next()))
+            _fileAttributes = new SftpFileAttributesBuilder().WithLastAccessTime(DateTime.UtcNow.AddSeconds(_random.Next()))
+                                                             .WithLastWriteTime(DateTime.UtcNow.AddSeconds(_random.Next()))
                                                              .WithSize(_random.Next())
                                                              .WithUserId(_random.Next())
                                                              .WithGroupId(_random.Next())
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
index aee4b276..59a0135f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
@@ -53,8 +53,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
                                                              .WithExtension("V", "VValue")
                                                              .WithGroupId(random.Next())
-                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastAccessTime(DateTime.UtcNow.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.UtcNow.AddSeconds(random.Next()))
                                                              .WithPermissions((uint) random.Next())
                                                              .WithSize(_length + 100)
                                                              .WithUserId(random.Next())
@@ -201,4 +201,4 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
index ae3952cc..a6116339 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
@@ -50,8 +50,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
                                                              .WithExtension("V", "VValue")
                                                              .WithGroupId(random.Next())
-                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastAccessTime(DateTime.UtcNow.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.UtcNow.AddSeconds(random.Next()))
                                                              .WithPermissions((uint)random.Next())
                                                              .WithSize(_length + 100)
                                                              .WithUserId(random.Next())
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
index 5a19aa3e..c71b43c8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
@@ -54,8 +54,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
                                                              .WithExtension("V", "VValue")
                                                              .WithGroupId(random.Next())
-                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastAccessTime(DateTime.UtcNow.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.UtcNow.AddSeconds(random.Next()))
                                                              .WithPermissions((uint)random.Next())
                                                              .WithSize(_length + 100)
                                                              .WithUserId(random.Next())
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
index cfcf2315..96ad14b1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
@@ -54,8 +54,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
                                                              .WithExtension("V", "VValue")
                                                              .WithGroupId(random.Next())
-                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastAccessTime(DateTime.UtcNow.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.UtcNow.AddSeconds(random.Next()))
                                                              .WithPermissions((uint) random.Next())
                                                              .WithSize(_length + 100)
                                                              .WithUserId(random.Next())
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
index 0fde319a..ef89483b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
@@ -48,8 +48,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
 
-            _fileAttributesLastAccessTime = DateTime.Now.AddSeconds(random.Next());
-            _fileAttributesLastWriteTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());
+            _fileAttributesLastWriteTime = DateTime.UtcNow.AddSeconds(random.Next());
             _fileAttributesSize = random.Next();
             _fileAttributesUserId = random.Next();
             _fileAttributesGroupId = random.Next();
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
index ce2619a5..73b5a953 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
@@ -48,8 +48,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
 
-            _fileAttributesLastAccessTime = DateTime.Now.AddSeconds(random.Next());
-            _fileAttributesLastWriteTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());
+            _fileAttributesLastWriteTime = DateTime.UtcNow.AddSeconds(random.Next());
             _fileAttributesSize = random.Next();
             _fileAttributesUserId = random.Next();
             _fileAttributesGroupId = random.Next();
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
index 68020d55..e7d53706 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
@@ -119,8 +119,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
         [TestMethod]
         public void LengthShouldFlushBufferAndReturnSizeOfFile()
         {
-            var lengthFileAttributes = new SftpFileAttributes(DateTime.Now,
-                                                              DateTime.Now,
+            var lengthFileAttributes = new SftpFileAttributes(DateTime.UtcNow,
+                                                              DateTime.UtcNow,
                                                               _random.Next(),
                                                               _random.Next(),
                                                               _random.Next(),
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs
index 3edd7c7b..f562f66b 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs
@@ -1076,7 +1076,9 @@ namespace Renci.SshNet.Tests.Classes
             SftpClient target = new SftpClient(connectionInfo); // TODO: Initialize to an appropriate value
             string path = string.Empty; // TODO: Initialize to an appropriate value
             DateTime lastAccessTime = new DateTime(); // TODO: Initialize to an appropriate value
+#pragma warning disable CS0618 // Type or member is obsolete
             target.SetLastAccessTime(path, lastAccessTime);
+#pragma warning restore CS0618 // Type or member is obsolete
             Assert.Inconclusive("A method that does not return a value cannot be verified.");
         }
 
@@ -1091,7 +1093,9 @@ namespace Renci.SshNet.Tests.Classes
             SftpClient target = new SftpClient(connectionInfo); // TODO: Initialize to an appropriate value
             string path = string.Empty; // TODO: Initialize to an appropriate value
             DateTime lastAccessTimeUtc = new DateTime(); // TODO: Initialize to an appropriate value
+#pragma warning disable CS0618 // Type or member is obsolete
             target.SetLastAccessTimeUtc(path, lastAccessTimeUtc);
+#pragma warning restore CS0618 // Type or member is obsolete
             Assert.Inconclusive("A method that does not return a value cannot be verified.");
         }
 
@@ -1106,7 +1110,9 @@ namespace Renci.SshNet.Tests.Classes
             SftpClient target = new SftpClient(connectionInfo); // TODO: Initialize to an appropriate value
             string path = string.Empty; // TODO: Initialize to an appropriate value
             DateTime lastWriteTime = new DateTime(); // TODO: Initialize to an appropriate value
+#pragma warning disable CS0618 // Type or member is obsolete
             target.SetLastWriteTime(path, lastWriteTime);
+#pragma warning restore CS0618 // Type or member is obsolete
             Assert.Inconclusive("A method that does not return a value cannot be verified.");
         }
 
@@ -1121,7 +1127,9 @@ namespace Renci.SshNet.Tests.Classes
             SftpClient target = new SftpClient(connectionInfo); // TODO: Initialize to an appropriate value
             string path = string.Empty; // TODO: Initialize to an appropriate value
             DateTime lastWriteTimeUtc = new DateTime(); // TODO: Initialize to an appropriate value
+#pragma warning disable CS0618 // Type or member is obsolete
             target.SetLastWriteTimeUtc(path, lastWriteTimeUtc);
+#pragma warning restore CS0618 // Type or member is obsolete
             Assert.Inconclusive("A method that does not return a value cannot be verified.");
         }
 
@@ -1403,4 +1411,4 @@ namespace Renci.SshNet.Tests.Classes
             public SftpDownloadAsyncResult DownloadResult { get; set; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Renci.SshNet.Tests/Common/Extensions.cs b/src/Renci.SshNet.Tests/Common/Extensions.cs
index 911f3413..4e88a790 100644
--- a/src/Renci.SshNet.Tests/Common/Extensions.cs
+++ b/src/Renci.SshNet.Tests/Common/Extensions.cs
@@ -49,8 +49,8 @@ namespace Renci.SshNet.Tests.Common
                 clonedExtensions = null;
             }
 
-            return new SftpFileAttributes(value.LastAccessTime,
-                                          value.LastWriteTime,
+            return new SftpFileAttributes(value.LastAccessTimeUtc,
+                                          value.LastWriteTimeUtc,
                                           value.Size,
                                           value.UserId,
                                           value.GroupId,
diff --git a/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
index 1f2d3324..2cf1b11a 100644
--- a/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
+++ b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
@@ -64,9 +64,15 @@ namespace Renci.SshNet.Tests.Common
         public SftpFileAttributes Build()
         {
             if (_lastAccessTime == null)
-                _lastAccessTime = DateTime.MinValue;
+                _lastAccessTime = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+            else if (_lastAccessTime.Value.Kind != DateTimeKind.Utc)
+                _lastAccessTime = _lastAccessTime.Value.ToUniversalTime();
+
             if (_lastWriteTime == null)
-                _lastWriteTime = DateTime.MinValue;
+                _lastWriteTime = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+            else if (_lastWriteTime.Value.Kind != DateTimeKind.Utc)
+                _lastWriteTime = _lastWriteTime.Value.ToUniversalTime();
+
             if (_size == null)
                 _size = 0;
             if (_userId == null)
diff --git a/src/Renci.SshNet/Sftp/SftpFile.cs b/src/Renci.SshNet/Sftp/SftpFile.cs
index de729e13..cfcc37a2 100644
--- a/src/Renci.SshNet/Sftp/SftpFile.cs
+++ b/src/Renci.SshNet/Sftp/SftpFile.cs
@@ -99,11 +99,11 @@ namespace Renci.SshNet.Sftp
         {
             get
             {
-                return Attributes.LastAccessTime.ToUniversalTime();
+                return Attributes.LastAccessTimeUtc;
             }
             set
             {
-                Attributes.LastAccessTime = value.ToLocalTime();
+                Attributes.LastAccessTimeUtc = value;
             }
         }
 
@@ -117,11 +117,11 @@ namespace Renci.SshNet.Sftp
         {
             get
             {
-                return Attributes.LastWriteTime.ToUniversalTime();
+                return Attributes.LastWriteTimeUtc;
             }
             set
             {
-                Attributes.LastWriteTime = value.ToLocalTime();
+                Attributes.LastWriteTimeUtc = value;
             }
         }
 
diff --git a/src/Renci.SshNet/Sftp/SftpFileAttributes.cs b/src/Renci.SshNet/Sftp/SftpFileAttributes.cs
index d99dfc2d..573deb92 100644
--- a/src/Renci.SshNet/Sftp/SftpFileAttributes.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileAttributes.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Globalization;
 using Renci.SshNet.Common;
+using System.Diagnostics;
 
 namespace Renci.SshNet.Sftp
 {
@@ -11,7 +12,7 @@ namespace Renci.SshNet.Sftp
     /// </summary>
     public class SftpFileAttributes
     {
-        #region Bitmask constats
+        #region Bitmask constants
 
         private const uint S_IFMT = 0xF000; //  bitmask for the file type bitfields
 
@@ -60,8 +61,8 @@ namespace Renci.SshNet.Sftp
         private bool _isGroupIDBitSet;
         private bool _isStickyBitSet;
 
-        private readonly DateTime _originalLastAccessTime;
-        private readonly DateTime _originalLastWriteTime;
+        private readonly DateTime _originalLastAccessTimeUtc;
+        private readonly DateTime _originalLastWriteTimeUtc;
         private readonly long _originalSize;
         private readonly int _originalUserId;
         private readonly int _originalGroupId;
@@ -70,12 +71,12 @@ namespace Renci.SshNet.Sftp
 
         internal bool IsLastAccessTimeChanged
         {
-            get { return _originalLastAccessTime != LastAccessTime; }
+            get { return _originalLastAccessTimeUtc != LastAccessTimeUtc; }
         }
 
         internal bool IsLastWriteTimeChanged
         {
-            get { return _originalLastWriteTime != LastWriteTime; }
+            get { return _originalLastWriteTimeUtc != LastWriteTimeUtc; }
         }
 
         internal bool IsSizeChanged
@@ -104,20 +105,58 @@ namespace Renci.SshNet.Sftp
         }
 
         /// <summary>
-        /// Gets or sets the time the current file or directory was last accessed.
+        /// Gets or sets the local time the current file or directory was last accessed.
         /// </summary>
         /// <value>
-        /// The time that the current file or directory was last accessed.
+        /// The local time that the current file or directory was last accessed.
         /// </value>
-        public DateTime LastAccessTime { get; set; }
+        public DateTime LastAccessTime
+        {
+            get
+            {
+                return ToLocalTime(this.LastAccessTimeUtc);
+            }
+
+            set
+            {
+                this.LastAccessTimeUtc = ToUniversalTime(value);
+            }
+        }
 
         /// <summary>
-        /// Gets or sets the time when the current file or directory was last written to.
+        /// Gets or sets the local time when the current file or directory was last written to.
         /// </summary>
         /// <value>
-        /// The time the current file was last written.
+        /// The local time the current file was last written.
         /// </value>
-        public DateTime LastWriteTime { get; set; }
+        public DateTime LastWriteTime
+        {
+            get
+            {
+                return ToLocalTime(this.LastWriteTimeUtc);
+            }
+
+            set
+            {
+                this.LastWriteTimeUtc = ToUniversalTime(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the UTC time the current file or directory was last accessed.
+        /// </summary>
+        /// <value>
+        /// The UTC time that the current file or directory was last accessed.
+        /// </value>
+        public DateTime LastAccessTimeUtc { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UTC time when the current file or directory was last written to.
+        /// </summary>
+        /// <value>
+        /// The UTC time the current file was last written.
+        /// </value>
+        public DateTime LastWriteTimeUtc { get; set; }
 
         /// <summary>
         /// Gets or sets the size, in bytes, of the current file.
@@ -395,10 +434,10 @@ namespace Renci.SshNet.Sftp
         {
         }
 
-        internal SftpFileAttributes(DateTime lastAccessTime, DateTime lastWriteTime, long size, int userId, int groupId, uint permissions, IDictionary<string, string> extensions)
+        internal SftpFileAttributes(DateTime lastAccessTimeUtc, DateTime lastWriteTimeUtc, long size, int userId, int groupId, uint permissions, IDictionary<string, string> extensions)
         {
-            LastAccessTime = _originalLastAccessTime = lastAccessTime;
-            LastWriteTime = _originalLastWriteTime = lastWriteTime;
+            LastAccessTimeUtc = _originalLastAccessTimeUtc = lastAccessTimeUtc;
+            LastWriteTimeUtc = _originalLastWriteTimeUtc = lastWriteTimeUtc;
             Size = _originalSize = size;
             UserId = _originalUserId = userId;
             GroupId = _originalGroupId = groupId;
@@ -491,9 +530,9 @@ namespace Renci.SshNet.Sftp
 
             if (IsLastAccessTimeChanged || IsLastWriteTimeChanged)
             {
-                var time = (uint)(LastAccessTime.ToFileTime() / 10000000 - 11644473600);
+                var time = (uint)(LastAccessTimeUtc.ToFileTimeUtc() / 10000000 - 11644473600);
                 stream.Write(time);
-                time = (uint)(LastWriteTime.ToFileTime() / 10000000 - 11644473600);
+                time = (uint)(LastWriteTimeUtc.ToFileTimeUtc() / 10000000 - 11644473600);
                 stream.Write(time);
             }
 
@@ -521,8 +560,8 @@ namespace Renci.SshNet.Sftp
             var userId = -1;
             var groupId = -1;
             uint permissions = 0;
-            var accessTime = DateTime.MinValue;
-            var modifyTime = DateTime.MinValue;
+            DateTime accessTime;
+            DateTime modifyTime;
             IDictionary<string, string> extensions = null;
 
             if ((flag & 0x00000001) == 0x00000001)   //  SSH_FILEXFER_ATTR_SIZE
@@ -544,10 +583,17 @@ namespace Renci.SshNet.Sftp
 
             if ((flag & 0x00000008) == 0x00000008)   //  SSH_FILEXFER_ATTR_ACMODTIME
             {
+                // The incoming times are "Unix times", so they're already in UTC.  We need to preserve that
+                // to avoid losing information in a local time conversion during the "fall back" hour in DST.
                 var time = stream.ReadUInt32();
-                accessTime = DateTime.FromFileTime((time + 11644473600) * 10000000);
+                accessTime = DateTime.FromFileTimeUtc((time + 11644473600) * 10000000);
                 time = stream.ReadUInt32();
-                modifyTime = DateTime.FromFileTime((time + 11644473600) * 10000000);
+                modifyTime = DateTime.FromFileTimeUtc((time + 11644473600) * 10000000);
+            }
+            else
+            {
+                accessTime = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+                modifyTime = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
             }
 
             if ((flag & 0x80000000) == 0x80000000)   //  SSH_FILEXFER_ATTR_EXTENDED
@@ -572,5 +618,37 @@ namespace Renci.SshNet.Sftp
                 return FromBytes(stream);
             }
         }
+
+        private static DateTime ToLocalTime(DateTime value)
+        {
+            DateTime result;
+
+            if (value == DateTime.MinValue)
+            {
+                result = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Local);
+            }
+            else
+            {
+                result = value.ToLocalTime();
+            }
+
+            return result;
+        }
+
+        private static DateTime ToUniversalTime(DateTime value)
+        {
+            DateTime result;
+
+            if (value == DateTime.MinValue)
+            {
+                result = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+            }
+            else
+            {
+                result = value.ToUniversalTime();
+            }
+
+            return result;
+        }
     }
 }

From cefdc203d98cd890815e029bc759bc43ec5a9643 Mon Sep 17 00:00:00 2001
From: Eric Brumfield <ericvbrumfield@gmail.com>
Date: Sun, 19 Jul 2020 12:49:12 -0400
Subject: [PATCH 02/19] Add ISftpClient interface to SftpClient (#197)

Add ISftpClient interface to **SftpClient for mocking and testing purposes.
Fixes #193.
---
 .../Renci.SshNet.Silverlight.csproj           |    3 +
 .../Renci.SshNet.Silverlight5.csproj          |    3 +
 .../Renci.SshNet.UAP10.csproj                 |    3 +
 .../Renci.SshNet.WindowsPhone.csproj          |    3 +
 .../Renci.SshNet.WindowsPhone8.csproj         |    5 +-
 src/Renci.SshNet/ISftpClient.cs               | 1065 +++++++++++++++++
 src/Renci.SshNet/SftpClient.cs                |    2 +-
 7 files changed, 1082 insertions(+), 2 deletions(-)
 create mode 100644 src/Renci.SshNet/ISftpClient.cs

diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index 6769eabf..39f66a0e 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -1183,6 +1183,9 @@
     </Compile>
     <Compile Include="..\Renci.SshNet\SftpClient.cs">
       <Link>SftpClient.cs</Link>
+    </Compile>
+	<Compile Include="..\Renci.SshNet\ISftpClient.cs">
+      <Link>ISftpClient.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 6892d3b6..fb59067a 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -1189,6 +1189,9 @@
     </Compile>
     <Compile Include="..\Renci.SshNet\SftpClient.cs">
       <Link>SftpClient.cs</Link>
+    </Compile>
+	<Compile Include="..\Renci.SshNet\ISftpClient.cs">
+      <Link>ISftpClient.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 0e66873e..bc78664d 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -381,6 +381,9 @@
     <Compile Include="..\Renci.SshNet\ISession.cs">
       <Link>ISession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\ISftpClient.cs">
+      <Link>ISftpClient.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\ISubsystemSession.cs">
       <Link>ISubsystemSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 9e1d2da0..6f7d4576 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -1168,6 +1168,9 @@
     </Compile>
     <Compile Include="..\Renci.SshNet\SftpClient.cs">
       <Link>SftpClient.cs</Link>
+    </Compile>
+	<Compile Include="..\Renci.SshNet\ISftpClient.cs">
+      <Link>ISftpClient.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 9fe3202e..cac46177 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -358,6 +358,9 @@
     <Compile Include="..\Renci.SshNet\ISession.cs">
       <Link>ISession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\ISftpClient.cs">
+      <Link>ISftpClient.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\ISubsystemSession.cs">
       <Link>ISubsystemSession.cs</Link>
     </Compile>
@@ -1441,7 +1444,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet/ISftpClient.cs b/src/Renci.SshNet/ISftpClient.cs
new file mode 100644
index 00000000..b1212cfe
--- /dev/null
+++ b/src/Renci.SshNet/ISftpClient.cs
@@ -0,0 +1,1065 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet
+{
+    /// <summary>
+    /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
+    /// </summary>
+    public interface ISftpClient
+    {
+        /// <summary>
+        /// Gets or sets the maximum size of the buffer in bytes.
+        /// </summary>
+        /// <value>
+        /// The size of the buffer. The default buffer size is 32768 bytes (32 KB).
+        /// </value>
+        /// <remarks>
+        /// <para>
+        /// For write operations, this limits the size of the payload for
+        /// individual SSH_FXP_WRITE messages. The actual size is always
+        /// capped at the maximum packet size supported by the peer
+        /// (minus the size of protocol fields).
+        /// </para>
+        /// <para>
+        /// For read operations, this controls the size of the payload which
+        /// is requested from the peer in a SSH_FXP_READ message. The peer
+        /// will send the requested number of bytes in a SSH_FXP_DATA message,
+        /// possibly split over multiple SSH_MSG_CHANNEL_DATA messages.
+        /// </para>
+        /// <para>
+        /// To optimize the size of the SSH packets sent by the peer,
+        /// the actual requested size will take into account the size of the
+        /// SSH_FXP_DATA protocol fields.
+        /// </para>
+        /// <para>
+        /// The size of the each indivual SSH_FXP_DATA message is limited to the
+        /// local maximum packet size of the channel, which is set to <c>64 KB</c>
+        /// for SSH.NET. However, the peer can limit this even further.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        uint BufferSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the operation timeout.
+        /// </summary>
+        /// <value>
+        /// The timeout to wait until an operation completes. The default value is negative
+        /// one (-1) milliseconds, which indicates an infinite timeout period.
+        /// </value>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="value"/> represents a value that is less than -1 or greater than <see cref="Int32.MaxValue"/> milliseconds.</exception>
+        TimeSpan OperationTimeout { get; set; }
+
+        /// <summary>
+        /// Gets sftp protocol version.
+        /// </summary>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        int ProtocolVersion { get; }
+
+        /// <summary>
+        /// Gets remote working directory.
+        /// </summary>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        string WorkingDirectory { get; }
+
+        /// <summary>
+        /// Appends lines to a file, creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The file to append the lines to. The file is created if it does not already exist.</param>
+        /// <param name="contents">The lines to append to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is<b>null</b> <para>-or-</para> <paramref name="contents"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM)
+        /// </remarks>
+        void AppendAllLines(string path, IEnumerable<string> contents);
+
+        /// <summary>
+        /// Appends lines to a file by using a specified encoding, creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The file to append the lines to. The file is created if it does not already exist.</param>
+        /// <param name="contents">The lines to append to the file.</param>
+        /// <param name="encoding">The character encoding to use.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void AppendAllLines(string path, IEnumerable<string> contents, Encoding encoding);
+
+        /// <summary>
+        /// Appends the specified string to the file, creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The file to append the specified string to.</param>
+        /// <param name="contents">The string to append to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </remarks>
+        void AppendAllText(string path, string contents);
+
+        /// <summary>
+        /// Appends the specified string to the file, creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The file to append the specified string to.</param>
+        /// <param name="contents">The string to append to the file.</param>
+        /// <param name="encoding">The character encoding to use.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void AppendAllText(string path, string contents, Encoding encoding);
+
+        /// <summary>
+        /// Creates a <see cref="StreamWriter"/> that appends UTF-8 encoded text to the specified file,
+        /// creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The path to the file to append to.</param>
+        /// <returns>
+        /// A <see cref="StreamWriter"/> that appends text to a file using UTF-8 encoding without a
+        /// Byte-Order Mark (BOM).
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        StreamWriter AppendText(string path);
+
+        /// <summary>
+        /// Creates a <see cref="StreamWriter"/> that appends text to a file using the specified
+        /// encoding, creating the file if it does not already exist.
+        /// </summary>
+        /// <param name="path">The path to the file to append to.</param>
+        /// <param name="encoding">The character encoding to use.</param>
+        /// <returns>
+        /// A <see cref="StreamWriter"/> that appends text to a file using the specified encoding.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        StreamWriter AppendText(string path, Encoding encoding);
+
+        /// <summary>
+        /// Begins an asynchronous file downloading into the stream.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="output">The output.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="output" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        IAsyncResult BeginDownloadFile(string path, Stream output);
+
+        /// <summary>
+        /// Begins an asynchronous file downloading into the stream.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="output">The output.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="output" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        IAsyncResult BeginDownloadFile(string path, Stream output, AsyncCallback asyncCallback);
+
+        /// <summary>
+        /// Begins an asynchronous file downloading into the stream.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="output">The output.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <param name="state">A user-provided object that distinguishes this particular asynchronous write request from other requests.</param>
+        /// <param name="downloadCallback">The download callback.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="output" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        IAsyncResult BeginDownloadFile(string path, Stream output, AsyncCallback asyncCallback, object state, Action<ulong> downloadCallback = null);
+
+        /// <summary>
+        /// Begins an asynchronous operation of retrieving list of files in remote directory.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <param name="state">A user-provided object that distinguishes this particular asynchronous write request from other requests.</param>
+        /// <param name="listCallback">The list callback.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        IAsyncResult BeginListDirectory(string path, AsyncCallback asyncCallback, object state, Action<int> listCallback = null);
+
+        /// <summary>
+        /// Begins the synchronize directories.
+        /// </summary>
+        /// <param name="sourcePath">The source path.</param>
+        /// <param name="destinationPath">The destination path.</param>
+        /// <param name="searchPattern">The search pattern.</param>
+        /// <param name="asyncCallback">The async callback.</param>
+        /// <param name="state">The state.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that represents the asynchronous directory synchronization.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="sourcePath"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="destinationPath"/> is <c>null</c> or contains only whitespace.</exception>
+        IAsyncResult BeginSynchronizeDirectories(string sourcePath, string destinationPath, string searchPattern, AsyncCallback asyncCallback, object state);
+
+        /// <summary>
+        /// Begins an asynchronous uploading the stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </para>
+        /// <para>
+        /// If the remote file already exists, it is overwritten and truncated.
+        /// </para>
+        /// </remarks>
+        IAsyncResult BeginUploadFile(Stream input, string path);
+
+        /// <summary>
+        /// Begins an asynchronous uploading the stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </para>
+        /// <para>
+        /// If the remote file already exists, it is overwritten and truncated.
+        /// </para>
+        /// </remarks>
+        IAsyncResult BeginUploadFile(Stream input, string path, AsyncCallback asyncCallback);
+
+        /// <summary>
+        /// Begins an asynchronous uploading the stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <param name="state">A user-provided object that distinguishes this particular asynchronous write request from other requests.</param>
+        /// <param name="uploadCallback">The upload callback.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </para>
+        /// <para>
+        /// If the remote file already exists, it is overwritten and truncated.
+        /// </para>
+        /// </remarks>
+        IAsyncResult BeginUploadFile(Stream input, string path, AsyncCallback asyncCallback, object state, Action<ulong> uploadCallback = null);
+
+        /// <summary>
+        /// Begins an asynchronous uploading the stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <param name="canOverride">Specified whether an existing file can be overwritten.</param>
+        /// <param name="asyncCallback">The method to be called when the asynchronous write operation is completed.</param>
+        /// <param name="state">A user-provided object that distinguishes this particular asynchronous write request from other requests.</param>
+        /// <param name="uploadCallback">The upload callback.</param>
+        /// <returns>
+        /// An <see cref="IAsyncResult" /> that references the asynchronous operation.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </para>
+        /// <para>
+        /// When <paramref name="path"/> refers to an existing file, set <paramref name="canOverride"/> to <c>true</c> to overwrite and truncate that file.
+        /// If <paramref name="canOverride"/> is <c>false</c>, the upload will fail and <see cref="EndUploadFile(IAsyncResult)"/> will throw an
+        /// <see cref="SshException"/>.
+        /// </para>
+        /// </remarks>
+        IAsyncResult BeginUploadFile(Stream input, string path, bool canOverride, AsyncCallback asyncCallback, object state, Action<ulong> uploadCallback = null);
+
+        /// <summary>
+        /// Changes remote directory to path.
+        /// </summary>
+        /// <param name="path">New directory path.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to change directory denied by remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void ChangeDirectory(string path);
+
+        /// <summary>
+        /// Changes permissions of file(s) to specified mode.
+        /// </summary>
+        /// <param name="path">File(s) path, may match multiple files.</param>
+        /// <param name="mode">The mode.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to change permission on the path(s) was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void ChangePermissions(string path, short mode);
+
+        /// <summary>
+        /// Creates or overwrites a file in the specified path.
+        /// </summary>
+        /// <param name="path">The path and name of the file to create.</param>
+        /// <returns>
+        /// A <see cref="SftpFileStream"/> that provides read/write access to the file specified in path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// If the target file already exists, it is first truncated to zero bytes.
+        /// </remarks>
+        SftpFileStream Create(string path);
+
+        /// <summary>
+        /// Creates or overwrites the specified file.
+        /// </summary>
+        /// <param name="path">The path and name of the file to create.</param>
+        /// <param name="bufferSize">The maximum number of bytes buffered for reads and writes to the file.</param>
+        /// <returns>
+        /// A <see cref="SftpFileStream"/> that provides read/write access to the file specified in path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// If the target file already exists, it is first truncated to zero bytes.
+        /// </remarks>
+        SftpFileStream Create(string path, int bufferSize);
+
+        /// <summary>
+        /// Creates remote directory specified by path.
+        /// </summary>
+        /// <param name="path">Directory path to create.</param>
+        /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to create the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void CreateDirectory(string path);
+
+        /// <summary>
+        /// Creates or opens a file for writing UTF-8 encoded text.
+        /// </summary>
+        /// <param name="path">The file to be opened for writing.</param>
+        /// <returns>
+        /// A <see cref="StreamWriter"/> that writes text to a file using UTF-8 encoding without
+        /// a Byte-Order Mark (BOM).
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        StreamWriter CreateText(string path);
+
+        /// <summary>
+        /// Creates or opens a file for writing text using the specified encoding.
+        /// </summary>
+        /// <param name="path">The file to be opened for writing.</param>
+        /// <param name="encoding">The character encoding to use.</param>
+        /// <returns>
+        /// A <see cref="StreamWriter"/> that writes to a file using the specified encoding.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        StreamWriter CreateText(string path, Encoding encoding);
+
+        /// <summary>
+        /// Deletes the specified file or directory.
+        /// </summary>
+        /// <param name="path">The name of the file or directory to be deleted. Wildcard characters are not supported.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void Delete(string path);
+
+        /// <summary>
+        /// Deletes remote directory specified by path.
+        /// </summary>
+        /// <param name="path">Directory to be deleted path.</param>
+        /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to delete the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void DeleteDirectory(string path);
+
+        /// <summary>
+        /// Deletes remote file specified by path.
+        /// </summary>
+        /// <param name="path">File to be deleted path.</param>
+        /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to delete the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void DeleteFile(string path);
+
+        /// <summary>
+        /// Downloads remote file specified by the path into the stream.
+        /// </summary>
+        /// <param name="path">File to download.</param>
+        /// <param name="output">Stream to write the file into.</param>
+        /// <param name="downloadCallback">The download callback.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="output" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>/// 
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        void DownloadFile(string path, Stream output, Action<ulong> downloadCallback = null);
+
+        /// <summary>
+        /// Ends an asynchronous file downloading into the stream.
+        /// </summary>
+        /// <param name="asyncResult">The pending asynchronous SFTP request.</param>
+        /// <exception cref="ArgumentException">The <see cref="IAsyncResult"/> object did not come from the corresponding async method on this type.<para>-or-</para><see cref="EndDownloadFile(IAsyncResult)"/> was called multiple times with the same <see cref="IAsyncResult"/>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SftpPathNotFoundException">The path was not found on the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        void EndDownloadFile(IAsyncResult asyncResult);
+
+        /// <summary>
+        /// Ends an asynchronous operation of retrieving list of files in remote directory.
+        /// </summary>
+        /// <param name="asyncResult">The pending asynchronous SFTP request.</param>
+        /// <returns>
+        /// A list of files.
+        /// </returns>
+        /// <exception cref="ArgumentException">The <see cref="IAsyncResult"/> object did not come from the corresponding async method on this type.<para>-or-</para><see cref="EndListDirectory(IAsyncResult)"/> was called multiple times with the same <see cref="IAsyncResult"/>.</exception>
+        IEnumerable<SftpFile> EndListDirectory(IAsyncResult asyncResult);
+
+        /// <summary>
+        /// Ends the synchronize directories.
+        /// </summary>
+        /// <param name="asyncResult">The async result.</param>
+        /// <returns>
+        /// A list of uploaded files.
+        /// </returns>
+        /// <exception cref="ArgumentException">The <see cref="IAsyncResult"/> object did not come from the corresponding async method on this type.<para>-or-</para><see cref="EndSynchronizeDirectories(IAsyncResult)"/> was called multiple times with the same <see cref="IAsyncResult"/>.</exception>
+        /// <exception cref="SftpPathNotFoundException">The destination path was not found on the remote host.</exception>
+        IEnumerable<FileInfo> EndSynchronizeDirectories(IAsyncResult asyncResult);
+
+        /// <summary>
+        /// Ends an asynchronous uploading the stream into remote file.
+        /// </summary>
+        /// <param name="asyncResult">The pending asynchronous SFTP request.</param>
+        /// <exception cref="ArgumentException">The <see cref="IAsyncResult"/> object did not come from the corresponding async method on this type.<para>-or-</para><see cref="EndUploadFile(IAsyncResult)"/> was called multiple times with the same <see cref="IAsyncResult"/>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The directory of the file was not found on the remote host.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        void EndUploadFile(IAsyncResult asyncResult);
+
+        /// <summary>
+        /// Checks whether file or directory exists;
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>
+        /// <c>true</c> if directory or file exists; otherwise <c>false</c>.
+        /// </returns>
+        /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        bool Exists(string path);
+
+        /// <summary>
+        /// Gets reference to remote file or directory.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>
+        /// A reference to <see cref="SftpFile"/> file object.
+        /// </returns>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="path" /> is <b>null</b>.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFile Get(string path);
+
+        /// <summary>
+        /// Gets the <see cref="SftpFileAttributes"/> of the file on the path.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// The <see cref="SftpFileAttributes"/> of the file on the path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFileAttributes GetAttributes(string path);
+
+        /// <summary>
+        /// Returns the date and time the specified file or directory was last accessed.
+        /// </summary>
+        /// <param name="path">The file or directory for which to obtain access date and time information.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> structure set to the date and time that the specified file or directory was last accessed.
+        /// This value is expressed in local time.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        DateTime GetLastAccessTime(string path);
+
+        /// <summary>
+        /// Returns the date and time, in coordinated universal time (UTC), that the specified file or directory was last accessed.
+        /// </summary>
+        /// <param name="path">The file or directory for which to obtain access date and time information.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> structure set to the date and time that the specified file or directory was last accessed.
+        /// This value is expressed in UTC time.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        DateTime GetLastAccessTimeUtc(string path);
+
+        /// <summary>
+        /// Returns the date and time the specified file or directory was last written to.
+        /// </summary>
+        /// <param name="path">The file or directory for which to obtain write date and time information.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> structure set to the date and time that the specified file or directory was last written to.
+        /// This value is expressed in local time.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        DateTime GetLastWriteTime(string path);
+
+        /// <summary>
+        /// Returns the date and time, in coordinated universal time (UTC), that the specified file or directory was last written to.
+        /// </summary>
+        /// <param name="path">The file or directory for which to obtain write date and time information.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> structure set to the date and time that the specified file or directory was last written to.
+        /// This value is expressed in UTC time.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        DateTime GetLastWriteTimeUtc(string path);
+
+        /// <summary>
+        /// Gets status using statvfs@openssh.com request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>
+        /// A <see cref="SftpFileSytemInformation"/> instance that contains file status information.
+        /// </returns>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="path" /> is <b>null</b>.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFileSytemInformation GetStatus(string path);
+
+        /// <summary>
+        /// Retrieves list of files in remote directory.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="listCallback">The list callback.</param>
+        /// <returns>
+        /// A list of files.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path" /> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        IEnumerable<SftpFile> ListDirectory(string path, Action<int> listCallback = null);
+
+        /// <summary>
+        /// Opens a <see cref="SftpFileStream"/> on the specified path with read/write access.
+        /// </summary>
+        /// <param name="path">The file to open.</param>
+        /// <param name="mode">A <see cref="FileMode"/> value that specifies whether a file is created if one does not exist, and determines whether the contents of existing files are retained or overwritten.</param>
+        /// <returns>
+        /// An unshared <see cref="SftpFileStream"/> that provides access to the specified file, with the specified mode and read/write access.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFileStream Open(string path, FileMode mode);
+
+        /// <summary>
+        /// Opens a <see cref="SftpFileStream"/> on the specified path, with the specified mode and access.
+        /// </summary>
+        /// <param name="path">The file to open.</param>
+        /// <param name="mode">A <see cref="FileMode"/> value that specifies whether a file is created if one does not exist, and determines whether the contents of existing files are retained or overwritten.</param>
+        /// <param name="access">A <see cref="FileAccess"/> value that specifies the operations that can be performed on the file.</param>
+        /// <returns>
+        /// An unshared <see cref="SftpFileStream"/> that provides access to the specified file, with the specified mode and access.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFileStream Open(string path, FileMode mode, FileAccess access);
+
+        /// <summary>
+        /// Opens an existing file for reading.
+        /// </summary>
+        /// <param name="path">The file to be opened for reading.</param>
+        /// <returns>
+        /// A read-only <see cref="SftpFileStream"/> on the specified path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        SftpFileStream OpenRead(string path);
+
+        /// <summary>
+        /// Opens an existing UTF-8 encoded text file for reading.
+        /// </summary>
+        /// <param name="path">The file to be opened for reading.</param>
+        /// <returns>
+        /// A <see cref="StreamReader"/> on the specified path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        StreamReader OpenText(string path);
+
+        /// <summary>
+        /// Opens a file for writing.
+        /// </summary>
+        /// <param name="path">The file to be opened for writing.</param>
+        /// <returns>
+        /// An unshared <see cref="SftpFileStream"/> object on the specified path with <see cref="FileAccess.Write"/> access.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// If the file does not exist, it is created.
+        /// </remarks>
+        SftpFileStream OpenWrite(string path);
+
+        /// <summary>
+        /// Opens a binary file, reads the contents of the file into a byte array, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <returns>
+        /// A byte array containing the contents of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        byte[] ReadAllBytes(string path);
+
+        /// <summary>
+        /// Opens a text file, reads all lines of the file using UTF-8 encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <returns>
+        /// A string array containing all lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        string[] ReadAllLines(string path);
+
+        /// <summary>
+        /// Opens a file, reads all lines of the file with the specified encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <param name="encoding">The encoding applied to the contents of the file.</param>
+        /// <returns>
+        /// A string array containing all lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        string[] ReadAllLines(string path, Encoding encoding);
+
+        /// <summary>
+        /// Opens a text file, reads all lines of the file with the UTF-8 encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <returns>
+        /// A string containing all lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        string ReadAllText(string path);
+
+        /// <summary>
+        /// Opens a file, reads all lines of the file with the specified encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <param name="encoding">The encoding applied to the contents of the file.</param>
+        /// <returns>
+        /// A string containing all lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        string ReadAllText(string path, Encoding encoding);
+
+        /// <summary>
+        /// Reads the lines of a file with the UTF-8 encoding.
+        /// </summary>
+        /// <param name="path">The file to read.</param>
+        /// <returns>
+        /// The lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        IEnumerable<string> ReadLines(string path);
+
+        /// <summary>
+        /// Read the lines of a file that has a specified encoding.
+        /// </summary>
+        /// <param name="path">The file to read.</param>
+        /// <param name="encoding">The encoding that is applied to the contents of the file.</param>
+        /// <returns>
+        /// The lines of the file.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        IEnumerable<string> ReadLines(string path, Encoding encoding);
+
+        /// <summary>
+        /// Renames remote file from old path to new path.
+        /// </summary>
+        /// <param name="oldPath">Path to the old file location.</param>
+        /// <param name="newPath">Path to the new file location.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="oldPath"/> is <b>null</b>. <para>-or-</para> or <paramref name="newPath"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to rename the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void RenameFile(string oldPath, string newPath);
+
+        /// <summary>
+        /// Renames remote file from old path to new path.
+        /// </summary>
+        /// <param name="oldPath">Path to the old file location.</param>
+        /// <param name="newPath">Path to the new file location.</param>
+        /// <param name="isPosix">if set to <c>true</c> then perform a posix rename.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="oldPath" /> is <b>null</b>. <para>-or-</para> or <paramref name="newPath" /> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to rename the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void RenameFile(string oldPath, string newPath, bool isPosix);
+
+        /// <summary>
+        /// Sets the specified <see cref="SftpFileAttributes"/> of the file on the specified path.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <param name="fileAttributes">The desired <see cref="SftpFileAttributes"/>.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void SetAttributes(string path, SftpFileAttributes fileAttributes);
+
+        /// <summary>
+        /// Creates a symbolic link from old path to new path.
+        /// </summary>
+        /// <param name="path">The old path.</param>
+        /// <param name="linkPath">The new path.</param>
+        /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="linkPath"/> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to create the symbolic link was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        void SymbolicLink(string path, string linkPath);
+
+        /// <summary>
+        /// Synchronizes the directories.
+        /// </summary>
+        /// <param name="sourcePath">The source path.</param>
+        /// <param name="destinationPath">The destination path.</param>
+        /// <param name="searchPattern">The search pattern.</param>
+        /// <returns>
+        /// A list of uploaded files.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="sourcePath"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="destinationPath"/> is <c>null</c> or contains only whitespace.</exception>
+        /// <exception cref="SftpPathNotFoundException"><paramref name="destinationPath"/> was not found on the remote host.</exception>
+        IEnumerable<FileInfo> SynchronizeDirectories(string sourcePath, string destinationPath, string searchPattern);
+
+        /// <summary>
+        /// Uploads stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <param name="uploadCallback">The upload callback.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        void UploadFile(Stream input, string path, Action<ulong> uploadCallback = null);
+
+        /// <summary>
+        /// Uploads stream into remote file.
+        /// </summary>
+        /// <param name="input">Data input stream.</param>
+        /// <param name="path">Remote file path.</param>
+        /// <param name="canOverride">if set to <c>true</c> then existing file will be overwritten.</param>
+        /// <param name="uploadCallback">The upload callback.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="input" /> is <b>null</b>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
+        /// </remarks>
+        void UploadFile(Stream input, string path, bool canOverride, Action<ulong> uploadCallback = null);
+
+        /// <summary>
+        /// Writes the specified byte array to the specified file, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="bytes">The bytes to write to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllBytes(string path, byte[] bytes);
+
+        /// <summary>
+        /// Writes a collection of strings to the file using the UTF-8 encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The lines to write to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </para>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllLines(string path, IEnumerable<string> contents);
+
+        /// <summary>
+        /// Writes a collection of strings to the file using the specified encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The lines to write to the file.</param>
+        /// <param name="encoding">The character encoding to use.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllLines(string path, IEnumerable<string> contents, Encoding encoding);
+
+        /// <summary>
+        /// Write the specified string array to the file using the UTF-8 encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The string array to write to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </para>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllLines(string path, string[] contents);
+
+        /// <summary>
+        /// Writes the specified string array to the file by using the specified encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The string array to write to the file.</param>
+        /// <param name="encoding">An <see cref="Encoding"/> object that represents the character encoding applied to the string array.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllLines(string path, string[] contents, Encoding encoding);
+
+        /// <summary>
+        /// Writes the specified string to the file using the UTF-8 encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The string to write to the file.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </para>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllText(string path, string contents);
+
+        /// <summary>
+        /// Writes the specified string to the file using the specified encoding, and closes the file.
+        /// </summary>
+        /// <param name="path">The file to write to.</param>
+        /// <param name="contents">The string to write to the file.</param>
+        /// <param name="encoding">The encoding to apply to the string.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
+        /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// <para>
+        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// </para>
+        /// <para>
+        /// If the target file does not exist, it is created.
+        /// </para>
+        /// </remarks>
+        void WriteAllText(string path, string contents, Encoding encoding);
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 5a099300..3c22290d 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -16,7 +16,7 @@ namespace Renci.SshNet
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public class SftpClient : BaseClient
+    public class SftpClient : BaseClient, ISftpClient
     {
         private static readonly Encoding Utf8NoBOM = new UTF8Encoding(false, true);
 

From dc9c637759b1aaa6832c3b03dc6c1b1e534a8f3c Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Sun, 27 Dec 2020 10:20:03 +0100
Subject: [PATCH 03/19] Refactor how connection is established to server.

---
 src/Renci.SshNet/Connection/ConnectorBase.cs  |  71 +++
 .../Connection/DirectConnector.cs             |  12 +
 src/Renci.SshNet/Connection/HttpConnector.cs  | 140 ++++++
 src/Renci.SshNet/Connection/IConnector.cs     |   9 +
 .../Connection/Socks4Connector.cs             | 103 ++++
 .../Connection/Socks5Connector.cs             | 231 +++++++++
 src/Renci.SshNet/ConnectionInfo.cs            |   3 +
 src/Renci.SshNet/IConnectionInfo.cs           |  44 ++
 src/Renci.SshNet/IServiceFactory.cs           |  13 +
 src/Renci.SshNet/ServiceFactory.cs            |  32 ++
 src/Renci.SshNet/Session.cs                   | 474 +-----------------
 11 files changed, 671 insertions(+), 461 deletions(-)
 create mode 100644 src/Renci.SshNet/Connection/ConnectorBase.cs
 create mode 100644 src/Renci.SshNet/Connection/DirectConnector.cs
 create mode 100644 src/Renci.SshNet/Connection/HttpConnector.cs
 create mode 100644 src/Renci.SshNet/Connection/IConnector.cs
 create mode 100644 src/Renci.SshNet/Connection/Socks4Connector.cs
 create mode 100644 src/Renci.SshNet/Connection/Socks5Connector.cs

diff --git a/src/Renci.SshNet/Connection/ConnectorBase.cs b/src/Renci.SshNet/Connection/ConnectorBase.cs
new file mode 100644
index 00000000..a1dd051f
--- /dev/null
+++ b/src/Renci.SshNet/Connection/ConnectorBase.cs
@@ -0,0 +1,71 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using Renci.SshNet.Messages.Transport;
+using System;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal abstract class ConnectorBase : IConnector
+    {
+        public abstract Socket Connect(IConnectionInfo connectionInfo);
+
+        /// <summary>
+        /// Establishes a socket connection to the specified host and port.
+        /// </summary>
+        /// <param name="host">The host name of the server to connect to.</param>
+        /// <param name="port">The port to connect to.</param>
+        /// <param name="timeout">The maximum time to wait for the connection to be established.</param>
+        /// <exception cref="SshOperationTimeoutException">The connection failed to establish within the configured <see cref="ConnectionInfo.Timeout"/>.</exception>
+        /// <exception cref="SocketException">An error occurred trying to establish the connection.</exception>
+        protected Socket SocketConnect(string host, int port, TimeSpan timeout)
+        {
+            var ipAddress = DnsAbstraction.GetHostAddresses(host)[0];
+            var ep = new IPEndPoint(ipAddress, port);
+
+            DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));
+
+            var socket = SocketAbstraction.Connect(ep, timeout);
+
+            const int socketBufferSize = 2 * Session.MaximumSshPacketSize;
+            socket.SendBufferSize = socketBufferSize;
+            socket.ReceiveBufferSize = socketBufferSize;
+            return socket;
+        }
+
+        protected static byte SocketReadByte(Socket socket)
+        {
+            var buffer = new byte[1];
+            SocketRead(socket, buffer, 0, 1);
+            return buffer[0];
+        }
+
+        /// <summary>
+        /// Performs a blocking read on the socket until <paramref name="length"/> bytes are received.
+        /// </summary>
+        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
+        /// <param name="buffer">An array of type <see cref="byte"/> that is the storage location for the received data.</param>
+        /// <param name="offset">The position in <paramref name="buffer"/> parameter to store the received data.</param>
+        /// <param name="length">The number of bytes to read.</param>
+        /// <returns>
+        /// The number of bytes read.
+        /// </returns>
+        /// <exception cref="SshConnectionException">The socket is closed.</exception>
+        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
+        /// <exception cref="SocketException">The read failed.</exception>
+        protected static int SocketRead(Socket socket, byte[] buffer, int offset, int length)
+        {
+            var bytesRead = SocketAbstraction.Read(socket, buffer, offset, length, Session.InfiniteTimeSpan);
+            if (bytesRead == 0)
+            {
+                // when we're in the disconnecting state (either triggered by client or server), then the
+                // SshConnectionException will interrupt the message listener loop (if not already interrupted)
+                // and the exception itself will be ignored (in RaiseError)
+                throw new SshConnectionException("An established connection was aborted by the server.",
+                                                 DisconnectReason.ConnectionLost);
+            }
+            return bytesRead;
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/DirectConnector.cs b/src/Renci.SshNet/Connection/DirectConnector.cs
new file mode 100644
index 00000000..05dc833e
--- /dev/null
+++ b/src/Renci.SshNet/Connection/DirectConnector.cs
@@ -0,0 +1,12 @@
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal class DirectConnector : ConnectorBase
+    {
+        public override Socket Connect(IConnectionInfo connectionInfo)
+        {
+            return SocketConnect(connectionInfo.Host, connectionInfo.Port, connectionInfo.Timeout);
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/HttpConnector.cs b/src/Renci.SshNet/Connection/HttpConnector.cs
new file mode 100644
index 00000000..c23bf327
--- /dev/null
+++ b/src/Renci.SshNet/Connection/HttpConnector.cs
@@ -0,0 +1,140 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Text.RegularExpressions;
+
+namespace Renci.SshNet.Connection
+{
+    internal class HttpConnector : ConnectorBase
+    {
+        public override Socket Connect(IConnectionInfo connectionInfo)
+        {
+            var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
+
+            var httpResponseRe = new Regex(@"HTTP/(?<version>\d[.]\d) (?<statusCode>\d{3}) (?<reasonPhrase>.+)$");
+            var httpHeaderRe = new Regex(@"(?<fieldName>[^\[\]()<>@,;:\""/?={} \t]+):(?<fieldValue>.+)?");
+
+            SocketAbstraction.Send(socket, SshData.Ascii.GetBytes(string.Format("CONNECT {0}:{1} HTTP/1.0\r\n", connectionInfo.Host, connectionInfo.Port)));
+
+            //  Sent proxy authorization is specified
+            if (!string.IsNullOrEmpty(connectionInfo.ProxyUsername))
+            {
+                var authorization = string.Format("Proxy-Authorization: Basic {0}\r\n",
+                                                  Convert.ToBase64String(SshData.Ascii.GetBytes(string.Format("{0}:{1}", connectionInfo.ProxyUsername, connectionInfo.ProxyPassword))));
+                SocketAbstraction.Send(socket, SshData.Ascii.GetBytes(authorization));
+            }
+
+            SocketAbstraction.Send(socket, SshData.Ascii.GetBytes("\r\n"));
+
+            HttpStatusCode? statusCode = null;
+            var contentLength = 0;
+
+            while (true)
+            {
+                var response = SocketReadLine(socket, connectionInfo.Timeout);
+                if (response == null)
+                {
+                    // server shut down socket
+                    break;
+                }
+
+                if (statusCode == null)
+                {
+                    var statusMatch = httpResponseRe.Match(response);
+                    if (statusMatch.Success)
+                    {
+                        var httpStatusCode = statusMatch.Result("${statusCode}");
+                        statusCode = (HttpStatusCode)int.Parse(httpStatusCode);
+                        if (statusCode != HttpStatusCode.OK)
+                        {
+                            var reasonPhrase = statusMatch.Result("${reasonPhrase}");
+                            throw new ProxyException(string.Format("HTTP: Status code {0}, \"{1}\"", httpStatusCode,
+                                reasonPhrase));
+                        }
+                    }
+
+                    continue;
+                }
+
+                // continue on parsing message headers coming from the server
+                var headerMatch = httpHeaderRe.Match(response);
+                if (headerMatch.Success)
+                {
+                    var fieldName = headerMatch.Result("${fieldName}");
+                    if (fieldName.Equals("Content-Length", StringComparison.OrdinalIgnoreCase))
+                    {
+                        contentLength = int.Parse(headerMatch.Result("${fieldValue}"));
+                    }
+                    continue;
+                }
+
+                // check if we've reached the CRLF which separates request line and headers from the message body
+                if (response.Length == 0)
+                {
+                    //  read response body if specified
+                    if (contentLength > 0)
+                    {
+                        var contentBody = new byte[contentLength];
+                        SocketRead(socket, contentBody, 0, contentLength);
+                    }
+                    break;
+                }
+            }
+
+            if (statusCode == null)
+            {
+                throw new ProxyException("HTTP response does not contain status line.");
+            }
+
+            return socket;
+        }
+
+        /// <summary>
+        /// Performs a blocking read on the socket until a line is read.
+        /// </summary>
+        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
+        /// <param name="timeout">A <see cref="TimeSpan"/> that represents the time to wait until a line is read.</param>
+        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
+        /// <exception cref="SocketException">An error occurred when trying to access the socket.</exception>
+        /// <returns>
+        /// The line read from the socket, or <c>null</c> when the remote server has shutdown and all data has been received.
+        /// </returns>
+        private static string SocketReadLine(Socket socket, TimeSpan timeout)
+        {
+            var encoding = SshData.Ascii;
+            var buffer = new List<byte>();
+            var data = new byte[1];
+
+            // read data one byte at a time to find end of line and leave any unhandled information in the buffer
+            // to be processed by subsequent invocations
+            do
+            {
+                var bytesRead = SocketAbstraction.Read(socket, data, 0, data.Length, timeout);
+                if (bytesRead == 0)
+                    // the remote server shut down the socket
+                    break;
+
+                var b = data[0];
+
+                if (b == Session.LineFeed && buffer.Count > 1 && buffer[buffer.Count - 1] == Session.CarriageReturn)
+                {
+                    // Return line without CR
+                    return encoding.GetString(buffer.ToArray(), 0, buffer.Count - 1);
+                }
+
+                buffer.Add(b);
+            }
+            while (true);
+
+            if (buffer.Count == 0)
+            {
+                return null;
+            }
+
+            return encoding.GetString(buffer.ToArray(), 0, buffer.Count);
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/IConnector.cs b/src/Renci.SshNet/Connection/IConnector.cs
new file mode 100644
index 00000000..7efc5c5f
--- /dev/null
+++ b/src/Renci.SshNet/Connection/IConnector.cs
@@ -0,0 +1,9 @@
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal interface IConnector
+    {
+        Socket Connect(IConnectionInfo connectionInfo);
+    }
+}
diff --git a/src/Renci.SshNet/Connection/Socks4Connector.cs b/src/Renci.SshNet/Connection/Socks4Connector.cs
new file mode 100644
index 00000000..64b15e07
--- /dev/null
+++ b/src/Renci.SshNet/Connection/Socks4Connector.cs
@@ -0,0 +1,103 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using System;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal class Socks4Connector : ConnectorBase
+    {
+        public override Socket Connect(IConnectionInfo connectionInfo)
+        {
+            var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
+
+            var connectionRequest = CreateSocks4ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port, connectionInfo.ProxyUsername);
+            SocketAbstraction.Send(socket, connectionRequest);
+
+            //  Read null byte
+            if (SocketReadByte(socket) != 0)
+            {
+                throw new ProxyException("SOCKS4: Null is expected.");
+            }
+
+            //  Read response code
+            var code = SocketReadByte(socket);
+
+            switch (code)
+            {
+                case 0x5a:
+                    break;
+                case 0x5b:
+                    throw new ProxyException("SOCKS4: Connection rejected.");
+                case 0x5c:
+                    throw new ProxyException("SOCKS4: Client is not running identd or not reachable from the server.");
+                case 0x5d:
+                    throw new ProxyException("SOCKS4: Client's identd could not confirm the user ID string in the request.");
+                default:
+                    throw new ProxyException("SOCKS4: Not valid response.");
+            }
+
+            var dummyBuffer = new byte[6]; // field 3 (2 bytes) and field 4 (4) should be ignored
+            SocketRead(socket, dummyBuffer, 0, 6);
+
+            return socket;
+        }
+
+        private static byte[] CreateSocks4ConnectionRequest(string hostname, ushort port, string username)
+        {
+            var addressBytes = GetSocks4DestinationAddress(hostname);
+
+            var connectionRequest = new byte
+                [
+                    // SOCKS version number
+                    1 +
+                    // Command code
+                    1 +
+                    // Port number
+                    2 +
+                    // IP address
+                    addressBytes.Length +
+                    // Username
+                    username.Length +
+                    // Null terminator
+                    1
+                ];
+
+            var index = 0;
+
+            // SOCKS version number
+            connectionRequest[index++] = 0x04;
+
+            // Command code
+            connectionRequest[index++] = 0x01; // establish a TCP/IP stream connection
+
+            // Port number
+            Pack.UInt16ToBigEndian(port, connectionRequest, index);
+            index += 2;
+
+            // Address
+            Buffer.BlockCopy(addressBytes, 0, connectionRequest, index, addressBytes.Length);
+            index += addressBytes.Length;
+
+            connectionRequest[index] = 0x00;
+
+            return connectionRequest;
+        }
+
+        private static byte[] GetSocks4DestinationAddress(string hostname)
+        {
+            var addresses = DnsAbstraction.GetHostAddresses(hostname);
+
+            for (var i = 0; i < addresses.Length; i++)
+            {
+                var address = addresses[i];
+                if (address.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    return address.GetAddressBytes();
+                }
+            }
+
+            throw new ProxyException(string.Format("SOCKS4 only supports IPv4. No such address found for '{0}'.", hostname));
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/Socks5Connector.cs b/src/Renci.SshNet/Connection/Socks5Connector.cs
new file mode 100644
index 00000000..c000af80
--- /dev/null
+++ b/src/Renci.SshNet/Connection/Socks5Connector.cs
@@ -0,0 +1,231 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using System;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal class Socks5Connector : ConnectorBase
+    {
+        public override Socket Connect(IConnectionInfo connectionInfo)
+        {
+            var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
+
+            var greeting = new byte[]
+                {
+                    // SOCKS version number
+                    0x05,
+                    // Number of supported authentication methods
+                    0x02,
+                    // No authentication
+                    0x00,
+                    // Username/Password authentication
+                    0x02
+                };
+            SocketAbstraction.Send(socket, greeting);
+
+            var socksVersion = SocketReadByte(socket);
+            if (socksVersion != 0x05)
+                throw new ProxyException(string.Format("SOCKS Version '{0}' is not supported.", socksVersion));
+
+            var authenticationMethod = SocketReadByte(socket);
+            switch (authenticationMethod)
+            {
+                case 0x00:
+                    break;
+                case 0x02:
+                    // Create username/password authentication request
+                    var authenticationRequest = CreateSocks5UserNameAndPasswordAuthenticationRequest(connectionInfo.ProxyUsername, connectionInfo.ProxyPassword);
+                    // Send authentication request
+                    SocketAbstraction.Send(socket, authenticationRequest);
+                    // Read authentication result
+                    var authenticationResult = SocketAbstraction.Read(socket, 2, connectionInfo.Timeout);
+
+                    if (authenticationResult[0] != 0x01)
+                        throw new ProxyException("SOCKS5: Server authentication version is not valid.");
+                    if (authenticationResult[1] != 0x00)
+                        throw new ProxyException("SOCKS5: Username/Password authentication failed.");
+                    break;
+                case 0xFF:
+                    throw new ProxyException("SOCKS5: No acceptable authentication methods were offered.");
+            }
+
+            var connectionRequest = CreateSocks5ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port);
+            SocketAbstraction.Send(socket, connectionRequest);
+
+            //  Read Server SOCKS5 version
+            if (SocketReadByte(socket) != 5)
+            {
+                throw new ProxyException("SOCKS5: Version 5 is expected.");
+            }
+
+            //  Read response code
+            var status = SocketReadByte(socket);
+
+            switch (status)
+            {
+                case 0x00:
+                    break;
+                case 0x01:
+                    throw new ProxyException("SOCKS5: General failure.");
+                case 0x02:
+                    throw new ProxyException("SOCKS5: Connection not allowed by ruleset.");
+                case 0x03:
+                    throw new ProxyException("SOCKS5: Network unreachable.");
+                case 0x04:
+                    throw new ProxyException("SOCKS5: Host unreachable.");
+                case 0x05:
+                    throw new ProxyException("SOCKS5: Connection refused by destination host.");
+                case 0x06:
+                    throw new ProxyException("SOCKS5: TTL expired.");
+                case 0x07:
+                    throw new ProxyException("SOCKS5: Command not supported or protocol error.");
+                case 0x08:
+                    throw new ProxyException("SOCKS5: Address type not supported.");
+                default:
+                    throw new ProxyException("SOCKS5: Not valid response.");
+            }
+
+            //  Read reserved byte
+            if (SocketReadByte(socket) != 0)
+            {
+                throw new ProxyException("SOCKS5: 0 byte is expected.");
+            }
+
+            var addressType = SocketReadByte(socket);
+            switch (addressType)
+            {
+                case 0x01:
+                    var ipv4 = new byte[4];
+                    SocketRead(socket, ipv4, 0, 4);
+                    break;
+                case 0x04:
+                    var ipv6 = new byte[16];
+                    SocketRead(socket, ipv6, 0, 16);
+                    break;
+                default:
+                    throw new ProxyException(string.Format("Address type '{0}' is not supported.", addressType));
+            }
+
+            var port = new byte[2];
+
+            //  Read 2 bytes to be ignored
+            SocketRead(socket, port, 0, 2);
+
+            return socket;
+        }
+
+        /// <summary>
+        /// https://tools.ietf.org/html/rfc1929
+        /// </summary>
+        private static byte[] CreateSocks5UserNameAndPasswordAuthenticationRequest(string username, string password)
+        {
+            if (username.Length > byte.MaxValue)
+                throw new ProxyException("Proxy username is too long.");
+            if (password.Length > byte.MaxValue)
+                throw new ProxyException("Proxy password is too long.");
+
+            var authenticationRequest = new byte
+                [
+                    // Version of the negotiation
+                    1 +
+                    // Length of the username
+                    1 +
+                    // Username
+                    username.Length +
+                    // Length of the password
+                    1 +
+                    // Password
+                    password.Length
+                ];
+
+            var index = 0;
+
+            // Version of the negiotiation
+            authenticationRequest[index++] = 0x01;
+
+            // Length of the username
+            authenticationRequest[index++] = (byte)username.Length;
+
+            // Username
+            SshData.Ascii.GetBytes(username, 0, username.Length, authenticationRequest, index);
+            index += username.Length;
+
+            // Length of the password
+            authenticationRequest[index++] = (byte)password.Length;
+
+            // Password
+            SshData.Ascii.GetBytes(password, 0, password.Length, authenticationRequest, index);
+
+            return authenticationRequest;
+        }
+
+        private static byte[] CreateSocks5ConnectionRequest(string hostname, ushort port)
+        {
+            byte addressType;
+            var addressBytes = GetSocks5DestinationAddress(hostname, out addressType);
+
+            var connectionRequest = new byte
+                [
+                    // SOCKS version number
+                    1 +
+                    // Command code
+                    1 +
+                    // Reserved
+                    1 +
+                    // Address type
+                    1 +
+                    // Address
+                    addressBytes.Length +
+                    // Port number
+                    2
+                ];
+
+            var index = 0;
+
+            // SOCKS version number
+            connectionRequest[index++] = 0x05;
+
+            // Command code
+            connectionRequest[index++] = 0x01; // establish a TCP/IP stream connection
+
+            // Reserved
+            connectionRequest[index++] = 0x00;
+
+            // Address type
+            connectionRequest[index++] = addressType;
+
+            // Address
+            Buffer.BlockCopy(addressBytes, 0, connectionRequest, index, addressBytes.Length);
+            index += addressBytes.Length;
+
+            // Port number
+            Pack.UInt16ToBigEndian(port, connectionRequest, index);
+
+            return connectionRequest;
+        }
+
+        private static byte[] GetSocks5DestinationAddress(string hostname, out byte addressType)
+        {
+            var ip = DnsAbstraction.GetHostAddresses(hostname)[0];
+
+            byte[] address;
+
+            switch (ip.AddressFamily)
+            {
+                case AddressFamily.InterNetwork:
+                    addressType = 0x01; // IPv4
+                    address = ip.GetAddressBytes();
+                    break;
+                case AddressFamily.InterNetworkV6:
+                    addressType = 0x04; // IPv6
+                    address = ip.GetAddressBytes();
+                    break;
+                default:
+                    throw new ProxyException(string.Format("SOCKS5: IP address '{0}' is not supported.", ip));
+            }
+
+            return address;
+        }
+    }
+}
diff --git a/src/Renci.SshNet/ConnectionInfo.cs b/src/Renci.SshNet/ConnectionInfo.cs
index 68df9fd4..af8e1ca5 100644
--- a/src/Renci.SshNet/ConnectionInfo.cs
+++ b/src/Renci.SshNet/ConnectionInfo.cs
@@ -88,6 +88,9 @@ namespace Renci.SshNet
         /// <summary>
         /// Gets connection host.
         /// </summary>
+        /// <value>
+        /// The connection host.
+        /// </value>
         public string Host { get; private set; }
 
         /// <summary>
diff --git a/src/Renci.SshNet/IConnectionInfo.cs b/src/Renci.SshNet/IConnectionInfo.cs
index a50c213b..22abefda 100644
--- a/src/Renci.SshNet/IConnectionInfo.cs
+++ b/src/Renci.SshNet/IConnectionInfo.cs
@@ -68,6 +68,50 @@ namespace Renci.SshNet
         /// </value>
         Encoding Encoding { get; }
 
+        /// <summary>
+        /// Gets connection host.
+        /// </summary>
+        /// <value>
+        /// The connection host.
+        /// </value>
+        string Host { get; }
+
+        /// <summary>
+        /// Gets connection port.
+        /// </summary>
+        /// <value>
+        /// The connection port. The default value is 22.
+        /// </value>
+        int Port { get; }
+
+        /// <summary>
+        /// Gets proxy type.
+        /// </summary>
+        /// <value>
+        /// The type of the proxy.
+        /// </value>
+        ProxyTypes ProxyType { get; }
+
+        /// <summary>
+        /// Gets proxy connection host.
+        /// </summary>
+        string ProxyHost { get; }
+
+        /// <summary>
+        /// Gets proxy connection port.
+        /// </summary>
+        int ProxyPort { get; }
+
+        /// <summary>
+        /// Gets proxy connection username.
+        /// </summary>
+        string ProxyUsername { get; }
+
+        /// <summary>
+        /// Gets proxy connection password.
+        /// </summary>
+        string ProxyPassword { get; }
+
         /// <summary>
         /// Gets the number of retry attempts when session channel creation failed.
         /// </summary>
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 8941af09..a244dda5 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Security;
 using Renci.SshNet.Sftp;
 
@@ -107,5 +108,17 @@ namespace Renci.SshNet
         /// with a shell.
         /// </returns>
         IRemotePathTransformation CreateRemotePathDoubleQuoteTransformation();
+
+        /// <summary>
+        /// Creates an <see cref="IConnector"/> that can be used to establish a connection
+        /// to the server identified by the specified <paramref name="connectionInfo"/>.
+        /// </summary>
+        /// <param name="connectionInfo">A <see cref="IConnectionInfo"/> detailing the server to establish a connection to.</param>
+        /// <returns>
+        /// An <see cref="IConnector"/>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="NotSupportedException">The <see cref="IConnectionInfo.ProxyType"/> value of <paramref name="connectionInfo"/> is not supported.</exception>
+        IConnector CreateConnector(IConnectionInfo connectionInfo);
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index 9d7e8310..e708f6a7 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -7,6 +7,7 @@ using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Security;
 using Renci.SshNet.Sftp;
 using Renci.SshNet.Abstractions;
+using Renci.SshNet.Connection;
 
 namespace Renci.SshNet
 {
@@ -188,5 +189,36 @@ namespace Renci.SshNet
         {
             return RemotePathTransformation.DoubleQuote;
         }
+
+        /// <summary>
+        /// Creates an <see cref="IConnector"/> that can be used to establish a connection
+        /// to the server identified by the specified <paramref name="connectionInfo"/>.
+        /// </summary>
+        /// <param name="connectionInfo">A <see cref="IConnectionInfo"/> detailing the server to establish a connection to.</param>
+        /// <returns>
+        /// An <see cref="IConnector"/> that can be used to establish a connection to the
+        /// server identified by the specified <paramref name="connectionInfo"/>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="NotSupportedException">The <see cref="IConnectionInfo.ProxyType"/> value of <paramref name="connectionInfo"/> is not supported.</exception>
+        public IConnector CreateConnector(IConnectionInfo connectionInfo)
+        {
+            if (connectionInfo == null)
+                throw new ArgumentNullException("connectionInfo");
+
+            switch (connectionInfo.ProxyType)
+            {
+                case ProxyTypes.None:
+                    return new DirectConnector();
+                case ProxyTypes.Socks4:
+                    return new Socks4Connector();
+                case ProxyTypes.Socks5:
+                    return new Socks5Connector();
+                case ProxyTypes.Http:
+                    return new HttpConnector();
+                default:
+                    throw new NotSupportedException(string.Format("ProxyTypes '{0}' is not supported.", connectionInfo.ProxyType));
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index d619895c..af7a7a74 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
@@ -18,6 +16,7 @@ using System.Globalization;
 using System.Linq;
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Security.Cryptography;
+using System.Collections.Generic;
 
 namespace Renci.SshNet
 {
@@ -27,7 +26,7 @@ namespace Renci.SshNet
     public class Session : ISession
     {
         private const byte Null = 0x00;
-        private const byte CarriageReturn = 0x0d;
+        internal const byte CarriageReturn = 0x0d;
         internal const byte LineFeed = 0x0a;
 
         /// <summary>
@@ -52,7 +51,7 @@ namespace Renci.SshNet
         /// <value>
         /// 68536 (64 KB + 3000 bytes).
         /// </value>
-        private const int MaximumSshPacketSize = LocalChannelDataPacketSize + 3000;
+        internal const int MaximumSshPacketSize = LocalChannelDataPacketSize + 3000;
 
         /// <summary>
         /// Holds the initial local window size for the channels.
@@ -587,24 +586,8 @@ namespace Renci.SshNet
                     // Build list of available messages while connecting
                     _sshMessageFactory = new SshMessageFactory();
 
-                    switch (ConnectionInfo.ProxyType)
-                    {
-                        case ProxyTypes.None:
-                            SocketConnect(ConnectionInfo.Host, ConnectionInfo.Port);
-                            break;
-                        case ProxyTypes.Socks4:
-                            SocketConnect(ConnectionInfo.ProxyHost, ConnectionInfo.ProxyPort);
-                            ConnectSocks4(_socket, ConnectionInfo);
-                            break;
-                        case ProxyTypes.Socks5:
-                            SocketConnect(ConnectionInfo.ProxyHost, ConnectionInfo.ProxyPort);
-                            ConnectSocks5(_socket, ConnectionInfo);
-                            break;
-                        case ProxyTypes.Http:
-                            SocketConnect(ConnectionInfo.ProxyHost, ConnectionInfo.ProxyPort);
-                            ConnectHttp(_socket, ConnectionInfo);
-                            break;
-                    }
+                    _socket = _serviceFactory.CreateConnector(ConnectionInfo)
+                                             .Connect(ConnectionInfo);
 
                     // Immediately send the identification string since the spec states both sides MUST send an identification string
                     // when the connection has been established
@@ -1698,54 +1681,6 @@ namespace Renci.SshNet
 
         #endregion
 
-        /// <summary>
-        /// Establishes a socket connection to the specified host and port.
-        /// </summary>
-        /// <param name="host">The host name of the server to connect to.</param>
-        /// <param name="port">The port to connect to.</param>
-        /// <exception cref="SshOperationTimeoutException">The connection failed to establish within the configured <see cref="Renci.SshNet.ConnectionInfo.Timeout"/>.</exception>
-        /// <exception cref="SocketException">An error occurred trying to establish the connection.</exception>
-        private void SocketConnect(string host, int port)
-        {
-            var ipAddress = DnsAbstraction.GetHostAddresses(host)[0];
-            var ep = new IPEndPoint(ipAddress, port);
-
-            DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));
-
-            _socket = SocketAbstraction.Connect(ep, ConnectionInfo.Timeout);
-
-            const int socketBufferSize = 2 * MaximumSshPacketSize;
-            _socket.SendBufferSize = socketBufferSize;
-            _socket.ReceiveBufferSize = socketBufferSize;
-        }
-
-        /// <summary>
-        /// Performs a blocking read on the socket until <paramref name="length"/> bytes are received.
-        /// </summary>
-        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
-        /// <param name="buffer">An array of type <see cref="byte"/> that is the storage location for the received data.</param>
-        /// <param name="offset">The position in <paramref name="buffer"/> parameter to store the received data.</param>
-        /// <param name="length">The number of bytes to read.</param>
-        /// <returns>
-        /// The number of bytes read.
-        /// </returns>
-        /// <exception cref="SshConnectionException">The socket is closed.</exception>
-        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
-        /// <exception cref="SocketException">The read failed.</exception>
-        private static int SocketRead(Socket socket, byte[] buffer, int offset, int length)
-        {
-            var bytesRead = SocketAbstraction.Read(socket, buffer, offset, length, InfiniteTimeSpan);
-            if (bytesRead == 0)
-            {
-                // when we're in the disconnecting state (either triggered by client or server), then the
-                // SshConnectionException will interrupt the message listener loop (if not already interrupted)
-                // and the exception itself will be ignored (in RaiseError)
-                throw new SshConnectionException("An established connection was aborted by the server.",
-                                                 DisconnectReason.ConnectionLost);
-            }
-            return bytesRead;
-        }
-
 #if FEATURE_SOCKET_POLL
         /// <summary>
         /// Gets a value indicating whether the socket is connected.
@@ -1896,13 +1831,16 @@ namespace Renci.SshNet
                             {
                                 DiagnosticAbstraction.Log(string.Format("[{0}] Shutting down socket.", ToHex(SessionId)));
 
-                                // interrupt any pending reads; should be done outside of socket read lock as we
-                                // actually want shutdown the socket to make sure blocking reads are interrupted
+                                // Interrupt any pending reads; should be done outside of socket read lock as we
+                                // actually want shutdown the socket to make sure blocking reads are interrupted.
                                 //
-                                // this may result in a SocketException (eg. An existing connection was forcibly
+                                // This may result in a SocketException (eg. An existing connection was forcibly
                                 // closed by the remote host) which we'll log and ignore as it means the socket
-                                // was already shut down
-                                _socket.Shutdown(SocketShutdown.Send);
+                                // was already shut down.
+                                //
+                                // We use SocketShutdown.Both instead of SocketShutdown.Send as a workaround to a
+                                // .NET Core issue on Linux & Mac OS X.
+                                _socket.Shutdown(SocketShutdown.Both);
                             }
                             catch (SocketException ex)
                             {
@@ -2026,392 +1964,6 @@ namespace Renci.SshNet
             }
         }
 
-        private static byte SocketReadByte(Socket socket)
-        {
-            var buffer = new byte[1];
-            SocketRead(socket, buffer, 0, 1);
-            return buffer[0];
-        }
-
-        private static void ConnectSocks4(Socket socket, ConnectionInfo connectionInfo)
-        {
-            var connectionRequest = CreateSocks4ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port, connectionInfo.ProxyUsername);
-            SocketAbstraction.Send(socket, connectionRequest);
-
-            //  Read null byte
-            if (SocketReadByte(socket) != 0)
-            {
-                throw new ProxyException("SOCKS4: Null is expected.");
-            }
-
-            //  Read response code
-            var code = SocketReadByte(socket);
-
-            switch (code)
-            {
-                case 0x5a:
-                    break;
-                case 0x5b:
-                    throw new ProxyException("SOCKS4: Connection rejected.");
-                case 0x5c:
-                    throw new ProxyException("SOCKS4: Client is not running identd or not reachable from the server.");
-                case 0x5d:
-                    throw new ProxyException("SOCKS4: Client's identd could not confirm the user ID string in the request.");
-                default:
-                    throw new ProxyException("SOCKS4: Not valid response.");
-            }
-
-            var dummyBuffer = new byte[6]; // field 3 (2 bytes) and field 4 (4) should be ignored
-            SocketRead(socket, dummyBuffer, 0, 6);
-        }
-
-        private static void ConnectSocks5(Socket socket, ConnectionInfo connectionInfo)
-        {
-            var greeting = new byte[]
-                {
-                    // SOCKS version number
-                    0x05,
-                    // Number of supported authentication methods
-                    0x02,
-                    // No authentication
-                    0x00,
-                    // Username/Password authentication
-                    0x02
-                };
-            SocketAbstraction.Send(socket, greeting);
-
-            var socksVersion = SocketReadByte(socket);
-            if (socksVersion != 0x05)
-                throw new ProxyException(string.Format("SOCKS Version '{0}' is not supported.", socksVersion));
-
-            var authenticationMethod = SocketReadByte(socket);
-            switch (authenticationMethod)
-            {
-                case 0x00:
-                    break;
-                case 0x02:
-                    // Create username/password authentication request
-                    var authenticationRequest = CreateSocks5UserNameAndPasswordAuthenticationRequest(connectionInfo.ProxyUsername, connectionInfo.ProxyPassword);
-                    // Send authentication request
-                    SocketAbstraction.Send(socket, authenticationRequest);
-                    // Read authentication result
-                    var authenticationResult = SocketAbstraction.Read(socket, 2, connectionInfo.Timeout);
-
-                    if (authenticationResult[0] != 0x01)
-                        throw new ProxyException("SOCKS5: Server authentication version is not valid.");
-                    if (authenticationResult[1] != 0x00)
-                        throw new ProxyException("SOCKS5: Username/Password authentication failed.");
-                    break;
-                case 0xFF:
-                    throw new ProxyException("SOCKS5: No acceptable authentication methods were offered.");
-            }
-
-            var connectionRequest = CreateSocks5ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port);
-            SocketAbstraction.Send(socket, connectionRequest);
-
-            //  Read Server SOCKS5 version
-            if (SocketReadByte(socket) != 5)
-            {
-                throw new ProxyException("SOCKS5: Version 5 is expected.");
-            }
-
-            //  Read response code
-            var status = SocketReadByte(socket);
-
-            switch (status)
-            {
-                case 0x00:
-                    break;
-                case 0x01:
-                    throw new ProxyException("SOCKS5: General failure.");
-                case 0x02:
-                    throw new ProxyException("SOCKS5: Connection not allowed by ruleset.");
-                case 0x03:
-                    throw new ProxyException("SOCKS5: Network unreachable.");
-                case 0x04:
-                    throw new ProxyException("SOCKS5: Host unreachable.");
-                case 0x05:
-                    throw new ProxyException("SOCKS5: Connection refused by destination host.");
-                case 0x06:
-                    throw new ProxyException("SOCKS5: TTL expired.");
-                case 0x07:
-                    throw new ProxyException("SOCKS5: Command not supported or protocol error.");
-                case 0x08:
-                    throw new ProxyException("SOCKS5: Address type not supported.");
-                default:
-                    throw new ProxyException("SOCKS5: Not valid response.");
-            }
-
-            //  Read reserved byte
-            if (SocketReadByte(socket) != 0)
-            {
-                throw new ProxyException("SOCKS5: 0 byte is expected.");
-            }
-
-            var addressType = SocketReadByte(socket);
-            switch (addressType)
-            {
-                case 0x01:
-                    var ipv4 = new byte[4];
-                    SocketRead(socket, ipv4, 0, 4);
-                    break;
-                case 0x04:
-                    var ipv6 = new byte[16];
-                    SocketRead(socket, ipv6, 0, 16);
-                    break;
-                default:
-                    throw new ProxyException(string.Format("Address type '{0}' is not supported.", addressType));
-            }
-
-            var port = new byte[2];
-
-            //  Read 2 bytes to be ignored
-            SocketRead(socket, port, 0, 2);
-        }
-
-        /// <summary>
-        /// https://tools.ietf.org/html/rfc1929
-        /// </summary>
-        private static byte[] CreateSocks5UserNameAndPasswordAuthenticationRequest(string username, string password)
-        {
-            if (username.Length > byte.MaxValue)
-                throw new ProxyException("Proxy username is too long.");
-            if (password.Length > byte.MaxValue)
-                throw new ProxyException("Proxy password is too long.");
-
-            var authenticationRequest = new byte
-                [
-                    // Version of the negotiation
-                    1 +
-                    // Length of the username
-                    1 +
-                    // Username
-                    username.Length +
-                    // Length of the password
-                    1 +
-                    // Password
-                    password.Length
-                ];
-
-            var index = 0;
-
-            // Version of the negiotiation
-            authenticationRequest[index++] = 0x01;
-
-            // Length of the username
-            authenticationRequest[index++] = (byte) username.Length;
-
-            // Username
-            SshData.Ascii.GetBytes(username, 0, username.Length, authenticationRequest, index);
-            index += username.Length;
-
-            // Length of the password
-            authenticationRequest[index++] = (byte) password.Length;
-
-            // Password
-            SshData.Ascii.GetBytes(password, 0, password.Length, authenticationRequest, index);
-
-            return authenticationRequest;
-        }
-
-        private static byte[] CreateSocks4ConnectionRequest(string hostname, ushort port, string username)
-        {
-            var addressBytes = GetSocks4DestinationAddress(hostname);
-
-            var connectionRequest = new byte
-                [
-                    // SOCKS version number
-                    1 +
-                    // Command code
-                    1 +
-                    // Port number
-                    2 +
-                    // IP address
-                    addressBytes.Length +
-                    // Username
-                    username.Length +
-                    // Null terminator
-                    1
-                ];
-
-            var index = 0;
-
-            // SOCKS version number
-            connectionRequest[index++] = 0x04;
-
-            // Command code
-            connectionRequest[index++] = 0x01; // establish a TCP/IP stream connection
-
-            // Port number
-            Pack.UInt16ToBigEndian(port, connectionRequest, index);
-            index += 2;
-
-            // Address
-            Buffer.BlockCopy(addressBytes, 0, connectionRequest, index, addressBytes.Length);
-            index += addressBytes.Length;
-
-            connectionRequest[index] = 0x00;
-
-            return connectionRequest;
-        }
-
-        private static byte[] CreateSocks5ConnectionRequest(string hostname, ushort port)
-        {
-            byte addressType;
-            var addressBytes = GetSocks5DestinationAddress(hostname, out addressType);
-
-            var connectionRequest = new byte
-                [
-                    // SOCKS version number
-                    1 +
-                    // Command code
-                    1 +
-                    // Reserved
-                    1 +
-                    // Address type
-                    1 +
-                    // Address
-                    addressBytes.Length +
-                    // Port number
-                    2
-                ];
-
-            var index = 0;
-
-            // SOCKS version number
-            connectionRequest[index++] = 0x05;
-
-            // Command code
-            connectionRequest[index++] = 0x01; // establish a TCP/IP stream connection
-
-            // Reserved
-            connectionRequest[index++] = 0x00;
-
-            // Address type
-            connectionRequest[index++] = addressType;
-            
-            // Address
-            Buffer.BlockCopy(addressBytes, 0, connectionRequest, index, addressBytes.Length);
-            index += addressBytes.Length;
-
-            // Port number
-            Pack.UInt16ToBigEndian(port, connectionRequest, index);
-
-            return connectionRequest;
-        }
-
-        private static byte[] GetSocks4DestinationAddress(string hostname)
-        {
-            var addresses = DnsAbstraction.GetHostAddresses(hostname);
-
-            for (var i = 0; i < addresses.Length; i++)
-            {
-                var address = addresses[i];
-                if (address.AddressFamily == AddressFamily.InterNetwork)
-                    return address.GetAddressBytes();
-            }
-
-            throw new ProxyException(string.Format("SOCKS4 only supports IPv4. No such address found for '{0}'.", hostname));
-        }
-
-        private static byte[] GetSocks5DestinationAddress(string hostname, out byte addressType)
-        {
-            var ip = DnsAbstraction.GetHostAddresses(hostname)[0];
-
-            byte[] address;
-
-            switch (ip.AddressFamily)
-            {
-                case AddressFamily.InterNetwork:
-                    addressType = 0x01; // IPv4
-                    address = ip.GetAddressBytes();
-                    break;
-                case AddressFamily.InterNetworkV6:
-                    addressType = 0x04; // IPv6
-                    address = ip.GetAddressBytes();
-                    break;
-                default:
-                    throw new ProxyException(string.Format("SOCKS5: IP address '{0}' is not supported.", ip));
-            }
-
-            return address;
-        }
-
-        private static void ConnectHttp(Socket socket, ConnectionInfo connectionInfo)
-        {
-            var httpResponseRe = new Regex(@"HTTP/(?<version>\d[.]\d) (?<statusCode>\d{3}) (?<reasonPhrase>.+)$");
-            var httpHeaderRe = new Regex(@"(?<fieldName>[^\[\]()<>@,;:\""/?={} \t]+):(?<fieldValue>.+)?");
-
-            SocketAbstraction.Send(socket, SshData.Ascii.GetBytes(string.Format("CONNECT {0}:{1} HTTP/1.0\r\n", connectionInfo.Host, connectionInfo.Port)));
-
-            //  Sent proxy authorization is specified
-            if (!string.IsNullOrEmpty(connectionInfo.ProxyUsername))
-            {
-                var authorization = string.Format("Proxy-Authorization: Basic {0}\r\n",
-                                                  Convert.ToBase64String(SshData.Ascii.GetBytes(string.Format("{0}:{1}", connectionInfo.ProxyUsername, connectionInfo.ProxyPassword)))
-                                                  );
-                SocketAbstraction.Send(socket, SshData.Ascii.GetBytes(authorization));
-            }
-
-            SocketAbstraction.Send(socket, SshData.Ascii.GetBytes("\r\n"));
-
-            HttpStatusCode? statusCode = null;
-            var contentLength = 0;
-
-            while (true)
-            {
-                var response = SocketReadLine(socket, connectionInfo.Timeout);
-                if (response == null)
-                    // server shut down socket
-                    break;
-
-                if (statusCode == null)
-                {
-                    var statusMatch = httpResponseRe.Match(response);
-                    if (statusMatch.Success)
-                    {
-                        var httpStatusCode = statusMatch.Result("${statusCode}");
-                        statusCode = (HttpStatusCode) int.Parse(httpStatusCode);
-                        if (statusCode != HttpStatusCode.OK)
-                        {
-                            var reasonPhrase = statusMatch.Result("${reasonPhrase}");
-                            throw new ProxyException(string.Format("HTTP: Status code {0}, \"{1}\"", httpStatusCode,
-                                reasonPhrase));
-                        }
-                    }
-
-                    continue;
-                }
-
-                // continue on parsing message headers coming from the server
-                var headerMatch = httpHeaderRe.Match(response);
-                if (headerMatch.Success)
-                {
-                    var fieldName = headerMatch.Result("${fieldName}");
-                    if (fieldName.Equals("Content-Length", StringComparison.OrdinalIgnoreCase))
-                    {
-                        contentLength = int.Parse(headerMatch.Result("${fieldValue}"));
-                    }
-                    continue;
-                }
-
-                // check if we've reached the CRLF which separates request line and headers from the message body
-                if (response.Length == 0)
-                {
-                    //  read response body if specified
-                    if (contentLength > 0)
-                    {
-                        var contentBody = new byte[contentLength];
-                        SocketRead(socket, contentBody, 0, contentLength);
-                    }
-                    break;
-                }
-            }
-
-            if (statusCode == null)
-                throw new ProxyException("HTTP response does not contain status line.");
-        }
-
         /// <summary>
         /// Raises the <see cref="ErrorOccured"/> event.
         /// </summary>

From a1e4e04e044673398362d20d79f61bc0ff318522 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Sun, 27 Dec 2020 10:37:30 +0100
Subject: [PATCH 04/19] Revert back to using SocketShutdown.Send in an attempt
 to stabilize tests.

---
 src/Renci.SshNet/Session.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index af7a7a74..1f657e1e 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1837,10 +1837,7 @@ namespace Renci.SshNet
                                 // This may result in a SocketException (eg. An existing connection was forcibly
                                 // closed by the remote host) which we'll log and ignore as it means the socket
                                 // was already shut down.
-                                //
-                                // We use SocketShutdown.Both instead of SocketShutdown.Send as a workaround to a
-                                // .NET Core issue on Linux & Mac OS X.
-                                _socket.Shutdown(SocketShutdown.Both);
+                                _socket.Shutdown(SocketShutdown.Send);
                             }
                             catch (SocketException ex)
                             {

From e71a4c958d0bd038bce6d7d3df515977f2205238 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Sun, 27 Dec 2020 11:52:12 +0100
Subject: [PATCH 05/19] Update tests after connection refactoring.

---
 .../ServiceFactoryTest_CreateConnector.cs     | 90 +++++++++++++++++++
 .../Classes/SessionTest.HttpProxy.cs          | 71 +++++++++++++--
 src/Renci.SshNet.Tests/Classes/SessionTest.cs | 75 ++++++++++++++--
 .../Classes/SessionTest_Connected.cs          | 13 +++
 .../Classes/SessionTest_ConnectedBase.cs      | 20 +++--
 ...Connected_ServerAndClientDisconnectRace.cs |  7 ++
 ...est_SocketConnected_BadPacketAndDispose.cs | 30 ++++++-
 7 files changed, 282 insertions(+), 24 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs

diff --git a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
new file mode 100644
index 00000000..0e50bf8e
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
@@ -0,0 +1,90 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Connection;
+using System;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ServiceFactoryTest_CreateConnector
+    {
+        private ServiceFactory _serviceFactory;
+        private Mock<IConnectionInfo> _connectionInfoMock;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            _serviceFactory = new ServiceFactory();
+            _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+        }
+
+        [TestMethod]
+        public void ConnectionInfoIsNull()
+        {
+            const IConnectionInfo connectionInfo = null;
+
+            try
+            {
+                _serviceFactory.CreateConnector(connectionInfo);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("connectionInfo", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void ProxyType_Http()
+        {
+            _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Http);
+
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(HttpConnector), actual.GetType());
+
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+        }
+
+        [TestMethod]
+        public void ProxyType_None()
+        {
+            _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.None);
+
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(DirectConnector), actual.GetType());
+
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+        }
+
+        [TestMethod]
+        public void ProxyType_Socks4()
+        {
+            _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Socks4);
+
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(Socks4Connector), actual.GetType());
+
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+        }
+
+        [TestMethod]
+        public void ProxyType_Socks5()
+        {
+            _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Socks5);
+
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(Socks5Connector), actual.GetType());
+
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs b/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
index 7780d2d8..4fe0bd08 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
@@ -5,6 +5,7 @@ using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Tests.Common;
+using Renci.SshNet.Connection;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -21,8 +22,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("Whatever\r\n"));
                 proxyStub.Start();
 
-                using (var session = new Session(CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon"), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -48,8 +56,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
                 proxyStub.Start();
 
-                using (var session = new Session(CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon"), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -78,8 +93,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("SSH-666-SshStub"));
                 proxyStub.Start();
 
-                using (var session = new Session(CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon"), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -110,8 +132,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("SSH-666-SshStub"));
                 proxyStub.Start();
 
-                using (var session = new Session(CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon"), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -137,8 +166,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
                 proxyStub.Start();
 
-                using (var session = new Session(CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon"), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -164,9 +200,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
                 proxyStub.Start();
 
-                var connectionInfo = CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, "anon");
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
+
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -193,9 +235,15 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
                 proxyStub.Start();
 
-                var connectionInfo = CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, string.Empty);
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, string.Empty);
+
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -221,9 +269,14 @@ namespace Renci.SshNet.Tests.Classes
                 proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
                 proxyStub.Start();
 
-                var connectionInfo = CreateConnectionInfoWithProxy(proxyEndPoint, serverEndPoint, null);
+                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, null);
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -238,7 +291,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private static ConnectionInfo CreateConnectionInfoWithProxy(IPEndPoint proxyEndPoint, IPEndPoint serverEndPoint, string proxyUserName)
+        private static ConnectionInfo CreateConnectionInfoWithHttpProxy(IPEndPoint proxyEndPoint, IPEndPoint serverEndPoint, string proxyUserName)
         {
             return new ConnectionInfo(
                 serverEndPoint.Address.ToString(),
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest.cs b/src/Renci.SshNet.Tests/Classes/SessionTest.cs
index de523769..e15e05f6 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
@@ -20,12 +21,14 @@ namespace Renci.SshNet.Tests.Classes
     public partial class SessionTest : TestBase
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<IConnector> _connectorMock;
 
         protected override void OnInit()
         {
             base.OnInit();
 
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
         }
 
         [TestMethod]
@@ -84,6 +87,11 @@ namespace Renci.SshNet.Tests.Classes
 
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -130,6 +138,11 @@ namespace Renci.SshNet.Tests.Classes
 
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -146,7 +159,6 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-
         [TestMethod]
         public void ConnectShouldSupportProtocolIdentificationStringThatDoesNotEndWithCrlf()
         {
@@ -166,6 +178,11 @@ namespace Renci.SshNet.Tests.Classes
 
                 using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -199,8 +216,15 @@ namespace Renci.SshNet.Tests.Classes
                     };
                 serverStub.Start();
 
-                using (var session = new Session(CreateConnectionInfo(serverEndPoint, TimeSpan.FromMilliseconds(500)), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromMilliseconds(500));
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -237,8 +261,15 @@ namespace Renci.SshNet.Tests.Classes
                     };
                 serverStub.Start();
 
-                using (var session = new Session(CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5)), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -263,8 +294,15 @@ namespace Renci.SshNet.Tests.Classes
                     };
                 serverStub.Start();
 
-                using (var session = new Session(CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5)), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -290,8 +328,15 @@ namespace Renci.SshNet.Tests.Classes
                     };
                 serverStub.Start();
 
-                using (var session = new Session(CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5)), _serviceFactoryMock.Object))
+                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
+
+                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
                 {
+                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                                       .Returns(_connectorMock.Object);
+                    _connectorMock.Setup(p => p.Connect(connectionInfo))
+                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
                     try
                     {
                         session.Connect();
@@ -313,6 +358,11 @@ namespace Renci.SshNet.Tests.Classes
                 new KeyboardInteractiveAuthenticationMethod("user"));
             var session = new Session(connectionInfo, _serviceFactoryMock.Object);
 
+            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(connectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
             try
             {
                 session.Connect();
@@ -331,6 +381,11 @@ namespace Renci.SshNet.Tests.Classes
                 "proxyUser", "proxyPwd", new KeyboardInteractiveAuthenticationMethod("user"));
             var session = new Session(connectionInfo, _serviceFactoryMock.Object);
 
+            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(connectionInfo))
+                          .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
+
             try
             {
                 session.Connect();
@@ -349,6 +404,11 @@ namespace Renci.SshNet.Tests.Classes
                 new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
             var session = new Session(connectionInfo, _serviceFactoryMock.Object);
 
+            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(connectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
             try
             {
                 session.Connect();
@@ -377,6 +437,11 @@ namespace Renci.SshNet.Tests.Classes
                 new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
             var session = new Session(connectionInfo, _serviceFactoryMock.Object);
 
+            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(connectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+
             try
             {
                 session.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
index 0d8f2412..730aa3e4 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 using Renci.SshNet.Messages.Transport;
 
 namespace Renci.SshNet.Tests.Classes
@@ -251,5 +252,17 @@ namespace Renci.SshNet.Tests.Classes
                 Assert.IsNull(exception);
             }
         }
+
+        [TestMethod]
+        public void CreateConnectorOnServiceFactoryShouldHaveBeenInvokedOnce()
+        {
+            ServiceFactoryMock.Verify(p => p.CreateConnector(ConnectionInfo), Times.Once());
+        }
+
+        [TestMethod]
+        public void ConnectorOnConnectorShouldHaveBeenInvokedOnce()
+        {
+            ConnectorMock.Verify(p => p.Connect(ConnectionInfo), Times.Once());
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
index 3e42dac1..0651896d 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
@@ -9,6 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
 using Renci.SshNet.Compression;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Security;
@@ -20,7 +21,8 @@ namespace Renci.SshNet.Tests.Classes
     [TestClass]
     public abstract class SessionTest_ConnectedBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
+        internal Mock<IServiceFactory> ServiceFactoryMock { get; private set; }
+        internal Mock<IConnector> ConnectorMock { get; private set; }
         private Mock<IKeyExchange> _keyExchangeMock;
         private Mock<IClientAuthentication> _clientAuthenticationMock;
         private IPEndPoint _serverEndPoint;
@@ -35,6 +37,7 @@ namespace Renci.SshNet.Tests.Classes
         protected AsyncSocketListener ServerListener { get; private set; }
         protected IList<byte[]> ServerBytesReceivedRegister { get; private set; }
         protected Session Session { get; private set; }
+        protected Socket ClientSocket { get; private set; }
         protected Socket ServerSocket { get; private set; }
 
         [TestInitialize]
@@ -85,7 +88,7 @@ namespace Renci.SshNet.Tests.Classes
             ErrorOccurredRegister = new List<ExceptionEventArgs>();
             ServerBytesReceivedRegister = new List<byte[]>();
 
-            Session = new Session(ConnectionInfo, _serviceFactoryMock.Object);
+            Session = new Session(ConnectionInfo, ServiceFactoryMock.Object);
             Session.Disconnected += (sender, args) => DisconnectedRegister.Add(args);
             Session.DisconnectReceived += (sender, args) => DisconnectReceivedRegister.Add(args);
             Session.ErrorOccured += (sender, args) => ErrorOccurredRegister.Add(args);
@@ -144,14 +147,19 @@ namespace Renci.SshNet.Tests.Classes
 
         private void CreateMocks()
         {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            ServiceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            ConnectorMock = new Mock<IConnector>(MockBehavior.Strict);
             _keyExchangeMock = new Mock<IKeyExchange>(MockBehavior.Strict);
             _clientAuthenticationMock = new Mock<IClientAuthentication>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
         {
-            _serviceFactoryMock.Setup(
+            ServiceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo))
+                               .Returns(ConnectorMock.Object);
+            ConnectorMock.Setup(p => p.Connect(ConnectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+            ServiceFactoryMock.Setup(
                 p =>
                     p.CreateKeyExchange(ConnectionInfo.KeyExchangeAlgorithms, new[] { _keyExchangeAlgorithm })).Returns(_keyExchangeMock.Object);
             _keyExchangeMock.Setup(p => p.Name).Returns(_keyExchangeAlgorithm);
@@ -164,13 +172,13 @@ namespace Renci.SshNet.Tests.Classes
             _keyExchangeMock.Setup(p => p.CreateCompressor()).Returns((Compressor) null);
             _keyExchangeMock.Setup(p => p.CreateDecompressor()).Returns((Compressor) null);
             _keyExchangeMock.Setup(p => p.Dispose());
-            _serviceFactoryMock.Setup(p => p.CreateClientAuthentication())
+            ServiceFactoryMock.Setup(p => p.CreateClientAuthentication())
                 .Callback(ClientAuthentication_Callback)
                 .Returns(_clientAuthenticationMock.Object);
             _clientAuthenticationMock.Setup(p => p.Authenticate(ConnectionInfo, Session));
         }
 
-        protected virtual void Arrange()
+        protected void Arrange()
         {
             CreateMocks();
             SetupData();
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
index 5729c022..e652a8af 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
@@ -9,6 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
 using Renci.SshNet.Compression;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Security;
@@ -21,6 +22,7 @@ namespace Renci.SshNet.Tests.Classes
     public class SessionTest_Connected_ServerAndClientDisconnectRace
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<IConnector> _connectorMock;
         private Mock<IKeyExchange> _keyExchangeMock;
         private Mock<IClientAuthentication> _clientAuthenticationMock;
         private IPEndPoint _serverEndPoint;
@@ -128,12 +130,17 @@ namespace Renci.SshNet.Tests.Classes
         private void CreateMocks()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
             _keyExchangeMock = new Mock<IKeyExchange>(MockBehavior.Strict);
             _clientAuthenticationMock = new Mock<IClientAuthentication>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
         {
+            _serviceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(ConnectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
             _serviceFactoryMock.Setup(
                 p =>
                     p.CreateKeyExchange(ConnectionInfo.KeyExchangeAlgorithms, new[] { _keyExchangeAlgorithm })).Returns(_keyExchangeMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
index a13de281..bcc42b6a 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
@@ -5,6 +5,7 @@ using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Tests.Common;
 
@@ -14,6 +15,7 @@ namespace Renci.SshNet.Tests.Classes
     public class SessionTest_SocketConnected_BadPacketAndDispose
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<IConnector> _connectorMock;
         private ConnectionInfo _connectionInfo;
         private Session _session;
         private AsyncSocketListener _serverListener;
@@ -37,7 +39,13 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        protected void Arrange()
+        protected void CreateMocks()
+        {
+            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
+        }
+
+        protected void SetupData()
         {
             _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
             _connectionInfo = new ConnectionInfo(
@@ -48,8 +56,6 @@ namespace Renci.SshNet.Tests.Classes
             _connectionInfo.Timeout = TimeSpan.FromMilliseconds(200);
             _actualException = null;
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-
             _serverListener = new AsyncSocketListener(_serverEndPoint);
             _serverListener.Connected += (socket) =>
                 {
@@ -61,10 +67,26 @@ namespace Renci.SshNet.Tests.Classes
                 };
             _serverListener.BytesReceived += (received, socket) =>
                 {
-                    var badPacket = new byte[] {0x0a, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05};
+                    var badPacket = new byte[] { 0x0a, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05 };
                     _serverSocket.Send(badPacket, 0, badPacket.Length, SocketFlags.None);
                     _serverSocket.Shutdown(SocketShutdown.Send);
                 };
+        }
+
+        protected void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateConnector(_connectionInfo))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(_connectionInfo))
+                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+        }
+
+        protected void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+
             _serverListener.Start();
         }
 

From fbadaf8b74a7b9b4e08b6e13286c0d40fdbdc389 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Sun, 27 Dec 2020 12:06:36 +0100
Subject: [PATCH 06/19] Fix handling of empty line.

---
 src/Renci.SshNet/Connection/HttpConnector.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Renci.SshNet/Connection/HttpConnector.cs b/src/Renci.SshNet/Connection/HttpConnector.cs
index c23bf327..d4ff0e15 100644
--- a/src/Renci.SshNet/Connection/HttpConnector.cs
+++ b/src/Renci.SshNet/Connection/HttpConnector.cs
@@ -118,14 +118,13 @@ namespace Renci.SshNet.Connection
                     break;
 
                 var b = data[0];
-
-                if (b == Session.LineFeed && buffer.Count > 1 && buffer[buffer.Count - 1] == Session.CarriageReturn)
-                {
-                    // Return line without CR
-                    return encoding.GetString(buffer.ToArray(), 0, buffer.Count - 1);
-                }
-
                 buffer.Add(b);
+
+                if (b == Session.LineFeed && buffer.Count > 1 && buffer[buffer.Count - 2] == Session.CarriageReturn)
+                {
+                    // Return line without CRLF
+                    return encoding.GetString(buffer.ToArray(), 0, buffer.Count - 2);
+                }
             }
             while (true);
 

From eefcd8fbc5848f4082f62be36beee3666faf41bb Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Sun, 27 Dec 2020 12:16:49 +0100
Subject: [PATCH 07/19] Fix test failure.

---
 .../Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
index 002b97b0..aaa62c85 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
@@ -24,7 +24,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(3, random);
-            _bufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
         }

From de06f1235009f4c7d108b8edf8ad8f96af5303e1 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Tue, 29 Dec 2020 18:56:26 +0100
Subject: [PATCH 08/19] Allow for easier troubleshooting of protocol version
 exchange. Fixes #751.

---
 .../Classes/Common/PacketDumpTest.cs          | 155 ++++++++++++++++++
 ...ectionClosedByServer_NoDataSentByServer.cs | 117 +++++++++++++
 ...ndWithIdentificationStringBeforeTimeout.cs | 125 ++++++++++++++
 ...est_ServerResponseContainsNullCharacter.cs | 128 +++++++++++++++
 ...entificationOnlyContainsProtocolVersion.cs | 125 ++++++++++++++
 ...changeTest_ServerResponseValid_Comments.cs | 119 ++++++++++++++
 ...angeTest_ServerResponseValid_NoComments.cs | 119 ++++++++++++++
 .../Connection/SshIdentificationTest.cs       | 139 ++++++++++++++++
 src/Renci.SshNet/Common/PacketDump.cs         | 102 ++++++++++++
 .../Connection/IProtocolVersionExchange.cs    |  22 +++
 .../Connection/ProtocolVersionExchange.cs     | 131 +++++++++++++++
 .../Connection/SshIdentification.cs           |  92 +++++++++++
 src/Renci.SshNet/IServiceFactory.cs           |   9 +
 src/Renci.SshNet/ServiceFactory.cs            |  12 ++
 src/Renci.SshNet/Session.cs                   |  88 +---------
 15 files changed, 1402 insertions(+), 81 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/SshIdentificationTest.cs
 create mode 100644 src/Renci.SshNet/Common/PacketDump.cs
 create mode 100644 src/Renci.SshNet/Connection/IProtocolVersionExchange.cs
 create mode 100644 src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
 create mode 100644 src/Renci.SshNet/Connection/SshIdentification.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs b/src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs
new file mode 100644
index 00000000..00401915
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs
@@ -0,0 +1,155 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Tests.Classes.Common
+{
+    [TestClass]
+    public class PacketDumpTest
+    {
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsNull()
+        {
+            const byte[] data = null;
+
+            try
+            {
+                PacketDump.Create(data, 0);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("data", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_IndentLevelLessThanZero()
+        {
+            var data = new byte[0];
+
+            try
+            {
+                PacketDump.Create(data, -1);
+                Assert.Fail();
+            }
+            catch (ArgumentOutOfRangeException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(string.Format("Cannot be less than zero.{0}Parameter name: {1}", Environment.NewLine, ex.ParamName), ex.Message);
+                Assert.AreEqual("indentLevel", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsEmpty()
+        {
+            var data = new byte[0];
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(string.Empty, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsMultipleOfLineWidth_IndentLevelTwo()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53, 0x53, 0x48,
+                    0x2e, 0x4e, 0x45, 0x54, 0x20, 0x32, 0x30, 0x32, 0x30, 0x20, 0xf6, 0x7a, 0x32, 0x7f, 0x1f, 0x7e
+                };
+            var expected = "  00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53 53 48  ...e b.D...6.SSH" +
+                           Environment.NewLine +
+                           "  00000010  2E 4E 45 54 20 32 30 32 30 20 F6 7A 32 7F 1F 7E  .NET 2020 .z2..~";
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsMultipleOfLineWidth_IndentLevelZero()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53, 0x53, 0x48,
+                    0x2e, 0x4e, 0x45, 0x54, 0x20, 0x32, 0x30, 0x32, 0x30, 0x20, 0xf6, 0x7a, 0x32, 0x7f, 0x1f, 0x7e
+                };
+            var expected = "00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53 53 48  ...e b.D...6.SSH" +
+                           Environment.NewLine +
+                           "00000010  2E 4E 45 54 20 32 30 32 30 20 F6 7A 32 7F 1F 7E  .NET 2020 .z2..~";
+
+            var actual = PacketDump.Create(data, 0);
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsLineWith()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53, 0x53, 0x48
+                };
+            var expected = "  00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53 53 48  ...e b.D...6.SSH";
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsLessThanLineWith()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53
+                };
+            var expected = "  00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53        ...e b.D...6.S";
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsGreaterThanLineWidthButLessThanMultipleOfLineWidth()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53, 0x53, 0x48,
+                    0x2e, 0x4e, 0x45, 0x54
+                };
+            var expected = "  00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53 53 48  ...e b.D...6.SSH" +
+                           Environment.NewLine +
+                           "  00000010  2E 4E 45 54                                      .NET";
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void Create_ByteArrayAndIndentLevel_DataIsGreaterThanMultipleOfLineWidth()
+        {
+            var data = new byte[]
+                {
+                    0x07, 0x00, 0x1f, 0x65, 0x20, 0x62, 0x09, 0x44, 0x7f, 0x0d, 0x0a, 0x36, 0x80, 0x53, 0x53, 0x48,
+                    0x2e, 0x4e, 0x45, 0x54, 0x20, 0x32, 0x30, 0x32, 0x30, 0x20, 0xf6, 0x7a, 0x32, 0x7f, 0x1f, 0x7e,
+                    0x78, 0x54, 0x00, 0x52
+                };
+            var expected = "  00000000  07 00 1F 65 20 62 09 44 7F 0D 0A 36 80 53 53 48  ...e b.D...6.SSH" +
+                           Environment.NewLine +
+                           "  00000010  2E 4E 45 54 20 32 30 32 30 20 F6 7A 32 7F 1F 7E  .NET 2020 .z2..~" +
+                           Environment.NewLine +
+                           "  00000020  78 54 00 52                                      xT.R";
+
+            var actual = PacketDump.Create(data, 2);
+
+            Assert.AreEqual(expected, actual);
+
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
new file mode 100644
index 00000000..2e9eed4c
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
@@ -0,0 +1,117 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshConnectionException _actualException;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "\uD55C";
+            _timeout = TimeSpan.FromSeconds(5);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.BytesReceived += (bytes, socket) =>
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                    socket.Shutdown(SocketShutdown.Both);
+                };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            try
+            {
+                _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void StartShouldHaveThrownSshConnectionException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("Server response does not contain SSH protocol identification. Connection to remote server was closed before any data was received.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            Assert.AreEqual(5, _dataReceivedByServer.Count);
+
+            Assert.AreEqual(0xed, _dataReceivedByServer[0]);
+            Assert.AreEqual(0x95, _dataReceivedByServer[1]);
+            Assert.AreEqual(0x9c, _dataReceivedByServer[2]);
+            Assert.AreEqual(0x0d, _dataReceivedByServer[3]);
+            Assert.AreEqual(0x0a, _dataReceivedByServer[4]);
+        }
+
+        [TestMethod]
+        public void ConnectionIsClosedByServer()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+
+            var bytesReceived = _client.Receive(new byte[1]);
+            Assert.AreEqual(0, bytesReceived);
+
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
new file mode 100644
index 00000000..34353ed3
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
@@ -0,0 +1,125 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private byte[] _serverIdentification;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshIdentification _actual;
+        private SshOperationTimeoutException _actualException;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
+            _timeout = TimeSpan.FromMilliseconds(200);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+            _serverIdentification = Encoding.UTF8.GetBytes("SSH-Zero-OurSSHAppliance\r\n!");
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.BytesReceived += (bytes, socket) =>
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                    socket.Send(Encoding.UTF8.GetBytes("Welcome!\r\n"));
+                    Thread.Sleep(_timeout.Add(TimeSpan.FromMilliseconds(50)));
+                    socket.Shutdown(SocketShutdown.Both);
+                };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            try
+            {
+                _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void StartShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format("Socket read operation has timed out after {0} milliseconds.", _timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            var expected = Encoding.UTF8.GetBytes(_clientVersion);
+
+            Assert.AreEqual(expected.Length + 2, _dataReceivedByServer.Count);
+
+            Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
+            Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
+            Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
+        }
+
+        [TestMethod]
+        public void ConnectionIsClosedByServer()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+
+            var bytesReceived = _client.Receive(new byte[1]);
+            Assert.AreEqual(0, bytesReceived);
+
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
new file mode 100644
index 00000000..b3694c60
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
@@ -0,0 +1,128 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private byte[] _serverIdentification;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshConnectionException _actualException;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
+            _timeout = TimeSpan.FromSeconds(5);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+            _serverIdentification = Encoding.UTF8.GetBytes("\uD55C!\0\uD55CSSH -2.0-Renci.SshNet.SshClient.0.0.1");
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.Connected += socket => socket.Send(_serverIdentification);
+            _server.BytesReceived += (bytes, socket) =>
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            try
+            {
+                _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void StartShouldHaveThrownSshConnectionException()
+        {
+            var expectedMessage = "The identification string contains a null character at position 0x00000005:" + Environment.NewLine +
+                                  "  00000000  ED 95 9C 21 00                                   ...!.";
+
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(expectedMessage, _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            var expected = Encoding.UTF8.GetBytes(_clientVersion);
+
+            Assert.AreEqual(expected.Length + 2, _dataReceivedByServer.Count);
+
+            Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
+            Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
+            Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
+        }
+
+        [TestMethod]
+        public void ClientRemainsConnected()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+
+        [TestMethod]
+        public void ClientHasNotReadPastNullCharacter()
+        {
+            var buffer = new byte[1];
+
+            var bytesReceived = _client.Receive(buffer);
+            Assert.AreEqual(1, bytesReceived);
+            Assert.AreEqual(0xed, buffer[0]);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
new file mode 100644
index 00000000..fe3eb0a7
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
@@ -0,0 +1,125 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private byte[] _serverIdentification;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshConnectionException _actualException;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
+            _timeout = TimeSpan.FromSeconds(5);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+            _serverIdentification = Encoding.UTF8.GetBytes("SSH-2.0\r\n");
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.BytesReceived += (bytes, socket) =>
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                    socket.Send(_serverIdentification);
+                    socket.Shutdown(SocketShutdown.Both);
+                };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            try
+            {
+                _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void StartShouldHaveThrownSshConnectionException()
+        {
+            var expectedMessage = "Server response does not contain SSH protocol identification:" + Environment.NewLine +
+                                  "  00000000  53 53 48 2D 32 2E 30 0D 0A                       SSH-2.0..";
+
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(expectedMessage, _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            var expected = Encoding.UTF8.GetBytes(_clientVersion);
+
+            Assert.AreEqual(expected.Length + 2, _dataReceivedByServer.Count);
+
+            Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
+            Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
+            Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
+        }
+
+        [TestMethod]
+        public void ConnectionIsClosedByServer()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+
+            var bytesReceived = _client.Receive(new byte[1]);
+            Assert.AreEqual(0, bytesReceived);
+
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
new file mode 100644
index 00000000..a71a1edf
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
@@ -0,0 +1,119 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ServerResponseValid_Comments
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private byte[] _serverIdentification;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshIdentification _actual;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
+            _timeout = TimeSpan.FromSeconds(5);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+            _serverIdentification = Encoding.UTF8.GetBytes("Welcome stranger!\r\n\r\nSSH-ABC2.0-OurSSHAppliance-1.4.7 Use at own risk.\uD55C\r\n!");
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.BytesReceived += (bytes, socket) =>
+            {
+                _dataReceivedByServer.AddRange(bytes);
+                socket.Send(_serverIdentification);
+                socket.Shutdown(SocketShutdown.Both);
+            };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            _actual = _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+        }
+
+        [TestMethod]
+        public void StartShouldReturnIdentificationOfServer()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreEqual("ABC2.0", _actual.ProtocolVersion);
+            Assert.AreEqual("OurSSHAppliance-1.4.7", _actual.SoftwareVersion);
+            Assert.AreEqual("Use at own risk.\uD55C", _actual.Comments);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            var expected = Encoding.UTF8.GetBytes(_clientVersion);
+
+            Assert.AreEqual(expected.Length + 2, _dataReceivedByServer.Count);
+
+            Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
+            Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
+            Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
+        }
+
+        [TestMethod]
+        public void ClientRemainsConnected()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+
+        [TestMethod]
+        public void ClientDidNotReadPastIdentification()
+        {
+            var buffer = new byte[1];
+
+            var bytesReceived = _client.Receive(buffer);
+            Assert.AreEqual(1, bytesReceived);
+            Assert.AreEqual(0x21, buffer[0]);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
new file mode 100644
index 00000000..4b2b0e83
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
@@ -0,0 +1,119 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class ProtocolVersionExchangeTest_ServerResponseValid_NoComments
+    {
+        private AsyncSocketListener _server;
+        private ProtocolVersionExchange _protocolVersionExchange;
+        private string _clientVersion;
+        private TimeSpan _timeout;
+        private IPEndPoint _serverEndPoint;
+        private List<byte> _dataReceivedByServer;
+        private byte[] _serverIdentification;
+        private bool _clientDisconnected;
+        private Socket _client;
+        private SshIdentification _actual;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (_server != null)
+            {
+                _server.Dispose();
+                _server = null;
+            }
+
+            if (_client != null)
+            {
+                _client.Shutdown(SocketShutdown.Both);
+                _client.Close();
+                _client = null;
+            }
+        }
+
+        protected void Arrange()
+        {
+            _clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
+            _timeout = TimeSpan.FromSeconds(5);
+            _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _dataReceivedByServer = new List<byte>();
+            _serverIdentification = Encoding.UTF8.GetBytes("Welcome stranger!\r\n\r\nSSH-Zero-OurSSHAppliance\r\n!");
+
+            _server = new AsyncSocketListener(_serverEndPoint);
+            _server.Start();
+            _server.BytesReceived += (bytes, socket) =>
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                    socket.Send(_serverIdentification);
+                    socket.Shutdown(SocketShutdown.Both);
+                };
+            _server.Disconnected += (socket) => _clientDisconnected = true;
+
+            _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _client.Connect(_serverEndPoint);
+
+            _protocolVersionExchange = new ProtocolVersionExchange();
+        }
+
+        protected void Act()
+        {
+            _actual = _protocolVersionExchange.Start(_clientVersion, _client, _timeout);
+        }
+
+        [TestMethod]
+        public void StartShouldReturnIdentificationOfServer()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreEqual("Zero", _actual.ProtocolVersion);
+            Assert.AreEqual("OurSSHAppliance", _actual.SoftwareVersion);
+            Assert.IsNull(_actual.Comments);
+        }
+
+        [TestMethod]
+        public void ClientIdentificationWasSentToServer()
+        {
+            var expected = Encoding.UTF8.GetBytes(_clientVersion);
+
+            Assert.AreEqual(expected.Length + 2, _dataReceivedByServer.Count);
+
+            Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
+            Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
+            Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
+        }
+
+        [TestMethod]
+        public void ClientRemainsConnected()
+        {
+            Assert.IsTrue(_client.Connected);
+            Assert.IsFalse(_clientDisconnected);
+        }
+
+        [TestMethod]
+        public void ClientDidNotReadPastIdentification()
+        {
+            var buffer = new byte[1];
+
+            var bytesReceived = _client.Receive(buffer);
+            Assert.AreEqual(1, bytesReceived);
+            Assert.AreEqual(0x21, buffer[0]);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/SshIdentificationTest.cs b/src/Renci.SshNet.Tests/Classes/Connection/SshIdentificationTest.cs
new file mode 100644
index 00000000..2a7137ae
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/SshIdentificationTest.cs
@@ -0,0 +1,139 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Connection;
+using System;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class SshIdentificationTest
+    {
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersion()
+        {
+            const string protocolVersion = "1.5";
+            const string softwareVersion = "SSH.NET_2020.0.0";
+
+            var sshIdentification = new SshIdentification(protocolVersion, softwareVersion);
+            Assert.AreSame(protocolVersion, sshIdentification.ProtocolVersion);
+            Assert.AreSame(softwareVersion, sshIdentification.SoftwareVersion);
+            Assert.IsNull(sshIdentification.Comments);
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersion_ProtocolVersionIsNull()
+        {
+            const string protocolVersion = null;
+            const string softwareVersion = "SSH.NET_2020.0.0";
+
+            try
+            {
+                new SshIdentification(protocolVersion, softwareVersion);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("protocolVersion", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersion_SoftwareVersionIsNull()
+        {
+            const string protocolVersion = "2.0";
+            const string softwareVersion = null;
+
+            try
+            {
+                new SshIdentification(protocolVersion, softwareVersion);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("softwareVersion", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersionAndComments()
+        {
+            const string protocolVersion = "1.5";
+            const string softwareVersion = "SSH.NET_2020.0.0";
+            const string comments = "Beware, dangerous!";
+
+            var sshIdentification = new SshIdentification(protocolVersion, softwareVersion, comments);
+            Assert.AreSame(protocolVersion, sshIdentification.ProtocolVersion);
+            Assert.AreSame(softwareVersion, sshIdentification.SoftwareVersion);
+            Assert.AreSame(comments, sshIdentification.Comments);
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersionAndComments_CommentsIsNull()
+        {
+            const string protocolVersion = "1.5";
+            const string softwareVersion = "SSH.NET_2020.0.0";
+            const string comments = null;
+
+            var sshIdentification = new SshIdentification(protocolVersion, softwareVersion, comments);
+            Assert.AreSame(protocolVersion, sshIdentification.ProtocolVersion);
+            Assert.AreSame(softwareVersion, sshIdentification.SoftwareVersion);
+            Assert.IsNull(comments, sshIdentification.Comments);
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersionAndComments_ProtocolVersionIsNull()
+        {
+            const string protocolVersion = null;
+            const string softwareVersion = "SSH.NET_2020.0.0";
+            const string comments = "Beware!";
+
+            try
+            {
+                new SshIdentification(protocolVersion, softwareVersion, comments);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("protocolVersion", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Ctor_ProtocolVersionAndSoftwareVersionAndComments_SoftwareVersionIsNull()
+        {
+            const string protocolVersion = "2.0";
+            const string softwareVersion = null;
+            const string comments = "Beware!";
+
+            try
+            {
+                new SshIdentification(protocolVersion, softwareVersion, comments);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("softwareVersion", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void ToString_Comments()
+        {
+            var sshIdentification = new SshIdentification("2.0", "SSH.NET", "Beware, dangerous");
+            Assert.AreEqual("SSH-2.0-SSH.NET Beware, dangerous", sshIdentification.ToString());
+        }
+
+        [TestMethod]
+        public void ToString_CommentsIsNull()
+        {
+            var sshIdentification = new SshIdentification("2.0", "SSH.NET_2020.0.0");
+            Assert.AreEqual("SSH-2.0-SSH.NET_2020.0.0", sshIdentification.ToString());
+
+            sshIdentification = new SshIdentification("2.0", "SSH.NET_2020.0.0", null);
+            Assert.AreEqual("SSH-2.0-SSH.NET_2020.0.0", sshIdentification.ToString());
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Common/PacketDump.cs b/src/Renci.SshNet/Common/PacketDump.cs
new file mode 100644
index 00000000..2dd6a7e2
--- /dev/null
+++ b/src/Renci.SshNet/Common/PacketDump.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+
+namespace Renci.SshNet.Common
+{
+    internal class PacketDump
+    {
+        public static string Create(List<byte> data, int indentLevel)
+        {
+            return Create(data.ToArray(), indentLevel);
+        }
+
+        public static string Create(byte[] data, int indentLevel)
+        {
+            if (data == null)
+                throw new ArgumentNullException("data");
+            if (indentLevel < 0)
+                throw new ArgumentOutOfRangeException("indentLevel", "Cannot be less than zero.");
+
+            const int lineWidth = 16;
+
+            var result = new StringBuilder();
+            var line = new byte[lineWidth];
+            var indentChars = new string(' ', indentLevel);
+
+            for (var pos = 0; pos < data.Length; )
+            {
+                var linePos = 0;
+
+                if (result.Length > 0)
+                {
+                    result.Append(Environment.NewLine);
+                }
+
+                result.Append(indentChars);
+                result.Append(pos.ToString("X8"));
+                result.Append("  ");
+
+                while (true)
+                {
+                    line[linePos++] = data[pos++];
+
+                    if (linePos == lineWidth || pos == data.Length)
+                    {
+                        break;
+                    }
+                }
+
+                result.Append(AsHex(line, linePos));
+                result.Append("  ");
+                result.Append(AsAscii(line, linePos));
+            }
+            return result.ToString();
+        }
+
+        private static string AsHex(byte[] data, int length)
+        {
+            var hex = new StringBuilder();
+
+            for (var i = 0; i < length; i++)
+            {
+                if (i > 0)
+                {
+                    hex.Append(' ');
+                }
+
+                hex.Append(data[i].ToString("X2", CultureInfo.InvariantCulture));
+            }
+
+            if (length < data.Length)
+            {
+                hex.Append(new string(' ', (data.Length - length) * 3));
+            }
+
+            return hex.ToString();
+        }
+
+        private static string AsAscii(byte[] data, int length)
+        {
+            var ascii = new StringBuilder();
+            const char dot = '.';
+
+            for (var i = 0; i < length; i++)
+            {
+                var b = data[i];
+
+                if (b < 32 || b >= 127)
+                {
+                    ascii.Append(dot);
+                }
+                else
+                {
+                    ascii.Append(Encoding.ASCII.GetString(data, i, 1));
+                }
+            }
+
+            return ascii.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet/Connection/IProtocolVersionExchange.cs b/src/Renci.SshNet/Connection/IProtocolVersionExchange.cs
new file mode 100644
index 00000000..77bcfbd3
--- /dev/null
+++ b/src/Renci.SshNet/Connection/IProtocolVersionExchange.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    /// <summary>
+    /// Handles the SSH protocol version exchange.
+    /// </summary>
+    internal interface IProtocolVersionExchange
+    {
+        /// <summary>
+        /// Performs the SSH protocol version exchange.
+        /// </summary>
+        /// <param name="clientVersion">The identification string of the SSH client.</param>
+        /// <param name="socket">A <see cref="Socket"/> connected to the server.</param>
+        /// <param name="timeout">The maximum time to wait for the server to respond.</param>
+        /// <returns>
+        /// The SSH identification of the server.
+        /// </returns>
+        SshIdentification Start(string clientVersion, Socket socket, TimeSpan timeout);
+    }
+}
diff --git a/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
new file mode 100644
index 00000000..6b43bb59
--- /dev/null
+++ b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
@@ -0,0 +1,131 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using Renci.SshNet.Messages.Transport;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net.Sockets;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Renci.SshNet.Connection
+{
+    /// <summary>
+    /// Handles the SSH protocol version exchange.
+    /// </summary>
+    internal class ProtocolVersionExchange : IProtocolVersionExchange
+    {
+        private const byte Null = 0x00;
+
+#if FEATURE_REGEX_COMPILE
+        private static readonly Regex ServerVersionRe = new Regex("^SSH-(?<protoversion>[^-]+)-(?<softwareversion>.+?)([ ](?<comments>.+))?$", RegexOptions.Compiled);
+#else
+        private static readonly Regex ServerVersionRe = new Regex("^SSH-(?<protoversion>[^-]+)-(?<softwareversion>.+?)([ ](?<comments>.+))?$");
+#endif
+
+        /// <summary>
+        /// Performs the SSH protocol version exchange.
+        /// </summary>
+        /// <param name="clientVersion">The identification string of the SSH client.</param>
+        /// <param name="socket">A <see cref="Socket"/> connected to the server.</param>
+        /// <param name="timeout">The maximum time to wait for the server to respond.</param>
+        /// <returns>
+        /// The SSH identification of the server.
+        /// </returns>
+        public SshIdentification Start(string clientVersion, Socket socket, TimeSpan timeout)
+        {
+            // Immediately send the identification string since the spec states both sides MUST send an identification string
+            // when the connection has been established
+            SocketAbstraction.Send(socket, Encoding.UTF8.GetBytes(clientVersion + "\x0D\x0A"));
+
+            var bytesReceived = new List<byte>();
+
+            // Get server version from the server,
+            // ignore text lines which are sent before if any
+            while (true)
+            {
+                var line = SocketReadLine(socket, timeout, bytesReceived);
+                if (line == null)
+                {
+                    if (bytesReceived.Count == 0)
+                    {
+                        throw new SshConnectionException("Server response does not contain SSH protocol identification. Connection to remote server was closed before any data was received.", DisconnectReason.ConnectionLost);
+                    }
+
+                    throw new SshConnectionException(string.Format("Server response does not contain SSH protocol identification:{0}{1}", Environment.NewLine, PacketDump.Create(bytesReceived, 2)),
+                                                     DisconnectReason.ProtocolError);
+                }
+
+                var identificationMatch = ServerVersionRe.Match(line);
+                if (identificationMatch.Success)
+                {
+                    return new SshIdentification(GetGroupValue(identificationMatch, "protoversion"),
+                                                 GetGroupValue(identificationMatch, "softwareversion"),
+                                                 GetGroupValue(identificationMatch, "comments"));
+                }
+            }
+        }
+
+        private static string GetGroupValue(Match match, string groupName)
+        {
+            var commentsGroup = match.Groups[groupName];
+            if (commentsGroup.Success)
+            {
+                return commentsGroup.Value;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a blocking read on the socket until a line is read.
+        /// </summary>
+        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
+        /// <param name="timeout">A <see cref="TimeSpan"/> that represents the time to wait until a line is read.</param>
+        /// <param name="buffer">A <see cref="List{Byte}"/> to which read bytes will be added.</param>
+        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
+        /// <exception cref="SocketException">An error occurred when trying to access the socket.</exception>
+        /// <returns>
+        /// The line read from the socket, or <c>null</c> when the remote server has shutdown and all data has been received.
+        /// </returns>
+        private static string SocketReadLine(Socket socket, TimeSpan timeout, List<byte> buffer)
+        {
+            var data = new byte[1];
+
+            var startPosition = buffer.Count;
+
+            // Read data one byte at a time to find end of line and leave any unhandled information in the buffer
+            // to be processed by subsequent invocations.
+            while (true)
+            {
+                var bytesRead = SocketAbstraction.Read(socket, data, 0, data.Length, timeout);
+                if (bytesRead == 0)
+                {
+                    // The remote server shut down the socket.
+                    break;
+                }
+
+                var byteRead = data[0];
+                buffer.Add(byteRead);
+
+                // The null character MUST NOT be sent
+                if (byteRead == Null)
+                {
+                    throw new SshConnectionException(string.Format(CultureInfo.InvariantCulture,
+                                                                   "The identification string contains a null character at position 0x{0:X8}:{1}{2}",
+                                                                   buffer.Count,
+                                                                   Environment.NewLine,
+                                                                   PacketDump.Create(buffer.ToArray(), 2)));
+                }
+
+                if (byteRead == Session.LineFeed && buffer.Count > startPosition + 1 && buffer[buffer.Count - 2] == Session.CarriageReturn)
+                {
+                    // Return current line without CRLF
+                    return Encoding.UTF8.GetString(buffer.ToArray(), startPosition, buffer.Count - (startPosition + 2));
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/SshIdentification.cs b/src/Renci.SshNet/Connection/SshIdentification.cs
new file mode 100644
index 00000000..90c00fe9
--- /dev/null
+++ b/src/Renci.SshNet/Connection/SshIdentification.cs
@@ -0,0 +1,92 @@
+using System;
+
+namespace Renci.SshNet.Connection
+{
+    /// <summary>
+    /// Represents an SSH identification.
+    /// </summary>
+    internal class SshIdentification
+    {
+        /// <summary>
+        /// Initializes a new <see cref="SshIdentification"/> instance with the specified protocol version
+        /// and software version.
+        /// </summary>
+        /// <param name="protocolVersion">The SSH protocol version.</param>
+        /// <param name="softwareVersion">The software version of the implementation</param>
+        /// <exception cref="ArgumentNullException"><paramref name="protocolVersion"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="softwareVersion"/> is <see langword="null"/>.</exception>
+        public SshIdentification(string protocolVersion, string softwareVersion)
+            : this(protocolVersion, softwareVersion, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="SshIdentification"/> instance with the specified protocol version,
+        /// software version and comments.
+        /// </summary>
+        /// <param name="protocolVersion">The SSH protocol version.</param>
+        /// <param name="softwareVersion">The software version of the implementation</param>
+        /// <param name="comments">The comments.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="protocolVersion"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="softwareVersion"/> is <see langword="null"/>.</exception>
+        public SshIdentification(string protocolVersion, string softwareVersion, string comments)
+        {
+            if (protocolVersion == null)
+                throw new ArgumentNullException("protocolVersion");
+            if (softwareVersion == null)
+                throw new ArgumentNullException("softwareVersion");
+
+            ProtocolVersion = protocolVersion;
+            SoftwareVersion = softwareVersion;
+            Comments = comments;
+        }
+
+        /// <summary>
+        /// Gets or sets the software version of the implementation.
+        /// </summary>
+        /// <value>
+        /// The software version of the implementation.
+        /// </value>
+        /// <remarks>
+        /// This is primarily used to trigger compatibility extensions and to indicate
+        /// the capabilities of an implementation.
+        /// </remarks>
+        public string SoftwareVersion { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the SSH protocol version.
+        /// </summary>
+        /// <value>
+        /// The SSH protocol version.
+        /// </value>
+        public string ProtocolVersion { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the comments.
+        /// </summary>
+        /// <value>
+        /// The comments, or <see langword="null"/> if there are no comments.
+        /// </value>
+        /// <remarks>
+        /// <see cref="Comments"/> should contain additional information that might be useful
+        /// in solving user problems.
+        /// </remarks>
+        public string Comments { get; private set; }
+
+        /// <summary>
+        /// Returns the SSH identification string.
+        /// </summary>
+        /// <returns>
+        /// The SSH identification string.
+        /// </returns>
+        public override string ToString()
+        {
+            var identificationString = "SSH-" + ProtocolVersion + "-" + SoftwareVersion;
+            if (Comments != null)
+            {
+                identificationString += " " + Comments;
+            }
+            return identificationString;
+        }
+    }
+}
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index a244dda5..5b501961 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -120,5 +120,14 @@ namespace Renci.SshNet
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <see langword="null"/>.</exception>
         /// <exception cref="NotSupportedException">The <see cref="IConnectionInfo.ProxyType"/> value of <paramref name="connectionInfo"/> is not supported.</exception>
         IConnector CreateConnector(IConnectionInfo connectionInfo);
+
+        /// <summary>
+        /// Create an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
+        /// version exchange.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IProtocolVersionExchange"/>.
+        /// </returns>
+        IProtocolVersionExchange CreateProtocolVersionExchange();
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index e708f6a7..72112f32 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -220,5 +220,17 @@ namespace Renci.SshNet
                     throw new NotSupportedException(string.Format("ProxyTypes '{0}' is not supported.", connectionInfo.ProxyType));
             }
         }
+
+        /// <summary>
+        /// Create an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
+        /// version exchange.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IProtocolVersionExchange"/>.
+        /// </returns>
+        public IProtocolVersionExchange CreateProtocolVersionExchange()
+        {
+            return new ProtocolVersionExchange();
+        }
     }
 }
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 1f657e1e..bc3c0769 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -2,7 +2,6 @@
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
@@ -16,7 +15,6 @@ using System.Globalization;
 using System.Linq;
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Security.Cryptography;
-using System.Collections.Generic;
 
 namespace Renci.SshNet
 {
@@ -25,7 +23,6 @@ namespace Renci.SshNet
     /// </summary>
     public class Session : ISession
     {
-        private const byte Null = 0x00;
         internal const byte CarriageReturn = 0x0d;
         internal const byte LineFeed = 0x0a;
 
@@ -81,12 +78,6 @@ namespace Renci.SshNet
         /// </remarks>
         private const int LocalChannelDataPacketSize = 1024*64;
 
-#if FEATURE_REGEX_COMPILE
-        private static readonly Regex ServerVersionRe = new Regex("^SSH-(?<protoversion>[^-]+)-(?<softwareversion>.+)( SP.+)?$", RegexOptions.Compiled);
-#else
-        private static readonly Regex ServerVersionRe = new Regex("^SSH-(?<protoversion>[^-]+)-(?<softwareversion>.+)( SP.+)?$");
-#endif
-
         /// <summary>
         /// Controls how many authentication attempts can take place at the same time.
         /// </summary>
@@ -589,41 +580,19 @@ namespace Renci.SshNet
                     _socket = _serviceFactory.CreateConnector(ConnectionInfo)
                                              .Connect(ConnectionInfo);
 
-                    // Immediately send the identification string since the spec states both sides MUST send an identification string
-                    // when the connection has been established
-                    SocketAbstraction.Send(_socket, Encoding.UTF8.GetBytes(string.Format(CultureInfo.InvariantCulture, "{0}\x0D\x0A", ClientVersion)));
-
-                    Match versionMatch;
-
-                    // Get server version from the server,
-                    // ignore text lines which are sent before if any
-                    while (true)
-                    {
-                        var serverVersion = SocketReadLine(_socket, ConnectionInfo.Timeout);
-                        if (serverVersion == null)
-                            throw new SshConnectionException("Server response does not contain SSH protocol identification.", DisconnectReason.ProtocolError);
-                        versionMatch = ServerVersionRe.Match(serverVersion);
-                        if (versionMatch.Success)
-                        {
-                            ServerVersion = serverVersion;
-                            break;
-                        }
-                    }
+                    var serverIdentification = _serviceFactory.CreateProtocolVersionExchange()
+                                                              .Start(ClientVersion, _socket, ConnectionInfo.Timeout);
 
                     // Set connection versions
-                    ConnectionInfo.ServerVersion = ServerVersion;
+                    ConnectionInfo.ServerVersion = serverIdentification.ToString();
                     ConnectionInfo.ClientVersion = ClientVersion;
 
-                    // Get server SSH version
-                    var version = versionMatch.Result("${protoversion}");
+                    DiagnosticAbstraction.Log(string.Format("Server version '{0}' on '{1}'.", serverIdentification.ProtocolVersion, serverIdentification.SoftwareVersion));
 
-                    var softwareName = versionMatch.Result("${softwareversion}");
-
-                    DiagnosticAbstraction.Log(string.Format("Server version '{0}' on '{1}'.", version, softwareName));
-
-                    if (!(version.Equals("2.0") || version.Equals("1.99")))
+                    if (!(serverIdentification.ProtocolVersion.Equals("2.0") || serverIdentification.ProtocolVersion.Equals("1.99")))
                     {
-                        throw new SshConnectionException(string.Format(CultureInfo.CurrentCulture, "Server version '{0}' is not supported.", version), DisconnectReason.ProtocolVersionNotSupported);
+                        throw new SshConnectionException(string.Format(CultureInfo.CurrentCulture, "Server version '{0}' is not supported.", serverIdentification.ProtocolVersion),
+                                                         DisconnectReason.ProtocolVersionNotSupported);
                     }
 
                     // Register Transport response messages
@@ -1771,49 +1740,6 @@ namespace Renci.SshNet
             return SocketAbstraction.Read(socket, buffer, offset, length, InfiniteTimeSpan);
         }
 
-        /// <summary>
-        /// Performs a blocking read on the socket until a line is read.
-        /// </summary>
-        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
-        /// <param name="timeout">A <see cref="TimeSpan"/> that represents the time to wait until a line is read.</param>
-        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
-        /// <exception cref="SocketException">An error occurred when trying to access the socket.</exception>
-        /// <returns>
-        /// The line read from the socket, or <c>null</c> when the remote server has shutdown and all data has been received.
-        /// </returns>
-        private static string SocketReadLine(Socket socket, TimeSpan timeout)
-        {
-            var encoding = SshData.Ascii;
-            var buffer = new List<byte>();
-            var data = new byte[1];
-
-            // read data one byte at a time to find end of line and leave any unhandled information in the buffer
-            // to be processed by subsequent invocations
-            do
-            {
-                var bytesRead = SocketAbstraction.Read(socket, data, 0, data.Length, timeout);
-                if (bytesRead == 0)
-                    // the remote server shut down the socket
-                    break;
-
-                buffer.Add(data[0]);
-            }
-            while (!(buffer.Count > 0 && (buffer[buffer.Count - 1] == LineFeed || buffer[buffer.Count - 1] == Null)));
-
-            if (buffer.Count == 0)
-                return null;
-            if (buffer.Count == 1 && buffer[buffer.Count - 1] == 0x00)
-                // return an empty version string if the buffer consists of only a 0x00 character
-                return string.Empty;
-            if (buffer.Count > 1 && buffer[buffer.Count - 2] == CarriageReturn)
-                // strip trailing CRLF
-                return encoding.GetString(buffer.ToArray(), 0, buffer.Count - 2);
-            if (buffer.Count > 1 && buffer[buffer.Count - 1] == LineFeed)
-                // strip trailing LF
-                return encoding.GetString(buffer.ToArray(), 0, buffer.Count - 1);
-            return encoding.GetString(buffer.ToArray(), 0, buffer.Count);
-        }
-
         /// <summary>
         /// Shuts down and disposes the socket.
         /// </summary>

From e0b32a41eaf275ae02a0568aa535dba6c1545ebf Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Tue, 29 Dec 2020 19:53:46 +0100
Subject: [PATCH 09/19] Add Connect overload that takes existing Socket
 instance.

---
 .../Abstractions/SocketAbstraction.cs         | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/Renci.SshNet/Abstractions/SocketAbstraction.cs b/src/Renci.SshNet/Abstractions/SocketAbstraction.cs
index f15b6034..7c53c942 100644
--- a/src/Renci.SshNet/Abstractions/SocketAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/SocketAbstraction.cs
@@ -49,8 +49,18 @@ namespace Renci.SshNet.Abstractions
 
         public static Socket Connect(IPEndPoint remoteEndpoint, TimeSpan connectTimeout)
         {
-            var socket = new Socket(remoteEndpoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp) {NoDelay = true};
+            var socket = new Socket(remoteEndpoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp) { NoDelay = true };
+            ConnectCore(socket, remoteEndpoint, connectTimeout, true);
+            return socket;
+        }
 
+        public static void Connect(Socket socket, IPEndPoint remoteEndpoint, TimeSpan connectTimeout)
+        {
+            ConnectCore(socket, remoteEndpoint, connectTimeout, false);
+        }
+
+        private static void ConnectCore(Socket socket, IPEndPoint remoteEndpoint, TimeSpan connectTimeout, bool ownsSocket)
+        {
 #if FEATURE_SOCKET_EAP
             var connectCompleted = new ManualResetEvent(false);
             var args = new SocketAsyncEventArgs
@@ -66,8 +76,11 @@ namespace Renci.SshNet.Abstractions
                 {
                     // avoid ObjectDisposedException in ConnectCompleted
                     args.Completed -= ConnectCompleted;
-                    // dispose Socket
-                    socket.Dispose();
+                    if (ownsSocket)
+                    {
+                        // dispose Socket
+                        socket.Dispose();
+                    }
                     // dispose ManualResetEvent
                     connectCompleted.Dispose();
                     // dispose SocketAsyncEventArgs
@@ -86,8 +99,12 @@ namespace Renci.SshNet.Abstractions
             {
                 var socketError = (int) args.SocketError;
 
-                // dispose Socket
-                socket.Dispose();
+                if (ownsSocket)
+                {
+                    // dispose Socket
+                    socket.Dispose();
+                }
+
                 // dispose SocketAsyncEventArgs
                 args.Dispose();
 
@@ -96,20 +113,16 @@ namespace Renci.SshNet.Abstractions
 
             // dispose SocketAsyncEventArgs
             args.Dispose();
-
-            return socket;
 #elif FEATURE_SOCKET_APM
             var connectResult = socket.BeginConnect(remoteEndpoint, null, null);
             if (!connectResult.AsyncWaitHandle.WaitOne(connectTimeout, false))
                 throw new SshOperationTimeoutException(string.Format(CultureInfo.InvariantCulture,
                     "Connection failed to establish within {0:F0} milliseconds.", connectTimeout.TotalMilliseconds));
             socket.EndConnect(connectResult);
-            return socket;
 #elif FEATURE_SOCKET_TAP
             if (!socket.ConnectAsync(remoteEndpoint).Wait(connectTimeout))
                 throw new SshOperationTimeoutException(string.Format(CultureInfo.InvariantCulture,
                     "Connection failed to establish within {0:F0} milliseconds.", connectTimeout.TotalMilliseconds));
-            return socket;
 #else
             #error Connecting to a remote endpoint is not implemented.
 #endif
@@ -311,24 +324,28 @@ namespace Renci.SshNet.Abstractions
         /// <param name="buffer">An array of type <see cref="byte"/> that is the storage location for the received data. </param>
         /// <param name="offset">The position in <paramref name="buffer"/> parameter to store the received data.</param>
         /// <param name="size">The number of bytes to receive.</param>
-        /// <param name="timeout">Specifies the amount of time after which the call will time out.</param>
+        /// <param name="readTimeout">The maximum time to wait until <paramref name="size"/> bytes have been received.</param>
         /// <returns>
         /// The number of bytes received.
         /// </returns>
         /// <remarks>
+        /// <para>
         /// If no data is available for reading, the <see cref="Read(Socket, byte[], int, int, TimeSpan)"/> method will
         /// block until data is available or the time-out value is exceeded. If the time-out value is exceeded, the
         /// <see cref="Read(Socket, byte[], int, int, TimeSpan)"/> call will throw a <see cref="SshOperationTimeoutException"/>.
-        ///  If you are in non-blocking mode, and there is no data available in the in the protocol stack buffer, the
+        /// </para>
+        /// <para>
+        /// If you are in non-blocking mode, and there is no data available in the in the protocol stack buffer, the
         /// <see cref="Read(Socket, byte[], int, int, TimeSpan)"/> method will complete immediately and throw a <see cref="SocketException"/>.
+        /// </para>
         /// </remarks>
-        public static int Read(Socket socket, byte[] buffer, int offset, int size, TimeSpan timeout)
+        public static int Read(Socket socket, byte[] buffer, int offset, int size, TimeSpan readTimeout)
         {
 #if FEATURE_SOCKET_SYNC
             var totalBytesRead = 0;
             var totalBytesToRead = size;
 
-            socket.ReceiveTimeout = (int) timeout.TotalMilliseconds;
+            socket.ReceiveTimeout = (int)readTimeout.TotalMilliseconds;
 
             do
             {
@@ -350,7 +367,7 @@ namespace Renci.SshNet.Abstractions
 
                     if (ex.SocketErrorCode == SocketError.TimedOut)
                         throw new SshOperationTimeoutException(string.Format(CultureInfo.InvariantCulture,
-                            "Socket read operation has timed out after {0:F0} milliseconds.", timeout.TotalMilliseconds));
+                            "Socket read operation has timed out after {0:F0} milliseconds.", readTimeout.TotalMilliseconds));
 
                      throw;
                 }

From 60be75d85cca86d7a97e7f22845b75e121fefe4c Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Tue, 29 Dec 2020 20:01:28 +0100
Subject: [PATCH 10/19] Complete refactoring of connection process, and greatly
 improve test coverage.

---
 .../Classes/BaseClientTestBase.cs             |  35 ++
 ...Test_Connect_OnConnectedThrowsException.cs |  61 ++-
 ...Connected_KeepAliveInterval_NegativeOne.cs |  83 ++--
 ...nected_KeepAliveInterval_NotNegativeOne.cs |  81 ++--
 ...Connected_KeepAlivesNotSentConcurrently.cs |  89 ++--
 .../BaseClientTest_Disconnected_Connect.cs    | 107 +++++
 ...nected_KeepAliveInterval_NotNegativeOne.cs |  77 ++--
 ...nected_KeepAliveInterval_NotNegativeOne.cs |  55 +--
 .../Connection/DirectConnectorTestBase.cs     |  44 ++
 ...rTest_Connect_ConnectionRefusedByServer.cs | 103 +++++
 ...nnectorTest_Connect_ConnectionSucceeded.cs | 118 +++++
 ...ctConnectorTest_Connect_HostNameInvalid.cs |  42 ++
 ...rTest_Connect_TimeoutConnectingToServer.cs | 108 +++++
 .../Connection/HttpConnectorTestBase.cs       |  35 ++
 ...orTest_Connect_ConnectionToProxyRefused.cs | 111 +++++
 ...yClosesConnectionBeforeStatusLineIsSent.cs | 115 +++++
 ...pConnectorTest_Connect_ProxyHostInvalid.cs |  49 +++
 ...nectorTest_Connect_ProxyPasswordIsEmpty.cs | 131 ++++++
 ...nnectorTest_Connect_ProxyPasswordIsNull.cs | 131 ++++++
 ...oxyResponseDoesNotContainHttpStatusLine.cs | 120 ++++++
 ...seStatusIs200_ExtraTextBeforeStatusLine.cs | 135 ++++++
 ...xyResponseStatusIs200_HeadersAndContent.cs | 135 ++++++
 ...ct_ProxyResponseStatusIs200_OnlyHeaders.cs | 133 ++++++
 ...est_Connect_ProxyResponseStatusIsNot200.cs | 120 ++++++
 ...nectorTest_Connect_ProxyUserNameIsEmpty.cs | 132 ++++++
 ...nnect_ProxyUserNameIsNotNullAndNotEmpty.cs | 128 ++++++
 ...nnectorTest_Connect_ProxyUserNameIsNull.cs | 132 ++++++
 ...orTest_Connect_TimeoutConnectingToProxy.cs | 115 +++++
 ...rTest_Connect_TimeoutReadingHttpContent.cs | 169 ++++++++
 ...orTest_Connect_TimeoutReadingStatusLine.cs | 139 ++++++
 ...changeTest_ServerResponseValid_Comments.cs |  12 +-
 .../Connection/Socks4ConnectorTestBase.cs     |  49 +++
 ...rTest_Connect_ConnectionRejectedByProxy.cs | 134 ++++++
 ...nnectorTest_Connect_ConnectionSucceeded.cs | 166 +++++++
 ...orTest_Connect_ConnectionToProxyRefused.cs | 102 +++++
 ...orTest_Connect_TimeoutConnectingToProxy.cs | 105 +++++
 ...onnect_TimeoutReadingDestinationAddress.cs | 143 ++++++
 ...torTest_Connect_TimeoutReadingReplyCode.cs | 139 ++++++
 ...Test_Connect_TimeoutReadingReplyVersion.cs | 131 ++++++
 .../Connection/Socks5ConnectorTestBase.cs     |  68 +++
 ...orTest_Connect_ConnectionToProxyRefused.cs | 103 +++++
 ...ct_NoAuthentication_ConnectionSucceeded.cs | 206 +++++++++
 ...Connect_ProxySocksVersionIsNotSupported.cs | 123 ++++++
 ...orTest_Connect_TimeoutConnectingToProxy.cs | 107 +++++
 ...wordAuthentication_AuthenticationFailed.cs | 177 ++++++++
 ...swordAuthentication_ConnectionSucceeded.cs | 220 ++++++++++
 ...entication_PasswordExceedsMaximumLength.cs | 149 +++++++
 ...entication_UserNameExceedsMaximumLength.cs | 149 +++++++
 .../Classes/NetConfClientTestBase.cs          |  17 +
 ...st_Connect_NetConfSessionConnectFailure.cs |  40 +-
 .../NetConfClientTest_Dispose_Connected.cs    |  72 ++--
 .../NetConfClientTest_Dispose_Disconnected.cs |  42 +-
 .../NetConfClientTest_Dispose_Disposed.cs     |  54 +--
 .../NetConfClientTest_Finalize_Connected.cs   |  69 +--
 .../Classes/ScpClientTestBase.cs              |  33 +-
 ...rectoryInfo_SendExecRequestReturnsFalse.cs |   5 +-
 ...AndFileInfo_SendExecRequestReturnsFalse.cs |   5 +-
 ...thAndStream_SendExecRequestReturnsFalse.cs |   5 +-
 ...InfoAndPath_SendExecRequestReturnsFalse.cs |   5 +-
 ...InfoAndPath_SendExecRequestReturnsFalse.cs |   5 +-
 ...ientTest_Upload_FileInfoAndPath_Success.cs |   5 +-
 ...reamAndPath_SendExecRequestReturnsFalse.cs |   5 +-
 .../ServiceFactoryTest_CreateConnector.cs     |  59 ++-
 .../Classes/SessionTest.HttpProxy.cs          | 280 ------------
 src/Renci.SshNet.Tests/Classes/SessionTest.cs | 406 +-----------------
 .../Classes/SessionTestBase.cs                |  35 ++
 .../SessionTest_ConnectToServerFails.cs       | 265 ++++++++++++
 .../Classes/SessionTest_Connected.cs          |  11 +-
 .../Classes/SessionTest_ConnectedBase.cs      |  88 ++--
 .../SessionTest_Connected_Disconnect.cs       |  10 +-
 ...alRequestMessageAfterAuthenticationRace.cs |   3 +-
 ...Connected_ServerAndClientDisconnectRace.cs | 108 +++--
 ..._Connected_ServerSendsDisconnectMessage.cs |   3 +-
 ...endsDisconnectMessageAndShutsDownSocket.cs |   3 +-
 ...ected_ServerSendsUnsupportedMessageType.cs |   3 +-
 .../Classes/SessionTest_NotConnected.cs       |  31 +-
 ...est_SocketConnected_BadPacketAndDispose.cs |  34 +-
 .../Classes/SftpClientTestBase.cs             |  19 +
 ...tTest_Connect_SftpSessionConnectFailure.cs |  49 +--
 .../SftpClientTest_Dispose_Connected.cs       |  52 ++-
 .../SftpClientTest_Dispose_Disconnected.cs    |  47 +-
 .../SftpClientTest_Dispose_Disposed.cs        |  52 ++-
 .../SftpClientTest_Finalize_Connected.cs      |  57 +--
 ...AndBufferSizeAndTerminalModes_Connected.cs |  35 +-
 ...ndWidthAndHeightAndBufferSize_Connected.cs |  34 +-
 ...entTest_Disconnect_ForwardedPortStarted.cs |  39 +-
 .../SshClientTest_Dispose_Connected.cs        |  48 ++-
 .../SshClientTest_Dispose_Disconnected.cs     |  48 ++-
 .../Classes/SshClientTest_Dispose_Disposed.cs |  48 ++-
 ...ClientTest_Dispose_ForwardedPortStarted.cs |  40 +-
 .../Common/AsyncSocketListener.cs             |  82 +++-
 .../Common/TripleATestBase.cs                 |  29 ++
 src/Renci.SshNet/BaseClient.cs                |   2 +-
 src/Renci.SshNet/Connection/ConnectorBase.cs  |  64 ++-
 .../Connection/DirectConnector.cs             |   4 +
 src/Renci.SshNet/Connection/HttpConnector.cs  |  59 ++-
 src/Renci.SshNet/Connection/ISocketFactory.cs |   9 +
 src/Renci.SshNet/Connection/SocketFactory.cs  |  12 +
 .../Connection/Socks4Connector.cs             |  62 ++-
 .../Connection/Socks5Connector.cs             |  41 +-
 src/Renci.SshNet/IServiceFactory.cs           |  25 +-
 src/Renci.SshNet/ServiceFactory.cs            |  37 +-
 src/Renci.SshNet/Session.cs                   |  13 +-
 103 files changed, 6449 insertions(+), 1575 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/BaseClientTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_Connect.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/NetConfClientTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/SessionTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/SessionTest_ConnectToServerFails.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/SftpClientTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Common/TripleATestBase.cs
 create mode 100644 src/Renci.SshNet/Connection/ISocketFactory.cs
 create mode 100644 src/Renci.SshNet/Connection/SocketFactory.cs

diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTestBase.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTestBase.cs
new file mode 100644
index 00000000..2cce2e91
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTestBase.cs
@@ -0,0 +1,35 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    public abstract class BaseClientTestBase : TripleATestBase
+    {
+        internal Mock<IServiceFactory> _serviceFactoryMock { get; private set; }
+        internal Mock<ISocketFactory> _socketFactoryMock { get; private set; }
+        internal Mock<ISession> _sessionMock { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs
index 792ab89d..e21f516d 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs
@@ -9,24 +9,30 @@ using Renci.SshNet.Security;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_Connect_OnConnectedThrowsException
+    public class BaseClientTest_Connect_OnConnectedThrowsException : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private MyClient _client;
         private ConnectionInfo _connectionInfo;
         private ApplicationException _onConnectException;
         private ApplicationException _actualException;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _onConnectException = new ApplicationException();
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.Setup(p => p.Connect());
+            _sessionMock.Setup(p => p.Dispose());
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -36,31 +42,9 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
+        protected override void Arrange()
         {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _onConnectException = new ApplicationException();
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
-        {
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
-                               .Returns(_sessionMock.Object);
-            _sessionMock.Setup(p => p.Connect());
-            _sessionMock.Setup(p => p.Dispose());
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
+            base.Arrange();
 
             _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object)
                 {
@@ -68,7 +52,7 @@ namespace Renci.SshNet.Tests.Classes
                 };
         }
 
-        protected void Act()
+        protected override void Act()
         {
             try
             {
@@ -88,10 +72,17 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreSame(_onConnectException, _actualException);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NegativeOne.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NegativeOne.cs
index fb58e1f4..e3b10c87 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NegativeOne.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NegativeOne.cs
@@ -2,29 +2,49 @@
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages.Transport;
 
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_Connected_KeepAliveInterval_NegativeOne
+    public class BaseClientTest_Connected_KeepAliveInterval_NegativeOne : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
         private TimeSpan _keepAliveInterval;
         private int _keepAliveCount;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveInterval = TimeSpan.FromMilliseconds(100d);
+            _keepAliveCount = 0;
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.Setup(p => p.Connect());
+            _sessionMock.Setup(p => p.IsConnected).Returns(true);
+            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
+                        .Returns(true)
+                        .Callback(() => Interlocked.Increment(ref _keepAliveCount));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _client.Connect();
+            _client.KeepAliveInterval = _keepAliveInterval;
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -34,42 +54,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
-        {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _keepAliveInterval = TimeSpan.FromMilliseconds(100d);
-            _keepAliveCount = 0;
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
-        {
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
-                               .Returns(_sessionMock.Object);
-            _sessionMock.Setup(p => p.Connect());
-            _sessionMock.Setup(p => p.IsConnected).Returns(true);
-            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
-                        .Returns(true)
-                        .Callback(() => Interlocked.Increment(ref _keepAliveCount));
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _client.Connect();
-            _client.KeepAliveInterval = _keepAliveInterval;
-        }
-
-        protected void Act()
+        protected override void Act()
         {
             // allow keep-alive to be sent once
             Thread.Sleep(150);
@@ -84,10 +69,16 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreEqual(TimeSpan.FromMilliseconds(-1), _client.KeepAliveInterval);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs
index a3c807bd..26a8da00 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs
@@ -7,24 +7,42 @@ using Renci.SshNet.Messages.Transport;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne
+    public class BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
         private TimeSpan _keepAliveInterval;
         private int _keepAliveCount;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveInterval = TimeSpan.FromMilliseconds(50d);
+            _keepAliveCount = 0;
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.Setup(p => p.Connect());
+            _sessionMock.Setup(p => p.IsConnected).Returns(true);
+            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
+                        .Returns(true)
+                        .Callback(() => Interlocked.Increment(ref _keepAliveCount));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _client.Connect();
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -34,41 +52,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
-        {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _keepAliveInterval = TimeSpan.FromMilliseconds(50d);
-            _keepAliveCount = 0;
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
-        {
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
-                               .Returns(_sessionMock.Object);
-            _sessionMock.Setup(p => p.Connect());
-            _sessionMock.Setup(p => p.IsConnected).Returns(true);
-            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
-                        .Returns(true)
-                        .Callback(() => Interlocked.Increment(ref _keepAliveCount));
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _client.Connect();
-        }
-
-        protected void Act()
+        protected override void Act()
         {
             _client.KeepAliveInterval = _keepAliveInterval;
 
@@ -82,10 +66,17 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreEqual(_keepAliveInterval, _client.KeepAliveInterval);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
index 4430b657..25d6ec7c 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
@@ -7,24 +7,53 @@ using Renci.SshNet.Messages.Transport;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_Connected_KeepAlivesNotSentConcurrently
+    public class BaseClientTest_Connected_KeepAlivesNotSentConcurrently : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private MockSequence _mockSequence;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
         private ManualResetEvent _keepAliveSent;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveSent = new ManualResetEvent(false);
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void SetupMocks()
+        {
+            _mockSequence = new MockSequence();
+
+            _serviceFactoryMock.InSequence(_mockSequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(_mockSequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.InSequence(_mockSequence)
+                        .Setup(p => p.Connect());
+            _sessionMock.InSequence(_mockSequence)
+                        .Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
+                        .Returns(true)
+                        .Callback(() =>
+                            {
+                                Thread.Sleep(300);
+                                _keepAliveSent.Set();
+                            });
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object)
+                {
+                    KeepAliveInterval = TimeSpan.FromMilliseconds(50d)
+                };
+            _client.Connect();
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -34,47 +63,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
-        {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _keepAliveSent = new ManualResetEvent(false);
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
-        {
-            _mockSequence = new MockSequence();
-
-            _serviceFactoryMock.InSequence(_mockSequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
-            _sessionMock.InSequence(_mockSequence).Setup(p => p.Connect());
-            _sessionMock.InSequence(_mockSequence).Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
-                        .Returns(true)
-                        .Callback(() =>
-                        {
-                            Thread.Sleep(300);
-                            _keepAliveSent.Set();
-                        });
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object)
-                {
-                    KeepAliveInterval = TimeSpan.FromMilliseconds(50d)
-                };
-            _client.Connect();
-        }
-
-        protected void Act()
+        protected override void Act()
         {
             // should keep-alive message be sent concurrently, then multiple keep-alive
             // message would be sent during this sleep period
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_Connect.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_Connect.cs
new file mode 100644
index 00000000..51cd2d81
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_Connect.cs
@@ -0,0 +1,107 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Connection;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class BaseClientTest_Disconnected_Connect : BaseClientTestBase
+    {
+        private Mock<ISocketFactory> _socketFactory2Mock;
+        private Mock<ISession> _session2Mock;
+        private BaseClient _client;
+        private ConnectionInfo _connectionInfo;
+
+        protected override void SetupData()
+        {
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+        }
+
+        protected override void CreateMocks()
+        {
+            base.CreateMocks();
+
+            _socketFactory2Mock = new Mock<ISocketFactory>(MockBehavior.Strict);
+            _session2Mock = new Mock<ISession>(MockBehavior.Strict);
+        }
+
+        protected override void SetupMocks()
+        {
+            var sequence = new MockSequence();
+
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.Connect());
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.OnDisconnecting());
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.Dispose());
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactory2Mock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactory2Mock.Object))
+                               .Returns(_session2Mock.Object);
+            _session2Mock.InSequence(sequence)
+                        .Setup(p => p.Connect());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _client.Connect();
+            _client.Disconnect();
+        }
+
+        protected override void TearDown()
+        {
+            if (_client != null)
+            {
+                _session2Mock.Setup(p => p.OnDisconnecting());
+                _session2Mock.Setup(p => p.Dispose());
+                _client.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _client.Connect();
+        }
+
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedTwic()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void CreateSessionOnServiceFactoryShouldBeInvokedTwice()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactory2Mock.Object),
+                                       Times.Once);
+        }
+
+        [TestMethod]
+        public void ConnectOnSessionShouldBeInvokedTwice()
+        {
+            _sessionMock.Verify(p => p.Connect(), Times.Once);
+            _session2Mock.Verify(p => p.Connect(), Times.Once);
+        }
+
+        private class MyClient : BaseClient
+        {
+            public MyClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, IServiceFactory serviceFactory) : base(connectionInfo, ownsConnectionInfo, serviceFactory)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne.cs
index 588bfd83..1ca4b19d 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne.cs
@@ -7,23 +7,39 @@ using Renci.SshNet.Messages.Transport;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne
+    public class BaseClientTest_Disconnected_KeepAliveInterval_NotNegativeOne : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
         private TimeSpan _keepAliveInterval;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveInterval = TimeSpan.FromMilliseconds(50d);
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.Setup(p => p.Connect());
+            _sessionMock.Setup(p => p.IsConnected).Returns(false);
+            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
+                        .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _client.Connect();
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -33,39 +49,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
-        {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _keepAliveInterval = TimeSpan.FromMilliseconds(50d);
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
-        {
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
-                               .Returns(_sessionMock.Object);
-            _sessionMock.Setup(p => p.Connect());
-            _sessionMock.Setup(p => p.IsConnected).Returns(false);
-            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
-                        .Returns(true);
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _client.Connect();
-        }
-
-        protected void Act()
+        protected override void Act()
         {
             _client.KeepAliveInterval = _keepAliveInterval;
 
@@ -79,10 +63,17 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreEqual(_keepAliveInterval, _client.KeepAliveInterval);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne.cs
index dfaa8b27..0f449c82 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne.cs
@@ -7,24 +7,28 @@ using Renci.SshNet.Messages.Transport;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne
+    public class BaseClientTest_NotConnected_KeepAliveInterval_NotNegativeOne : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
         private TimeSpan _keepAliveInterval;
         private int _keepAliveCount;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
+            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveInterval = TimeSpan.FromMilliseconds(100d);
+            _keepAliveCount = 0;
         }
 
-        [TestCleanup]
-        public void Cleanup()
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
+        }
+
+        protected override void TearDown()
         {
             if (_client != null)
             {
@@ -34,33 +38,7 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
-        private void SetupData()
-        {
-            _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
-            _keepAliveInterval = TimeSpan.FromMilliseconds(100d);
-            _keepAliveCount = 0;
-        }
-
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private static void SetupMocks()
-        {
-        }
-
-        protected void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object);
-        }
-
-        protected void Act()
+        protected override void Act()
         {
             _client.KeepAliveInterval = _keepAliveInterval;
 
@@ -77,7 +55,10 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ConnectShouldActivateKeepAliveIfSessionIs()
         {
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.Setup(p => p.Connect());
             _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
                         .Returns(true)
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTestBase.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTestBase.cs
new file mode 100644
index 00000000..edb14680
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTestBase.cs
@@ -0,0 +1,44 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System.Net;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    public abstract class DirectConnectorTestBase : TripleATestBase
+    {
+        internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
+        internal DirectConnector Connector { get; private set; }
+        internal SocketFactory SocketFactory { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+            Connector = new DirectConnector(SocketFactoryMock.Object);
+            SocketFactory = new SocketFactory();
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected sealed override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+
+        protected ConnectionInfo CreateConnectionInfo(string hostName)
+        {
+            return new ConnectionInfo(hostName,
+                                      777,
+                                      "user",
+                                      new KeyboardInteractiveAuthenticationMethod("user"));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs
new file mode 100644
index 00000000..40fd93b5
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs
@@ -0,0 +1,103 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class DirectConnectorTest_Connect_ConnectionRefusedByServer : DirectConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo(IPAddress.Loopback.ToString());
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(5000);
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.ConnectionRefused, _actualException.SocketErrorCode);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs
new file mode 100644
index 00000000..5741c186
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs
@@ -0,0 +1,118 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class DirectConnectorTest_Connect_ConnectionSucceeded : DirectConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _server;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+        private bool _disconnected;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo(IPAddress.Loopback.ToString());
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _disconnected = false;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Disconnected += (socket) => _disconnected = true;
+            _server.Connected += (socket) => socket.Send(new byte[1] { 0x44 });
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                _actual = Connector.Connect(_connectionInfo);
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveReturnedSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsTrue(_clientSocket.Connected);
+            Assert.IsFalse(_disconnected);
+        }
+
+        [TestMethod]
+        public void NoBytesShouldHaveBeenReadFromSocket()
+        {
+            var buffer = new byte[1];
+
+            var bytesRead = _clientSocket.Receive(buffer);
+            Assert.AreEqual(1, bytesRead);
+            Assert.AreEqual(0x44, buffer[0]);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs
new file mode 100644
index 00000000..05a69e94
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs
@@ -0,0 +1,42 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class DirectConnectorTest_Connect_HostNameInvalid : DirectConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("invalid.");
+            _actualException = null;
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.HostNotFound, _actualException.SocketErrorCode);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
new file mode 100644
index 00000000..b8e4246a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
@@ -0,0 +1,108 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class DirectConnectorTest_Connect_TimeoutConnectingToServer : DirectConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo(IPAddress.Loopback.ToString());
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs
new file mode 100644
index 00000000..82cfe0c2
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs
@@ -0,0 +1,35 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    public abstract class HttpConnectorTestBase : TripleATestBase
+    {
+        internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
+        internal HttpConnector Connector { get; private set; }
+        internal SocketFactory SocketFactory { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+            Connector = new HttpConnector(SocketFactoryMock.Object);
+            SocketFactory = new SocketFactory();
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected sealed override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs
new file mode 100644
index 00000000..5c790b4c
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -0,0 +1,111 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ConnectionToProxyRefused : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(5000);
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.ConnectionRefused, _actualException.SocketErrorCode);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs
new file mode 100644
index 00000000..72bdca90
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs
@@ -0,0 +1,115 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    socket.Shutdown(SocketShutdown.Send);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("HTTP response does not contain status line.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs
new file mode 100644
index 00000000..5843947d
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs
@@ -0,0 +1,49 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyHostInvalid : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo("localhost",
+                                                 40,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 "invalid.",
+                                                 80,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _actualException = null;
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.HostNotFound, _actualException.SocketErrorCode);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs
new file mode 100644
index 00000000..c94933b2
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs
@@ -0,0 +1,131 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyPasswordIsEmpty : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 string.Empty,
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOg=={2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.Connected += socket =>
+                {
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("SSH.NET\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                        socket.Shutdown(SocketShutdown.Send);
+                };
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+            Assert.AreEqual(0, _actual.Receive(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs
new file mode 100644
index 00000000..277a6f29
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs
@@ -0,0 +1,131 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyPasswordIsNull : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 null,
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOg=={2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.Connected += socket =>
+            {
+                socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                socket.Send(Encoding.ASCII.GetBytes("SSH.NET\r\n"));
+                socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                socket.Shutdown(SocketShutdown.Send);
+            };
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+            Assert.AreEqual(0, _actual.Receive(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs
new file mode 100644
index 00000000..b9f90019
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs
@@ -0,0 +1,120 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    if (_bytesReceivedByProxy.Count == 0)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("Whatever\r\n"));
+                        socket.Shutdown(SocketShutdown.Send);
+                    }
+
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("HTTP response does not contain status line.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs
new file mode 100644
index 00000000..70491330
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs
@@ -0,0 +1,135 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOnByb3h5UHdk{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                // Only send response back after we've received the complete CONNECT request
+                // as we want to make sure HttpConnector is not waiting for any data before
+                // it sends the CONNECT request
+                if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                {
+                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("SSH.NET\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                    socket.Shutdown(SocketShutdown.Send);
+                }
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+            Assert.AreEqual(0, _actual.Receive(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs
new file mode 100644
index 00000000..dc0bba59
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs
@@ -0,0 +1,135 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOnByb3h5UHdk{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    // Only send response back after we've received the complete CONNECT request
+                    // as we want to make sure HttpConnector is not waiting for any data before
+                    // it sends the CONNECT request
+                    if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Length: 10\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("TEEN_BYTES"));
+                        socket.Send(Encoding.ASCII.GetBytes("!666!"));
+                        socket.Shutdown(SocketShutdown.Send);
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[5];
+
+            Assert.AreEqual(5, _actual.Available);
+            Assert.AreEqual(5, _actual.Receive(buffer));
+            Assert.AreEqual("!666!", Encoding.ASCII.GetString(buffer));
+            Assert.AreEqual(0, _actual.Receive(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs
new file mode 100644
index 00000000..235b4dc0
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs
@@ -0,0 +1,133 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOnByb3h5UHdk{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    // Only send response back after we've received the complete CONNECT request
+                    // as we want to make sure HttpConnector is not waiting for any data before
+                    // it sends the CONNECT request
+                    if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                        socket.Shutdown(SocketShutdown.Send);
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+            Assert.AreEqual(0, _actual.Receive(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs
new file mode 100644
index 00000000..9eb0094b
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs
@@ -0,0 +1,120 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyResponseStatusIsNot200 : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    if (_bytesReceivedByProxy.Count == 0)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 404 I searched everywhere, really...\r\n"));
+                        socket.Shutdown(SocketShutdown.Send);
+                    }
+
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("HTTP: Status code 404, \"I searched everywhere, really...\"", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
new file mode 100644
index 00000000..63bb1baa
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
@@ -0,0 +1,132 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyUserNameIsEmpty : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 string.Empty,
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    // Only send response back after we've received the complete CONNECT request
+                    // as we want to make sure HttpConnector is not waiting for any data before
+                    // it sends the CONNECT request
+                    if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("SSH.NET\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Send);
+                _clientSocket.Close();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs
new file mode 100644
index 00000000..dad0e74b
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs
@@ -0,0 +1,128 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "user",
+                                                 "pwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic dXNlcjpwd2Q={2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Connected += (socket) =>
+                {
+                    socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                };
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Close();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
+
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs
new file mode 100644
index 00000000..3de1bddb
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs
@@ -0,0 +1,132 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_ProxyUserNameIsNull : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private bool _disconnected;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 null,
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(20);
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _disconnected = false;
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                // Only send response back after we've received the complete CONNECT request
+                // as we want to make sure HttpConnector is not waiting for any data before
+                // it sends the CONNECT request
+                if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                {
+                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("SSH.NET\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                    socket.Send(Encoding.ASCII.GetBytes("SSH4EVER"));
+                }
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Send);
+                _clientSocket.Close();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlyHttpResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[8];
+
+            Assert.AreEqual(8, _actual.Available);
+            Assert.AreEqual(8, _actual.Receive(buffer));
+            Assert.AreEqual("SSH4EVER", Encoding.ASCII.GetString(buffer));
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
new file mode 100644
index 00000000..1a65fec1
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -0,0 +1,115 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_TimeoutConnectingToProxy : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs
new file mode 100644
index 00000000..29ea435d
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs
@@ -0,0 +1,169 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_TimeoutReadingHttpContent : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private List<byte> _bytesReceivedByProxy;
+        private string _expectedHttpRequest;
+        private Stopwatch _stopWatch;
+        private AsyncSocketListener _server;
+        private bool _disconnected;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _expectedHttpRequest = string.Format("CONNECT {0}:{1} HTTP/1.0{2}" +
+                                                 "Proxy-Authorization: Basic cHJveHlVc2VyOnByb3h5UHdk{2}{2}",
+                                                 _connectionInfo.Host,
+                                                 _connectionInfo.Port.ToString(CultureInfo.InvariantCulture),
+                                                 "\r\n");
+            _bytesReceivedByProxy = new List<byte>();
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    // Force a timeout by sending less content than indicated by Content-Length header
+                    if (_bytesReceivedByProxy.Count == _expectedHttpRequest.Length)
+                    {
+                        socket.Send(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Length: 10\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
+                        socket.Send(Encoding.ASCII.GetBytes("TOO_FEW"));
+                    }
+                };
+            _proxyServer.Start();
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedHttpRequest()
+        {
+            Assert.AreEqual(_expectedHttpRequest, Encoding.ASCII.GetString(_bytesReceivedByProxy.ToArray()));
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsTrue(_disconnected);
+            Assert.IsFalse(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs
new file mode 100644
index 00000000..254262ba
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs
@@ -0,0 +1,139 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class HttpConnectorTest_Connect_TimeoutReadingStatusLine : HttpConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private Stopwatch _stopWatch;
+        private AsyncSocketListener _server;
+        private bool _disconnected;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                                 777,
+                                                 "user",
+                                                 ProxyTypes.Http,
+                                                 IPAddress.Loopback.ToString(),
+                                                 8122,
+                                                 "proxyUser",
+                                                 "proxyPwd",
+                                                 new KeyboardInteractiveAuthenticationMethod("user"));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += (socket) => _disconnected = true;
+            _proxyServer.Start();
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsTrue(_disconnected);
+            Assert.IsFalse(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
index a71a1edf..d4aa0c7c 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
@@ -55,16 +55,16 @@ namespace Renci.SshNet.Tests.Classes
             _timeout = TimeSpan.FromSeconds(5);
             _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
             _dataReceivedByServer = new List<byte>();
-            _serverIdentification = Encoding.UTF8.GetBytes("Welcome stranger!\r\n\r\nSSH-ABC2.0-OurSSHAppliance-1.4.7 Use at own risk.\uD55C\r\n!");
+            _serverIdentification = Encoding.UTF8.GetBytes("\r\nWelcome stranger!\r\n\r\nSSH-ABC2.0-OurSSHAppliance-1.4.7 Use at own risk.\uD55C\r\n!");
 
             _server = new AsyncSocketListener(_serverEndPoint);
             _server.Start();
             _server.BytesReceived += (bytes, socket) =>
-            {
-                _dataReceivedByServer.AddRange(bytes);
-                socket.Send(_serverIdentification);
-                socket.Shutdown(SocketShutdown.Both);
-            };
+                {
+                    _dataReceivedByServer.AddRange(bytes);
+                    socket.Send(_serverIdentification);
+                    socket.Shutdown(SocketShutdown.Both);
+                };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
             _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTestBase.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTestBase.cs
new file mode 100644
index 00000000..50f62256
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTestBase.cs
@@ -0,0 +1,49 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System.Net;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    public abstract class Socks4ConnectorTestBase : TripleATestBase
+    {
+        internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
+        internal Socks4Connector Connector { get; private set; }
+        internal SocketFactory SocketFactory { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+            Connector = new Socks4Connector(SocketFactoryMock.Object);
+            SocketFactory = new SocketFactory();
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected sealed override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+
+        protected ConnectionInfo CreateConnectionInfo(string proxyUser, string proxyPassword)
+        {
+            return new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                      777,
+                                      "user",
+                                      ProxyTypes.Socks4,
+                                      IPAddress.Loopback.ToString(),
+                                      8122,
+                                      proxyUser,
+                                      proxyPassword,
+                                      new KeyboardInteractiveAuthenticationMethod("user"));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs
new file mode 100644
index 00000000..3ef993f2
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs
@@ -0,0 +1,134 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_ConnectionRejectedByProxy : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _actualException = null;
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    if (_bytesReceivedByProxy.Count == 0)
+                    {
+                        socket.Send(new byte[]
+                            {
+                                // Reply version (null byte)
+                                0x00,
+                                // Connection refused
+                                 0x5b
+                            });
+                    }
+
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("SOCKS4: Connection rejected.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+
+        private static byte GetNotSupportedSocksVersion()
+        {
+            var random = new Random();
+
+            while (true)
+            {
+                var socksVersion = random.Next(1, 255);
+                if (socksVersion != 4)
+                {
+                    return (byte) socksVersion;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs
new file mode 100644
index 00000000..9f184942
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs
@@ -0,0 +1,166 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_ConnectionSucceeded : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _bytesReceivedByProxy = new List<byte>();
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _actual = null;
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    if (_bytesReceivedByProxy.Count == bytesReceived.Length)
+                    {
+                        // Send SOCKS response
+                        socket.Send(new byte[]
+                            {
+                                // Reply version (null byte)
+                                0x00,
+                                // Request granted
+                                0x5a,
+                                // Destination address port
+                                0x01,
+                                0xf0,
+                                // Destination address IP
+                                0x01,
+                                0x02,
+                                0x03,
+                                0x04
+                            });
+
+                        // Send extra byte to allow us to verify that connector did not consume too much
+                        socket.Send(new byte[]
+                            {
+                                0xfe
+                            });
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new byte[]
+                {
+                    // SOCKS version
+                    0x04,
+                    // CONNECT request
+                    0x01,
+                    // Destination port
+                    0x03,
+                    0x09,
+                    // Destination address (IPv4)
+                    0x7f,
+                    0x00,
+                    0x00,
+                    0x01,
+                    // Proxy user
+                    0x70,
+                    0x72,
+                    0x6f,
+                    0x78,
+                    0x79,
+                    0x55,
+                    0x73,
+                    0x65,
+                    0x72,
+                    // Null terminator
+                    0x00
+                };
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void ConnectShouldReturnSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void OnlySocksResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[2];
+
+            Assert.AreEqual(1, _actual.Receive(buffer));
+            Assert.AreEqual(0xfe, buffer[0]);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsFalse(_disconnected);
+            Assert.IsTrue(_actual.Connected);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs
new file mode 100644
index 00000000..85f2f669
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -0,0 +1,102 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_ConnectionToProxyRefused : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(5000);
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.ConnectionRefused, _actualException.SocketErrorCode);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
new file mode 100644
index 00000000..4ce1560b
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -0,0 +1,105 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_TimeoutConnectingToProxy : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _actualException = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs
new file mode 100644
index 00000000..92840220
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs
@@ -0,0 +1,143 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private Stopwatch _stopWatch;
+        private AsyncSocketListener _server;
+        private bool _disconnected;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.Connected += socket =>
+            {
+                socket.Send(new byte[]
+                    {
+                            // Reply version (null byte)
+                            0x00,
+                            // Request granted
+                            0x5a,
+                            // Incomplete destination address
+                            0x01
+                    });
+            };
+            _proxyServer.Start();
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsTrue(_disconnected);
+            Assert.IsFalse(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs
new file mode 100644
index 00000000..bbc724ac
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs
@@ -0,0 +1,139 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_TimeoutReadingReplyCode : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private Stopwatch _stopWatch;
+        private AsyncSocketListener _server;
+        private bool _disconnected;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.Connected += socket =>
+                {
+                    socket.Send(new byte[]
+                        {
+                            // Reply version (null byte)
+                            0x00
+                        });
+                };
+            _proxyServer.Start();
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsTrue(_disconnected);
+            Assert.IsFalse(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs
new file mode 100644
index 00000000..d2fcf5c1
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs
@@ -0,0 +1,131 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion : Socks4ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private AsyncSocketListener _proxyServer;
+        private Stopwatch _stopWatch;
+        private AsyncSocketListener _server;
+        private bool _disconnected;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.Start();
+
+            _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port));
+            _server.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_server != null)
+            {
+                _server.Dispose();
+            }
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsTrue(_disconnected);
+            Assert.IsFalse(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTestBase.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTestBase.cs
new file mode 100644
index 00000000..2d2f2cb9
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTestBase.cs
@@ -0,0 +1,68 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Net;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    public abstract class Socks5ConnectorTestBase : TripleATestBase
+    {
+        internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
+        internal Socks5Connector Connector { get; private set; }
+        internal SocketFactory SocketFactory { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+            Connector = new Socks5Connector(SocketFactoryMock.Object);
+            SocketFactory = new SocketFactory();
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected sealed override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+
+        protected ConnectionInfo CreateConnectionInfo(string proxyUser, string proxyPassword)
+        {
+            return new ConnectionInfo(IPAddress.Loopback.ToString(),
+                                      777,
+                                      "user",
+                                      ProxyTypes.Socks5,
+                                      IPAddress.Loopback.ToString(),
+                                      8122,
+                                      proxyUser,
+                                      proxyPassword,
+                                      new KeyboardInteractiveAuthenticationMethod("user"));
+        }
+
+        protected static string GenerateRandomString(int minLength, int maxLength)    
+        {
+            var random = new Random();
+            var length = random.Next(minLength, maxLength);
+
+            var sb = new StringBuilder(length);
+            int offset = 'a';
+
+            for (var i = 0; i < length; i++)
+            {
+                var @char = (char) random.Next(offset, offset + 26);
+                sb.Append(@char);
+            }
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs
new file mode 100644
index 00000000..997c18a1
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -0,0 +1,103 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_ConnectionToProxyRefused : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SocketException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(5000);
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SocketException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSocketException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(SocketError.ConnectionRefused, _actualException.SocketErrorCode);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs
new file mode 100644
index 00000000..7f4b108c
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs
@@ -0,0 +1,206 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5Connector_Connect_NoAuthentication_Succeed : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo(new string('a', 255), new string('b', 255));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                if (_bytesReceivedByProxy.Count == 4)
+                {
+                    // We received the greeting
+
+                    socket.Send(new byte[]
+                        {
+                                    // SOCKS version
+                                    0x05,
+                                    // Require no authentication
+                                    0x00
+                        });
+                }
+                else if (_bytesReceivedByProxy.Count == 4 + (1 + 1 + 1 + 1 + 4 + 2))
+                {
+                    // We received the connection request
+
+                    socket.Send(new byte[]
+                        {
+                                    // SOCKS version
+                                    0x05,
+                                    // Connection successful
+                                    0x00,
+                                    // Reserved byte
+                                    0x00,
+                        });
+
+                    // Send server bound address
+                    socket.Send(new byte[]
+                        {
+                                    // IPv6
+                                    0x04,
+                                    // IP address
+                                    0x01,
+                                    0x02,
+                                    0x12,
+                                    0x41,
+                                    0x31,
+                                    0x02,
+                                    0x42,
+                                    0x41,
+                                    0x71,
+                                    0x02,
+                                    0x32,
+                                    0x81,
+                                    0x01,
+                                    0x52,
+                                    0x12,
+                                    0x91,
+                                    // Port
+                                    0x0f,
+                                    0x1b,
+                        });
+
+                    // Send extra byte to allow us to verify that connector did not consume too much
+                    socket.Send(new byte[]
+                        {
+                                0xff
+                        });
+                }
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveReturnedSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsTrue(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new byte[]
+                {
+                    //
+                    // Client greeting
+                    //
+
+                    // SOCKS version
+                    0x05,
+                    // Number of authentication methods supported
+                    0x02,
+                    // No authentication
+                    0x00,
+                    // Username/password
+                    0x02,
+
+                    //
+                    // Client connection request
+                    //
+
+                    // SOCKS version
+                    0x05,
+                    // Establish a TCP/IP stream connection
+                    0x01,
+                    // Reserved
+                    0x00,
+                    // Destination address type (IPv4)
+                    0x01,
+                    // Destination address (IPv4)
+                    0x7f,
+                    0x00,
+                    0x00,
+                    0x01,
+                    // Destination port
+                    0x03,
+                    0x09
+
+                };
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void OnlySocksResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[1];
+
+            var bytesRead = _clientSocket.Receive(buffer);
+            Assert.AreEqual(1, bytesRead);
+            Assert.AreEqual(0xff, buffer[0]);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs
new file mode 100644
index 00000000..dc9a3a9e
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs
@@ -0,0 +1,123 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private byte _proxySocksVersion;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _proxySocksVersion = GetNotSupportedSocksVersion();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    socket.Send(new byte[] { _proxySocksVersion });
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format("SOCKS Version '{0}' is not supported.", _proxySocksVersion), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+
+        private static byte GetNotSupportedSocksVersion()
+        {
+            var random = new Random();
+
+            while (true)
+            {
+                var socksVersion = random.Next(1, 255);
+                if (socksVersion != 5)
+                {
+                    return (byte) socksVersion;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
new file mode 100644
index 00000000..4ac547b9
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -0,0 +1,107 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_TimeoutConnectingToProxy : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private SshOperationTimeoutException _actualException;
+        private Socket _clientSocket;
+        private Stopwatch _stopWatch;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+
+            _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200));
+            _stopWatch = new Stopwatch();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _stopWatch.Start();
+
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (SshOperationTimeoutException ex)
+            {
+                _actualException = ex;
+            }
+            finally
+            {
+                _stopWatch.Stop();
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownSshOperationTimeoutException()
+        {
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveRespectedTimeout()
+        {
+            var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
+                                          _stopWatch.ElapsedMilliseconds,
+                                          _connectionInfo.Timeout.TotalMilliseconds);
+
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs
new file mode 100644
index 00000000..878636ba
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs
@@ -0,0 +1,177 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo("aa", "bbbb");
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                if (_bytesReceivedByProxy.Count == 4)
+                {
+                    // We received the greeting
+
+                    socket.Send(new byte[]
+                        {
+                            // SOCKS version
+                            0x05,
+                            // Require username/password authentication
+                            0x02
+                        });
+                }
+                else if (_bytesReceivedByProxy.Count == 4 + (1 + 1 + 2 + 1 + 4))
+                {
+                    // We received the username/password authentication request
+
+                    socket.Send(new byte[]
+                        {
+                            // Authentication version
+                            0x01,
+                            // Authentication failed
+                            0x01
+                        });
+                }
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("SOCKS5: Username/Password authentication failed.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new List<byte>();
+
+            //
+            // Client greeting
+            //
+
+            // SOCKS version
+            expectedSocksRequest.Add(0x05);
+            // Number of authentication methods supported
+            expectedSocksRequest.Add(0x02);
+            // No authentication
+            expectedSocksRequest.Add(0x00);
+            // Username/password
+            expectedSocksRequest.Add(0x02);
+
+            //
+            // Username/password authentication request
+            //
+
+            // Version of the negotiation
+            expectedSocksRequest.Add(0x01);
+            // Length of the username
+            expectedSocksRequest.Add((byte) _connectionInfo.ProxyUsername.Length);
+            // Username
+            expectedSocksRequest.AddRange(Encoding.ASCII.GetBytes(_connectionInfo.ProxyUsername));
+            // Length of the password
+            expectedSocksRequest.Add((byte) _connectionInfo.ProxyPassword.Length);
+            // Password
+            expectedSocksRequest.AddRange(Encoding.ASCII.GetBytes(_connectionInfo.ProxyPassword));
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs
new file mode 100644
index 00000000..b94c40e8
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs
@@ -0,0 +1,220 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private Socket _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo(GenerateRandomString(0, 255), GenerateRandomString(0, 255));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    if (_bytesReceivedByProxy.Count == 4)
+                    {
+                        // We received the greeting
+
+                        socket.Send(new byte[]
+                            {
+                                    // SOCKS version
+                                    0x05,
+                                    // Require username/password authentication
+                                    0x02
+                            });
+                    }
+                    else if (_bytesReceivedByProxy.Count == 4 + (1 + 1 + _connectionInfo.ProxyUsername.Length + 1 + _connectionInfo.ProxyPassword.Length))
+                    {
+                        // We received the username/password authentication request
+
+                        socket.Send(new byte[]
+                            {
+                                    // Authentication version
+                                    0x01,
+                                    // Authentication successful
+                                    0x00
+                            });
+                    }
+                    else if (_bytesReceivedByProxy.Count == 4 + (1 + 1 + _connectionInfo.ProxyUsername.Length + 1 + _connectionInfo.ProxyPassword.Length) + (1 + 1 + 1 + 1 + 4 + 2))
+                    {
+                        // We received the connection request
+
+                        socket.Send(new byte[]
+                            {
+                                    // SOCKS version
+                                    0x05,
+                                    // Connection successful
+                                    0x00,
+                                    // Reserved byte
+                                    0x00,
+                            });
+
+                        // Send server bound address
+                        socket.Send(new byte[]
+                            {
+                                    // IPv4
+                                    0x01,
+                                    // IP address
+                                    0x01,
+                                    0x02,
+                                    0x12,
+                                    0x41,
+                                    // Port
+                                    0x01,
+                                    0x02,
+                            });
+
+                        // Send extra byte to allow us to verify that connector did not consume too much
+                        socket.Send(new byte[]
+                            {
+                                0xfe
+                            });
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Shutdown(SocketShutdown.Both);
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            _actual = Connector.Connect(_connectionInfo);
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveReturnedSocketCreatedUsingSocketFactory()
+        {
+            Assert.IsNotNull(_actual);
+            Assert.AreSame(_clientSocket, _actual);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsTrue(_clientSocket.Connected);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new List<byte>();
+
+            //
+            // Client greeting
+            //
+
+            // SOCKS version
+            expectedSocksRequest.Add(0x05);
+            // Number of authentication methods supported
+            expectedSocksRequest.Add(0x02);
+            // No authentication
+            expectedSocksRequest.Add(0x00);
+            // Username/password
+            expectedSocksRequest.Add(0x02);
+
+            //
+            // Username/password authentication request
+            //
+
+            // Version of the negotiation
+            expectedSocksRequest.Add(0x01);
+            // Length of the username
+            expectedSocksRequest.Add((byte)_connectionInfo.ProxyUsername.Length);
+            // Username
+            expectedSocksRequest.AddRange(Encoding.ASCII.GetBytes(_connectionInfo.ProxyUsername));
+            // Length of the password
+            expectedSocksRequest.Add((byte)_connectionInfo.ProxyPassword.Length);
+            // Password
+            expectedSocksRequest.AddRange(Encoding.ASCII.GetBytes(_connectionInfo.ProxyPassword));
+
+            //
+            // Client connection request
+            //
+
+            // SOCKS version
+            expectedSocksRequest.Add(0x05);
+            // Establish a TCP/IP stream connection
+            expectedSocksRequest.Add(0x01);
+            // Reserved
+            expectedSocksRequest.Add(0x00);
+            // Destination address type (IPv4)
+            expectedSocksRequest.Add(0x01);
+            // Destination address (IPv4)
+            expectedSocksRequest.Add(0x7f);
+            expectedSocksRequest.Add(0x00);
+            expectedSocksRequest.Add(0x00);
+            expectedSocksRequest.Add(0x01);
+            // Destination port
+            expectedSocksRequest.Add(0x03);
+            expectedSocksRequest.Add(0x09);
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void OnlySocksResponseShouldHaveBeenConsumed()
+        {
+            var buffer = new byte[1];
+
+            var bytesRead = _clientSocket.Receive(buffer);
+            Assert.AreEqual(1, bytesRead);
+            Assert.AreEqual(0xfe, buffer[0]);
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs
new file mode 100644
index 00000000..61db86a4
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs
@@ -0,0 +1,149 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo(new string('a', 255), new string('b', 256));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+            {
+                _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                // Wait until we received the greeting
+                if (_bytesReceivedByProxy.Count == 4)
+                {
+                    socket.Send(new byte[]
+                        {
+                                // SOCKS version
+                                0x05,
+                                // Username/password authentication
+                                0x02
+                        });
+                }
+            };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("Proxy password is too long.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new List<byte>();
+
+            //
+            // Client greeting
+            //
+
+            // SOCKS version
+            expectedSocksRequest.Add(0x05);
+            // Number of authentication methods supported
+            expectedSocksRequest.Add(0x02);
+            // No authentication
+            expectedSocksRequest.Add(0x00);
+            // Username/password
+            expectedSocksRequest.Add(0x02);
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs
new file mode 100644
index 00000000..7a0ef5d4
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs
@@ -0,0 +1,149 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Tests.Classes.Connection
+{
+    [TestClass]
+    public class Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength : Socks5ConnectorTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private AsyncSocketListener _proxyServer;
+        private Socket _clientSocket;
+        private List<byte> _bytesReceivedByProxy;
+        private bool _disconnected;
+        private ProxyException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _connectionInfo = CreateConnectionInfo(new string('a', 256), new string('b', 255));
+            _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
+            _bytesReceivedByProxy = new List<byte>();
+            _actualException = null;
+
+            _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer.Disconnected += socket => _disconnected = true;
+            _proxyServer.BytesReceived += (bytesReceived, socket) =>
+                {
+                    _bytesReceivedByProxy.AddRange(bytesReceived);
+
+                    // Wait until we received the greeting
+                    if (_bytesReceivedByProxy.Count == 4)
+                    {
+                        socket.Send(new byte[]
+                            {
+                                // SOCKS version
+                                0x05,
+                                // Username/password authentication
+                                0x02
+                            });
+                    }
+                };
+            _proxyServer.Start();
+        }
+
+        protected override void SetupMocks()
+        {
+            SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                             .Returns(_clientSocket);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyServer != null)
+            {
+                _proxyServer.Dispose();
+            }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Dispose();
+            }
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                Connector.Connect(_connectionInfo);
+                Assert.Fail();
+            }
+            catch (ProxyException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ConnectShouldHaveThrownProxyException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("Proxy username is too long.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void ProxyShouldHaveReceivedExpectedSocksRequest()
+        {
+            var expectedSocksRequest = new List<byte>();
+
+            //
+            // Client greeting
+            //
+
+            // SOCKS version
+            expectedSocksRequest.Add(0x05);
+            // Number of authentication methods supported
+            expectedSocksRequest.Add(0x02);
+            // No authentication
+            expectedSocksRequest.Add(0x00);
+            // Username/password
+            expectedSocksRequest.Add(0x02);
+
+            var errorText = string.Format("Expected:{0}{1}{0}but was:{0}{2}",
+                                          Environment.NewLine,
+                                          PacketDump.Create(expectedSocksRequest, 2),
+                                          PacketDump.Create(_bytesReceivedByProxy, 2));
+
+            Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
+        }
+
+        [TestMethod]
+        public void ConnectionToProxyShouldHaveBeenShutDown()
+        {
+            Assert.IsTrue(_disconnected);
+        }
+
+        [TestMethod]
+        public void ClientSocketShouldHaveBeenDisposed()
+        {
+            try
+            {
+                _clientSocket.Receive(new byte[0]);
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        [TestMethod]
+        public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce()
+        {
+            SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp),
+                                     Times.Once());
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTestBase.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTestBase.cs
new file mode 100644
index 00000000..ee8cb018
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTestBase.cs
@@ -0,0 +1,17 @@
+using Moq;
+using Renci.SshNet.NetConf;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    public abstract class NetConfClientTestBase : BaseClientTestBase
+    {
+        internal Mock<INetConfSession> _netConfSessionMock { get; private set; }
+
+        protected override void CreateMocks()
+        {
+            base.CreateMocks();
+
+            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs
index 64ffb6ce..980c574a 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs
@@ -10,51 +10,29 @@ using Renci.SshNet.Security;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class NetConfClientTest_Connect_NetConfSessionConnectFailure
+    public class NetConfClientTest_Connect_NetConfSessionConnectFailure : NetConfClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<INetConfSession> _netConfSessionMock;
         private ConnectionInfo _connectionInfo;
         private ApplicationException _netConfSessionConnectionException;
         private NetConfClient _netConfClient;
         private ApplicationException _actualException;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        private void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
-        }
-
-        private void SetupData()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _netConfSessionConnectionException = new ApplicationException();
+            _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
         }
 
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
+        protected override void SetupMocks()
         {
             var sequence = new MockSequence();
 
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence)
                         .Setup(p => p.Connect());
@@ -70,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes
                         .Setup(p => p.Dispose());
         }
 
-        private void Act()
+        protected override void Act()
         {
             try
             {
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
index ad0cf531..ba86a7c9 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
@@ -6,56 +6,55 @@ using System;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class NetConfClientTest_Dispose_Connected
+    public class NetConfClientTest_Dispose_Connected : NetConfClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
-            _sessionMock.InSequence(sequence).Setup(p => p.Connect());
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
-                .Returns(_netConfSessionMock.Object);
-            _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
-            _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
-            _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
-            _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
-            _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.Connect());
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
+                               .Returns(_netConfSessionMock.Object);
+            _netConfSessionMock.InSequence(sequence)
+                               .Setup(p => p.Connect());
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.OnDisconnecting());
+            _netConfSessionMock.InSequence(sequence)
+                               .Setup(p => p.Disconnect());
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.Dispose());
+            _netConfSessionMock.InSequence(sequence)
+                               .Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _netConfClient.Connect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _netConfClient.Dispose();
         }
@@ -66,10 +65,17 @@ namespace Renci.SshNet.Tests.Classes
             _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
index 24b495d7..8a4fbcd2 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
@@ -6,11 +6,8 @@ using System;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class NetConfClientTest_Dispose_Disconnected
+    public class NetConfClientTest_Dispose_Disconnected : NetConfClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
@@ -27,37 +24,45 @@ namespace Renci.SshNet.Tests.Classes
         {
         }
 
-        protected void Arrange()
+        protected override void SetupData()
         {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
-                .Returns(_netConfSessionMock.Object);
+                               .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
+                               .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _netConfClient.Connect();
             _netConfClient.Disconnect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _netConfClient.Dispose();
         }
@@ -68,10 +73,17 @@ namespace Renci.SshNet.Tests.Classes
             _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
index 7439ed75..9ed692a3 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
@@ -6,57 +6,50 @@ using System;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class NetConfClientTest_Dispose_Disposed
+    public class NetConfClientTest_Dispose_Disposed : NetConfClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
-                .Returns(_netConfSessionMock.Object);
+                               .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
+                               .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _netConfClient.Connect();
             _netConfClient.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _netConfClient.Dispose();
         }
@@ -67,10 +60,17 @@ namespace Renci.SshNet.Tests.Classes
             _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
index fb17e353..44761e96 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
@@ -1,59 +1,58 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using Renci.SshNet.NetConf;
 
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class NetConfClientTest_Finalize_Connected
+    public class NetConfClientTest_Finalize_Connected : NetConfClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
+        private WeakReference _netConfClientWeakRefence;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Loose);
-            _sessionMock = new Mock<ISession>(MockBehavior.Loose);
-            _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Loose);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+            _netConfClientWeakRefence = new WeakReference(_netConfClient);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
-            _sessionMock.InSequence(sequence).Setup(p => p.Connect());
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
-                .Returns(_netConfSessionMock.Object);
-            _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
+            _sessionMock.InSequence(sequence)
+                        .Setup(p => p.Connect());
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
+                               .Returns(_netConfSessionMock.Object);
+            _netConfSessionMock.InSequence(sequence)
+                               .Setup(p => p.Connect());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _netConfClient.Connect();
             _netConfClient = null;
 
-            // we need to dereference all other mocks as they might otherwise hold the target alive
-            _sessionMock = null;
-            _connectionInfo = null;
-            _serviceFactoryMock = null;
-
+            // We need to dereference all mocks as they might otherwise hold the target alive
+            //(through recorded invocations?)
+            CreateMocks();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -62,13 +61,25 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
         {
+            // Since we recreated the mocks, this test has no value
+            // We'll leaving ths test just in case we have a solution that does not require us
+            // to recreate the mocks
             _netConfSessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
         public void DisposeOnNetConfSessionShouldBeInvokedOnce()
         {
+            // Since we recreated the mocks, this test has no value
+            // We'll leaving ths test just in case we have a solution that does not require us
+            // to recreate the mocks
             _netConfSessionMock.Verify(p => p.Dispose(), Times.Never);
         }
+
+        [TestMethod]
+        public void NetConfClientShouldHaveBeenFinalized()
+        {
+            Assert.IsNull(_netConfClientWeakRefence.Target);
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTestBase.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTestBase.cs
index 8626d7d0..26aa22e3 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTestBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTestBase.cs
@@ -1,45 +1,22 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
+using Moq;
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
-    public abstract class ScpClientTestBase
+    public abstract class ScpClientTestBase : BaseClientTestBase
     {
-        internal Mock<IServiceFactory> _serviceFactoryMock;
         internal Mock<IRemotePathTransformation> _remotePathTransformationMock;
-        internal Mock<ISession> _sessionMock;
         internal Mock<IChannelSession> _channelSessionMock;
         internal Mock<PipeStream> _pipeStreamMock;
 
-        protected abstract void SetupData();
-
-        protected void CreateMocks()
+        protected override void CreateMocks()
         {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            base.CreateMocks();
+
             _remotePathTransformationMock = new Mock<IRemotePathTransformation>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
             _pipeStreamMock = new Mock<PipeStream>(MockBehavior.Strict);
         }
-
-        protected abstract void SetupMocks();
-
-        protected virtual void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-        }
-
-        [TestInitialize]
-        public void Initialize()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected abstract void Act();
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
index aa5d5cfb..17372ee6 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
@@ -38,7 +38,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
index 80165725..355f0ea8 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
@@ -38,7 +38,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
index 309e4566..8aceeee4 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
@@ -47,7 +47,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
index 1c47aeae..dd907f86 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -37,7 +37,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
index 0c842a21..28ce4538 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -53,7 +53,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
index c04525e0..4a036c37 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
@@ -60,7 +60,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
index d2c6992b..4050d1cd 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
@@ -50,7 +50,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Setup(p => p.CreateRemotePathDoubleQuoteTransformation())
                                .Returns(_remotePathTransformationMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreatePipeStream()).Returns(_pipeStreamMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
index 0e50bf8e..af2764b8 100644
--- a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
+++ b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
@@ -10,6 +10,7 @@ namespace Renci.SshNet.Tests.Classes
     {
         private ServiceFactory _serviceFactory;
         private Mock<IConnectionInfo> _connectionInfoMock;
+        private Mock<ISocketFactory> _socketFactoryMock;
 
         [TestInitialize]
         public void Setup()
@@ -25,7 +26,7 @@ namespace Renci.SshNet.Tests.Classes
 
             try
             {
-                _serviceFactory.CreateConnector(connectionInfo);
+                _serviceFactory.CreateConnector(connectionInfo, _socketFactoryMock.Object);
                 Assert.Fail();
             }
             catch (ArgumentNullException ex)
@@ -35,16 +36,36 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
+        [TestMethod]
+        public void SocketFactoryIsNull()
+        {
+            const ISocketFactory socketFactory = null;
+
+            try
+            {
+                _serviceFactory.CreateConnector(_connectionInfoMock.Object, socketFactory);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("socketFactory", ex.ParamName);
+            }
+        }
+
         [TestMethod]
         public void ProxyType_Http()
         {
             _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Http);
 
-            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object, _socketFactoryMock.Object);
 
             Assert.IsNotNull(actual);
             Assert.AreEqual(typeof(HttpConnector), actual.GetType());
 
+            var httpConnector = (HttpConnector) actual;
+            Assert.AreSame(_socketFactoryMock.Object, httpConnector.SocketFactory);
+
             _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
         }
 
@@ -53,11 +74,14 @@ namespace Renci.SshNet.Tests.Classes
         {
             _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.None);
 
-            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object, _socketFactoryMock.Object);
 
             Assert.IsNotNull(actual);
             Assert.AreEqual(typeof(DirectConnector), actual.GetType());
 
+            var directConnector = (DirectConnector) actual;
+            Assert.AreSame(_socketFactoryMock.Object, directConnector.SocketFactory);
+
             _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
         }
 
@@ -66,11 +90,14 @@ namespace Renci.SshNet.Tests.Classes
         {
             _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Socks4);
 
-            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object, _socketFactoryMock.Object);
 
             Assert.IsNotNull(actual);
             Assert.AreEqual(typeof(Socks4Connector), actual.GetType());
 
+            var socks4Connector = (Socks4Connector) actual;
+            Assert.AreSame(_socketFactoryMock.Object, socks4Connector.SocketFactory);
+
             _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
         }
 
@@ -79,11 +106,33 @@ namespace Renci.SshNet.Tests.Classes
         {
             _connectionInfoMock.Setup(p => p.ProxyType).Returns(ProxyTypes.Socks5);
 
-            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object);
+            var actual = _serviceFactory.CreateConnector(_connectionInfoMock.Object, _socketFactoryMock.Object);
 
             Assert.IsNotNull(actual);
             Assert.AreEqual(typeof(Socks5Connector), actual.GetType());
 
+            var socks5Connector = (Socks5Connector) actual;
+            Assert.AreSame(_socketFactoryMock.Object, socks5Connector.SocketFactory);
+
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+        }
+
+        [TestMethod]
+        public void ProxyType_Undefined()
+        {
+            _connectionInfoMock.Setup(p => p.ProxyType).Returns((ProxyTypes) 666);
+
+            try
+            {
+                _serviceFactory.CreateConnector(_connectionInfoMock.Object, _socketFactoryMock.Object);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("ProxyTypes '666' is not supported.", ex.Message);
+            }
+
             _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs b/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
index 4fe0bd08..03ce2491 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest.HttpProxy.cs
@@ -11,286 +11,6 @@ namespace Renci.SshNet.Tests.Classes
 {
     public partial class SessionTest
     {
-        [TestMethod]
-        public void ConnectShouldThrowProxyExceptionWhenHttpProxyResponseDoesNotContainStatusLine()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("Whatever\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("HTTP response does not contain status line.", ex.Message);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldThrowProxyExceptionWhenHttpProxyReturnsHttpStatusOtherThan200()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("HTTP: Status code 501, \"Custom\"", ex.Message);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldSkipHeadersWhenHttpProxyReturnsHttpStatus200()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("SSH-666-SshStub"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server version '666' is not supported.", ex.Message);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldSkipContentWhenHttpProxyReturnsHttpStatus200()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 200 OK\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("Content-Length: 13\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("Content-Type: application/octet-stream\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("\r\n"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("DUMMY_CONTENT"));
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("SSH-666-SshStub"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server version '666' is not supported.", ex.Message);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldWriteConnectMethodToHttpProxy()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException)
-                    {
-                    }
-                }
-
-                Assert.AreEqual(string.Format("CONNECT {0} HTTP/1.0", serverEndPoint), proxyStub.HttpRequest.RequestLine);
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldWriteProxyAuthorizationToHttpProxyWhenProxyUserNameIsNotNullAndNotEmpty()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, "anon");
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException)
-                    {
-                    }
-                }
-
-                var expectedProxyAuthorizationHeader = CreateProxyAuthorizationHeader(connectionInfo);
-                Assert.IsNotNull(proxyStub.HttpRequest.Headers.SingleOrDefault(p => p == expectedProxyAuthorizationHeader));
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldNotWriteProxyAuthorizationToHttpProxyWhenProxyUserNameIsEmpty()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, string.Empty);
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException)
-                    {
-                    }
-                }
-
-                Assert.IsFalse(proxyStub.HttpRequest.Headers.Any(p => p.StartsWith("Proxy-Authorization:")));
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldNotWriteProxyAuthorizationToHttpProxyWhenProxyUserNameIsNull()
-        {
-            var proxyEndPoint = new IPEndPoint(IPAddress.Loopback, 8123);
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            using (var proxyStub = new HttpProxyStub(proxyEndPoint))
-            {
-                proxyStub.Responses.Add(Encoding.ASCII.GetBytes("HTTP/1.0 501 Custom\r\n"));
-                proxyStub.Start();
-
-                var connectionInfo = CreateConnectionInfoWithHttpProxy(proxyEndPoint, serverEndPoint, null);
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (ProxyException)
-                    {
-                    }
-                }
-
-                Assert.IsFalse(proxyStub.HttpRequest.Headers.Any(p => p.StartsWith("Proxy-Authorization:")));
-            }
-        }
-
         private static ConnectionInfo CreateConnectionInfoWithHttpProxy(IPEndPoint proxyEndPoint, IPEndPoint serverEndPoint, string proxyUserName)
         {
             return new ConnectionInfo(
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest.cs b/src/Renci.SshNet.Tests/Classes/SessionTest.cs
index e15e05f6..972757e4 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest.cs
@@ -1,16 +1,9 @@
 using System;
-using System.Globalization;
 using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using Renci.SshNet.Common;
 using Renci.SshNet.Connection;
-using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Tests.Common;
-using Renci.SshNet.Tests.Properties;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -21,25 +14,28 @@ namespace Renci.SshNet.Tests.Classes
     public partial class SessionTest : TestBase
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<ISocketFactory> _socketFactoryMock;
         private Mock<IConnector> _connectorMock;
+        private Mock<IProtocolVersionExchange> _protocolVersionExchangeMock;
 
         protected override void OnInit()
         {
             base.OnInit();
 
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
             _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
+            _protocolVersionExchangeMock = new Mock<IProtocolVersionExchange>(MockBehavior.Strict);
         }
 
         [TestMethod]
         public void ConstructorShouldThrowArgumentNullExceptionWhenConnectionInfoIsNull()
         {
-            ConnectionInfo connectionInfo = null;
-            var serviceFactory = new Mock<IServiceFactory>(MockBehavior.Strict).Object;
+            const ConnectionInfo connectionInfo = null;
 
             try
             {
-                new Session(connectionInfo, serviceFactory);
+                new Session(connectionInfo, _serviceFactoryMock.Object, _socketFactoryMock.Object);
                 Assert.Fail();
             }
             catch (ArgumentNullException ex)
@@ -58,7 +54,7 @@ namespace Renci.SshNet.Tests.Classes
 
             try
             {
-                new Session(connectionInfo, serviceFactory);
+                new Session(connectionInfo, serviceFactory, _socketFactoryMock.Object);
                 Assert.Fail();
             }
             catch (ArgumentNullException ex)
@@ -69,400 +65,24 @@ namespace Renci.SshNet.Tests.Classes
         }
 
         [TestMethod]
-        public void ConnectShouldSkipLinesBeforeProtocolIdentificationString()
+        public void ConstructorShouldThrowArgumentNullExceptionWhenSocketFactoryIsNull()
         {
             var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
             var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("SSH-666-SshStub\r\n"));
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server version '666' is not supported.", ex.Message);
-
-                        Assert.AreEqual("SSH-666-SshStub", connectionInfo.ServerVersion);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldImmediatelySendIdentificationStringWhenConnectionHasBeenEstablised()
-        {
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-            var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        var identificationBytes = new byte[2048];
-                        var bytesReceived = socket.Receive(identificationBytes);
-
-                        if (bytesReceived > 0)
-                        {
-                            var identificationSttring = Encoding.ASCII.GetString(identificationBytes, 0, bytesReceived);
-                            Console.WriteLine("STRING=" + identificationSttring);
-                            Console.WriteLine("DONE");
-
-                            socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                            socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                            socket.Send(Encoding.ASCII.GetBytes("SSH-666-SshStub\r\n"));
-                        }
-
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server version '666' is not supported.", ex.Message);
-
-                        Assert.AreEqual("SSH-666-SshStub", connectionInfo.ServerVersion);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldSupportProtocolIdentificationStringThatDoesNotEndWithCrlf()
-        {
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-            var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("SSH-666-SshStub"));
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server version '666' is not supported.", ex.Message);
-
-                        Assert.AreEqual("SSH-666-SshStub", connectionInfo.ServerVersion);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldThrowSshOperationExceptionWhenServerDoesNotRespondWithinConnectionTimeout()
-        {
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-            var timeout = TimeSpan.FromMilliseconds(500);
-            Socket clientSocket = null;
-
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                        clientSocket = socket;
-                    };
-                serverStub.Start();
-
-                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromMilliseconds(500));
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshOperationTimeoutException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", timeout.TotalMilliseconds), ex.Message);
-
-                        Assert.IsNotNull(clientSocket);
-                        Assert.IsTrue(clientSocket.Connected);
-
-                        // shut down socket
-                        clientSocket.Shutdown(SocketShutdown.Send);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void ConnectShouldSshConnectionExceptionWhenServerResponseDoesNotContainProtocolIdentificationString()
-        {
-            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
-
-            // response ends with CRLF
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server response does not contain SSH protocol identification.", ex.Message);
-                    }
-                }
-            }
-
-            // response does not end with CRLF
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner"));
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server response does not contain SSH protocol identification.", ex.Message);
-                    }
-                }
-            }
-
-            // last line is empty
-            using (var serverStub = new AsyncSocketListener(serverEndPoint))
-            {
-                serverStub.Connected += socket =>
-                    {
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                        socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                        socket.Shutdown(SocketShutdown.Send);
-                    };
-                serverStub.Start();
-
-                var connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-
-                using (var session = new Session(connectionInfo, _serviceFactoryMock.Object))
-                {
-                    _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                                       .Returns(_connectorMock.Object);
-                    _connectorMock.Setup(p => p.Connect(connectionInfo))
-                                  .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-                    try
-                    {
-                        session.Connect();
-                        Assert.Fail();
-                    }
-                    catch (SshConnectionException ex)
-                    {
-                        Assert.IsNull(ex.InnerException);
-                        Assert.AreEqual("Server response does not contain SSH protocol identification.", ex.Message);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void Connect_HostNameInvalid_ShouldThrowSocketExceptionWithErrorCodeHostNotFound()
-        {
-            var connectionInfo = new ConnectionInfo("invalid.", 40, "user",
-                new KeyboardInteractiveAuthenticationMethod("user"));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                               .Returns(_connectorMock.Object);
-            _connectorMock.Setup(p => p.Connect(connectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+            const ISocketFactory socketFactory = null;
 
             try
             {
-                session.Connect();
+                new Session(connectionInfo, _serviceFactoryMock.Object, socketFactory);
                 Assert.Fail();
             }
-            catch (SocketException ex)
+            catch (ArgumentNullException ex)
             {
-                Assert.AreEqual(ex.ErrorCode, (int)SocketError.HostNotFound);
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("socketFactory", ex.ParamName);
             }
         }
 
-        [TestMethod]
-        public void Connect_ProxyHostNameInvalid_ShouldThrowSocketExceptionWithErrorCodeHostNotFound()
-        {
-            var connectionInfo = new ConnectionInfo("localhost", 40, "user", ProxyTypes.Http, "invalid.", 80,
-                "proxyUser", "proxyPwd", new KeyboardInteractiveAuthenticationMethod("user"));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                               .Returns(_connectorMock.Object);
-            _connectorMock.Setup(p => p.Connect(connectionInfo))
-                          .Returns<IConnectionInfo>(c => new HttpConnector().Connect(c));
-
-            try
-            {
-                session.Connect();
-                Assert.Fail();
-            }
-            catch (SocketException ex)
-            {
-                Assert.AreEqual(ex.ErrorCode, (int)SocketError.HostNotFound);
-            }
-        }
-
-        [TestMethod]
-        public void DisconnectShouldNotThrowExceptionWhenSocketIsNotConnected()
-        {
-            var connectionInfo = new ConnectionInfo("localhost", 6767, Resources.USERNAME,
-                new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                               .Returns(_connectorMock.Object);
-            _connectorMock.Setup(p => p.Connect(connectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-            try
-            {
-                session.Connect();
-                Assert.Fail();
-            }
-            catch (SocketException)
-            {
-                session.Disconnect();
-            }
-        }
-
-        [TestMethod]
-        public void DisconnectShouldNotThrowExceptionWhenConnectHasNotBeenInvoked()
-        {
-            var connectionInfo = new ConnectionInfo("localhost", 6767, Resources.USERNAME,
-                new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            session.Disconnect();
-        }
-
-        [TestMethod]
-        public void DisposeShouldNotThrowExceptionWhenSocketIsNotConnected()
-        {
-            var connectionInfo = new ConnectionInfo("localhost", 6767, Resources.USERNAME,
-                new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            _serviceFactoryMock.Setup(p => p.CreateConnector(connectionInfo))
-                               .Returns(_connectorMock.Object);
-            _connectorMock.Setup(p => p.Connect(connectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
-
-            try
-            {
-                session.Connect();
-                Assert.Fail();
-            }
-            catch (SocketException)
-            {
-                session.Dispose();
-            }
-        }
-
-        [TestMethod]
-        public void DisposeShouldNotThrowExceptionWhenConenectHasNotBeenInvoked()
-        {
-            var connectionInfo = new ConnectionInfo("localhost", 6767, Resources.USERNAME,
-                new KeyboardInteractiveAuthenticationMethod(Resources.USERNAME));
-            var session = new Session(connectionInfo, _serviceFactoryMock.Object);
-
-            session.Disconnect();
-        }
-
         private static ConnectionInfo CreateConnectionInfo(IPEndPoint serverEndPoint, TimeSpan timeout)
         {
             var connectionInfo = new ConnectionInfo(
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTestBase.cs b/src/Renci.SshNet.Tests/Classes/SessionTestBase.cs
new file mode 100644
index 00000000..cbe69e2a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/SessionTestBase.cs
@@ -0,0 +1,35 @@
+using Moq;
+using Renci.SshNet.Connection;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    public abstract class SessionTestBase : TripleATestBase
+    {
+        internal Mock<IServiceFactory> _serviceFactoryMock { get; private set; }
+        internal Mock<ISocketFactory> _socketFactoryMock { get; private set; }
+        internal Mock<IConnector> _connectorMock { get; private set; }
+
+        protected virtual void CreateMocks()
+        {
+            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
+            _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
+        }
+
+        protected virtual void SetupData()
+        {
+        }
+
+        protected virtual void SetupMocks()
+        {
+        }
+
+        protected override void Arrange()
+        {
+            CreateMocks();
+            SetupData();
+            SetupMocks();
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectToServerFails.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectToServerFails.cs
new file mode 100644
index 00000000..df19c8ec
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectToServerFails.cs
@@ -0,0 +1,265 @@
+using System;
+using System.Net;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+using Renci.SshNet.Messages.Transport;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    [TestClass]
+    public class SessionTest_ConnectToServerFails : SessionTestBase
+    {
+        private ConnectionInfo _connectionInfo;
+        private Session _session;
+        private SshConnectionException _connectException;
+        private SshConnectionException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
+            _connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
+            _session = new Session(_connectionInfo, _serviceFactoryMock.Object, _socketFactoryMock.Object);
+            _connectException = new SshConnectionException();
+        }
+
+        protected override void SetupMocks()
+        {
+            base.SetupMocks();
+
+            _serviceFactoryMock.Setup(p => p.CreateConnector(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_connectorMock.Object);
+            _connectorMock.Setup(p => p.Connect(_connectionInfo))
+                          .Throws(_connectException);
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                _session.Connect();
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ClientVersionIsRenciSshNet()
+        {
+            Assert.AreEqual("SSH-2.0-Renci.SshNet.SshClient.0.0.1", _session.ClientVersion);
+        }
+
+        [TestMethod]
+        public void ConnectionInfoShouldReturnConnectionInfoPassedThroughConstructor()
+        {
+            Assert.AreSame(_connectionInfo, _session.ConnectionInfo);
+        }
+
+        public void ConnectShouldHaveRethrownException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_connectException, _actualException);
+        }
+
+        [TestMethod]
+        public void DisconnectShouldNotThrowAnException()
+        {
+            _session.Disconnect();
+        }
+
+        [TestMethod]
+        public void DisposeShouldNotThrowException()
+        {
+            _session.Dispose();
+        }
+
+        [TestMethod]
+        public void IsConnectedShouldReturnFalse()
+        {
+            Assert.IsFalse(_session.IsConnected);
+        }
+
+        [TestMethod]
+        public void SendMessageShouldThrowShhConnectionException()
+        {
+            try
+            {
+                _session.SendMessage(new IgnoreMessage());
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                Assert.AreEqual(DisconnectReason.None, ex.DisconnectReason);
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Client not connected.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void SessionIdShouldReturnNull()
+        {
+            Assert.IsNull(_session.SessionId);
+        }
+
+        [TestMethod]
+        public void ServerVersionShouldReturnNull()
+        {
+            Assert.IsNull(_session.ServerVersion);
+        }
+
+        [TestMethod]
+        public void WaitOnHandle_WaitOnHandle_WaitHandle_ShouldThrowArgumentNullExceptionWhenWaitHandleIsNull()
+        {
+            const WaitHandle waitHandle = null;
+
+            try
+            {
+                _session.WaitOnHandle(waitHandle);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("waitHandle", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void WaitOnHandle_WaitOnHandle_WaitHandleAndTimeout_ShouldThrowArgumentNullExceptionWhenWaitHandleIsNull()
+        {
+            const WaitHandle waitHandle = null;
+            var timeout = TimeSpan.FromMinutes(5);
+
+            try
+            {
+                _session.WaitOnHandle(waitHandle, timeout);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("waitHandle", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void ISession_TryWait_WaitHandleAndTimeout_ShouldReturnDisconnected()
+        {
+            var session = (ISession)_session;
+            var waitHandle = new ManualResetEvent(false);
+
+            var result = session.TryWait(waitHandle, Session.InfiniteTimeSpan);
+
+            Assert.AreEqual(WaitResult.Disconnected, result);
+        }
+
+        [TestMethod]
+        public void ISession_TryWait_WaitHandleAndTimeoutAndException_ShouldReturnDisconnected()
+        {
+            var session = (ISession)_session;
+            var waitHandle = new ManualResetEvent(false);
+            Exception exception;
+
+            var result = session.TryWait(waitHandle, Session.InfiniteTimeSpan, out exception);
+
+            Assert.AreEqual(WaitResult.Disconnected, result);
+            Assert.IsNull(exception);
+        }
+
+        [TestMethod]
+        public void ISession_ConnectionInfoShouldReturnConnectionInfoPassedThroughConstructor()
+        {
+            var session = (ISession)_session;
+            Assert.AreSame(_connectionInfo, session.ConnectionInfo);
+        }
+
+        [TestMethod]
+        public void ISession_MessageListenerCompletedShouldBeSignaled()
+        {
+            var session = (ISession)_session;
+
+            Assert.IsNotNull(session.MessageListenerCompleted);
+            Assert.IsTrue(session.MessageListenerCompleted.WaitOne(0));
+        }
+
+        [TestMethod]
+        public void ISession_SendMessageShouldThrowShhConnectionException()
+        {
+            var session = (ISession)_session;
+
+            try
+            {
+                session.SendMessage(new IgnoreMessage());
+                Assert.Fail();
+            }
+            catch (SshConnectionException ex)
+            {
+                Assert.AreEqual(DisconnectReason.None, ex.DisconnectReason);
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Client not connected.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void ISession_TrySendMessageShouldReturnFalse()
+        {
+            var session = (ISession)_session;
+
+            var actual = session.TrySendMessage(new IgnoreMessage());
+
+            Assert.IsFalse(actual);
+        }
+
+        [TestMethod]
+        public void ISession_WaitOnHandle_WaitHandle_ShouldThrowArgumentNullExceptionWhenWaitHandleIsNull()
+        {
+            const WaitHandle waitHandle = null;
+            var session = (ISession)_session;
+
+            try
+            {
+                session.WaitOnHandle(waitHandle);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("waitHandle", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void ISession_WaitOnHandle_WaitHandleAndTimeout_ShouldThrowArgumentNullExceptionWhenWaitHandleIsNull()
+        {
+            const WaitHandle waitHandle = null;
+            var session = (ISession)_session;
+
+            try
+            {
+                session.WaitOnHandle(waitHandle, Session.InfiniteTimeSpan);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("waitHandle", ex.ParamName);
+            }
+        }
+
+        private static ConnectionInfo CreateConnectionInfo(IPEndPoint serverEndPoint, TimeSpan timeout)
+        {
+            var connectionInfo = new ConnectionInfo(
+                serverEndPoint.Address.ToString(),
+                serverEndPoint.Port,
+                "eric",
+                new NoneAuthenticationMethod("eric"));
+            connectionInfo.Timeout = timeout;
+            return connectionInfo;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
index 730aa3e4..fa36aed5 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
@@ -66,7 +66,7 @@ namespace Renci.SshNet.Tests.Classes
         public void ServerVersionShouldNotReturnNull()
         {
             Assert.IsNotNull(Session.ServerVersion);
-            Assert.AreEqual("SSH-2.0-SshStub", Session.ServerVersion);
+            Assert.AreEqual("SSH-2.0-OurServerStub", Session.ServerVersion);
         }
 
         [TestMethod]
@@ -253,10 +253,17 @@ namespace Renci.SshNet.Tests.Classes
             }
         }
 
+        [TestMethod]
+        public void ClientSocketShouldBeConnected()
+        {
+            Assert.IsNotNull(ClientSocket);
+            Assert.IsTrue(ClientSocket.Connected);
+        }
+
         [TestMethod]
         public void CreateConnectorOnServiceFactoryShouldHaveBeenInvokedOnce()
         {
-            ServiceFactoryMock.Verify(p => p.CreateConnector(ConnectionInfo), Times.Once());
+            ServiceFactoryMock.Verify(p => p.CreateConnector(ConnectionInfo, SocketFactoryMock.Object), Times.Once());
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
index 0651896d..a920b190 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
@@ -22,11 +22,16 @@ namespace Renci.SshNet.Tests.Classes
     public abstract class SessionTest_ConnectedBase
     {
         internal Mock<IServiceFactory> ServiceFactoryMock { get; private set; }
+        internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
         internal Mock<IConnector> ConnectorMock { get; private set; }
+
+        private Mock<IProtocolVersionExchange> _protocolVersionExchangeMock;
         private Mock<IKeyExchange> _keyExchangeMock;
         private Mock<IClientAuthentication> _clientAuthenticationMock;
         private IPEndPoint _serverEndPoint;
         private string _keyExchangeAlgorithm;
+        private bool _authenticationStarted;
+        private SocketFactory _socketFactory;
 
         protected Random Random { get; private set; }
         protected byte[] SessionId { get; private set; }
@@ -39,6 +44,7 @@ namespace Renci.SshNet.Tests.Classes
         protected Session Session { get; private set; }
         protected Socket ClientSocket { get; private set; }
         protected Socket ServerSocket { get; private set; }
+        internal SshIdentification ServerIdentification { get; private set; }
 
         [TestInitialize]
         public void Setup()
@@ -67,6 +73,12 @@ namespace Renci.SshNet.Tests.Classes
                 Session.Dispose();
                 Session = null;
             }
+
+            if (ClientSocket != null && ClientSocket.Connected)
+            {
+                ClientSocket.Shutdown(SocketShutdown.Both);
+                ClientSocket.Dispose();
+            }
         }
 
         protected virtual void SetupData()
@@ -87,8 +99,11 @@ namespace Renci.SshNet.Tests.Classes
             DisconnectReceivedRegister = new List<MessageEventArgs<DisconnectMessage>>();
             ErrorOccurredRegister = new List<ExceptionEventArgs>();
             ServerBytesReceivedRegister = new List<byte[]>();
+            ServerIdentification = new SshIdentification("2.0", "OurServerStub");
+            _authenticationStarted = false;
+            _socketFactory = new SocketFactory();
 
-            Session = new Session(ConnectionInfo, ServiceFactoryMock.Object);
+            Session = new Session(ConnectionInfo, ServiceFactoryMock.Object, SocketFactoryMock.Object);
             Session.Disconnected += (sender, args) => DisconnectedRegister.Add(args);
             Session.DisconnectReceived += (sender, args) => DisconnectReceivedRegister.Add(args);
             Session.ErrorOccured += (sender, args) => ErrorOccurredRegister.Add(args);
@@ -105,60 +120,64 @@ namespace Renci.SshNet.Tests.Classes
                 {
                     ServerSocket = socket;
 
-                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                    socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                    socket.Send(Encoding.ASCII.GetBytes("SSH-2.0-SshStub\r\n"));
+                    // Since we're mocking the protocol version exchange, we'll immediately stat KEX upon
+                    // having established the connection instead of when the client has been identified
+
+                    var keyExchangeInitMessage = new KeyExchangeInitMessage
+                        {
+                            CompressionAlgorithmsClientToServer = new string[0],
+                            CompressionAlgorithmsServerToClient = new string[0],
+                            EncryptionAlgorithmsClientToServer = new string[0],
+                            EncryptionAlgorithmsServerToClient = new string[0],
+                            KeyExchangeAlgorithms = new[] { _keyExchangeAlgorithm },
+                            LanguagesClientToServer = new string[0],
+                            LanguagesServerToClient = new string[0],
+                            MacAlgorithmsClientToServer = new string[0],
+                            MacAlgorithmsServerToClient = new string[0],
+                            ServerHostKeyAlgorithms = new string[0]
+                        };
+                    var keyExchangeInit = keyExchangeInitMessage.GetPacket(8, null);
+                    ServerSocket.Send(keyExchangeInit, 4, keyExchangeInit.Length - 4, SocketFlags.None);
                 };
-
-            var counter = 0;
-
             ServerListener.BytesReceived += (received, socket) =>
                 {
                     ServerBytesReceivedRegister.Add(received);
 
-                    switch (counter++)
+                    if (!_authenticationStarted)
                     {
-                        case 0:
-                            var keyExchangeInitMessage = new KeyExchangeInitMessage
-                            {
-                                CompressionAlgorithmsClientToServer = new string[0],
-                                CompressionAlgorithmsServerToClient = new string[0],
-                                EncryptionAlgorithmsClientToServer = new string[0],
-                                EncryptionAlgorithmsServerToClient = new string[0],
-                                KeyExchangeAlgorithms = new[] {_keyExchangeAlgorithm},
-                                LanguagesClientToServer = new string[0],
-                                LanguagesServerToClient = new string[0],
-                                MacAlgorithmsClientToServer = new string[0],
-                                MacAlgorithmsServerToClient = new string[0],
-                                ServerHostKeyAlgorithms = new string[0]
-                            };
-                            var keyExchangeInit = keyExchangeInitMessage.GetPacket(8, null);
-                            ServerSocket.Send(keyExchangeInit, 4, keyExchangeInit.Length - 4, SocketFlags.None);
-                            break;
-                        case 1:
-                            var serviceAcceptMessage =
-                                ServiceAcceptMessageBuilder.Create(ServiceName.UserAuthentication)
-                                    .Build();
-                            ServerSocket.Send(serviceAcceptMessage, 0, serviceAcceptMessage.Length, SocketFlags.None);
-                            break;
+                        var serviceAcceptMessage = ServiceAcceptMessageBuilder.Create(ServiceName.UserAuthentication)
+                                                                              .Build();
+                        ServerSocket.Send(serviceAcceptMessage, 0, serviceAcceptMessage.Length, SocketFlags.None);
+
+                        _authenticationStarted = true;
                     }
                 };
+            ServerListener.Start();
+
+            ClientSocket = new DirectConnector(_socketFactory).Connect(ConnectionInfo);
         }
 
         private void CreateMocks()
         {
             ServiceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
             ConnectorMock = new Mock<IConnector>(MockBehavior.Strict);
+            _protocolVersionExchangeMock = new Mock<IProtocolVersionExchange>(MockBehavior.Strict);
             _keyExchangeMock = new Mock<IKeyExchange>(MockBehavior.Strict);
             _clientAuthenticationMock = new Mock<IClientAuthentication>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
         {
-            ServiceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo))
-                               .Returns(ConnectorMock.Object);
+            ServiceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo, SocketFactoryMock.Object))
+                              .Returns(ConnectorMock.Object);
             ConnectorMock.Setup(p => p.Connect(ConnectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+                         .Returns(ClientSocket);
+            ServiceFactoryMock.Setup(p => p.CreateProtocolVersionExchange())
+                              .Returns(_protocolVersionExchangeMock.Object);
+            _protocolVersionExchangeMock.Setup(p => p.Start(Session.ClientVersion, ClientSocket, ConnectionInfo.Timeout))
+                                        .Returns(ServerIdentification);
+
             ServiceFactoryMock.Setup(
                 p =>
                     p.CreateKeyExchange(ConnectionInfo.KeyExchangeAlgorithms, new[] { _keyExchangeAlgorithm })).Returns(_keyExchangeMock.Object);
@@ -184,7 +203,6 @@ namespace Renci.SshNet.Tests.Classes
             SetupData();
             SetupMocks();
 
-            ServerListener.Start();
             Session.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
index 3aed3027..eacb27c3 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -49,7 +50,7 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ErrorOccurredIsNeverRaised()
         {
-            Assert.AreEqual(0, ErrorOccurredRegister.Count);
+            Assert.AreEqual(0, ErrorOccurredRegister.Count, ErrorOccurredRegister.AsString());
         }
 
         [TestMethod]
@@ -188,5 +189,12 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreEqual(WaitResult.Disconnected, result);
             Assert.IsNull(exception);
         }
+
+        [TestMethod]
+        public void ClientSocketShouldNotBeConnected()
+        {
+            Assert.IsNotNull(ClientSocket);
+            Assert.IsFalse(ClientSocket.Connected);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs
index a78154f7..a8ce5c96 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Messages.Connection;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -33,7 +34,7 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ErrorOccurredShouldNotBeRaised()
         {
-            Assert.AreEqual(0, ErrorOccurredRegister.Count);
+            Assert.AreEqual(0, ErrorOccurredRegister.Count, ErrorOccurredRegister.AsString());
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
index e652a8af..cee331f9 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
@@ -22,12 +22,16 @@ namespace Renci.SshNet.Tests.Classes
     public class SessionTest_Connected_ServerAndClientDisconnectRace
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<ISocketFactory> _socketFactoryMock;
         private Mock<IConnector> _connectorMock;
+        private Mock<IProtocolVersionExchange> _protocolVersionExchangeMock;
         private Mock<IKeyExchange> _keyExchangeMock;
         private Mock<IClientAuthentication> _clientAuthenticationMock;
         private IPEndPoint _serverEndPoint;
         private string _keyExchangeAlgorithm;
         private DisconnectMessage _disconnectMessage;
+        private SocketFactory _socketFactory;
+        private bool _authenticationStarted;
 
         protected Random Random { get; private set; }
         protected byte[] SessionId { get; private set; }
@@ -38,7 +42,9 @@ namespace Renci.SshNet.Tests.Classes
         protected AsyncSocketListener ServerListener { get; private set; }
         protected IList<byte[]> ServerBytesReceivedRegister { get; private set; }
         protected Session Session { get; private set; }
+        protected Socket ClientSocket { get; private set; }
         protected Socket ServerSocket { get; private set; }
+        internal SshIdentification ServerIdentification { get; private set; }
 
         private void TearDown()
         {
@@ -51,6 +57,12 @@ namespace Renci.SshNet.Tests.Classes
             {
                 Session.Dispose();
             }
+
+            if (ClientSocket != null && ClientSocket.Connected)
+            {
+                ClientSocket.Shutdown(SocketShutdown.Both);
+                ClientSocket.Dispose();
+            }
         }
 
         protected virtual void SetupData()
@@ -71,76 +83,83 @@ namespace Renci.SshNet.Tests.Classes
             DisconnectReceivedRegister = new List<MessageEventArgs<DisconnectMessage>>();
             ErrorOccurredRegister = new List<ExceptionEventArgs>();
             ServerBytesReceivedRegister = new List<byte[]>();
+            ServerIdentification = new SshIdentification("2.0", "OurServerStub");
+            _authenticationStarted = false;
             _disconnectMessage = new DisconnectMessage(DisconnectReason.ServiceNotAvailable, "Not today!");
+            _socketFactory = new SocketFactory();
 
-            Session = new Session(ConnectionInfo, _serviceFactoryMock.Object);
+            Session = new Session(ConnectionInfo, _serviceFactoryMock.Object, _socketFactoryMock.Object);
             Session.Disconnected += (sender, args) => DisconnectedRegister.Add(args);
             Session.DisconnectReceived += (sender, args) => DisconnectReceivedRegister.Add(args);
             Session.ErrorOccured += (sender, args) => ErrorOccurredRegister.Add(args);
             Session.KeyExchangeInitReceived += (sender, args) =>
-            {
-                var newKeysMessage = new NewKeysMessage();
-                var newKeys = newKeysMessage.GetPacket(8, null);
-                ServerSocket.Send(newKeys, 4, newKeys.Length - 4, SocketFlags.None);
-            };
+                {
+                    var newKeysMessage = new NewKeysMessage();
+                    var newKeys = newKeysMessage.GetPacket(8, null);
+                    ServerSocket.Send(newKeys, 4, newKeys.Length - 4, SocketFlags.None);
+                };
 
             ServerListener = new AsyncSocketListener(_serverEndPoint);
             ServerListener.Connected += socket =>
-            {
-                ServerSocket = socket;
-
-                socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                socket.Send(Encoding.ASCII.GetBytes("SSH-2.0-SshStub\r\n"));
-            };
-
-            var counter = 0;
-
-            ServerListener.BytesReceived += (received, socket) =>
-            {
-                ServerBytesReceivedRegister.Add(received);
-
-                switch (counter++)
                 {
-                    case 0:
-                        var keyExchangeInitMessage = new KeyExchangeInitMessage
-                        {
-                            CompressionAlgorithmsClientToServer = new string[0],
-                            CompressionAlgorithmsServerToClient = new string[0],
-                            EncryptionAlgorithmsClientToServer = new string[0],
-                            EncryptionAlgorithmsServerToClient = new string[0],
-                            KeyExchangeAlgorithms = new[] { _keyExchangeAlgorithm },
-                            LanguagesClientToServer = new string[0],
-                            LanguagesServerToClient = new string[0],
-                            MacAlgorithmsClientToServer = new string[0],
-                            MacAlgorithmsServerToClient = new string[0],
-                            ServerHostKeyAlgorithms = new string[0]
-                        };
-                        var keyExchangeInit = keyExchangeInitMessage.GetPacket(8, null);
-                        ServerSocket.Send(keyExchangeInit, 4, keyExchangeInit.Length - 4, SocketFlags.None);
-                        break;
-                    case 1:
+                    ServerSocket = socket;
+
+                    // Since we're mocking the protocol version exchange, we'll immediately stat KEX upon
+                    // having established the connection instead of when the client has been identified
+
+                    var keyExchangeInitMessage = new KeyExchangeInitMessage
+                    {
+                        CompressionAlgorithmsClientToServer = new string[0],
+                        CompressionAlgorithmsServerToClient = new string[0],
+                        EncryptionAlgorithmsClientToServer = new string[0],
+                        EncryptionAlgorithmsServerToClient = new string[0],
+                        KeyExchangeAlgorithms = new[] { _keyExchangeAlgorithm },
+                        LanguagesClientToServer = new string[0],
+                        LanguagesServerToClient = new string[0],
+                        MacAlgorithmsClientToServer = new string[0],
+                        MacAlgorithmsServerToClient = new string[0],
+                        ServerHostKeyAlgorithms = new string[0]
+                    };
+                    var keyExchangeInit = keyExchangeInitMessage.GetPacket(8, null);
+                    ServerSocket.Send(keyExchangeInit, 4, keyExchangeInit.Length - 4, SocketFlags.None);
+                };
+            ServerListener.BytesReceived += (received, socket) =>
+                {
+                    ServerBytesReceivedRegister.Add(received);
+
+                    if (!_authenticationStarted)
+                    {
                         var serviceAcceptMessage =ServiceAcceptMessageBuilder.Create(ServiceName.UserAuthentication).Build();
                         ServerSocket.Send(serviceAcceptMessage, 0, serviceAcceptMessage.Length, SocketFlags.None);
-                        break;
-                }
-            };
+                        _authenticationStarted = true;
+                    }
+                };
+
+            ServerListener.Start();
+
+            ClientSocket = new DirectConnector(_socketFactory).Connect(ConnectionInfo);
         }
 
         private void CreateMocks()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
             _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
+            _protocolVersionExchangeMock = new Mock<IProtocolVersionExchange>(MockBehavior.Strict);
             _keyExchangeMock = new Mock<IKeyExchange>(MockBehavior.Strict);
             _clientAuthenticationMock = new Mock<IClientAuthentication>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
         {
-            _serviceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo))
+            _serviceFactoryMock.Setup(p => p.CreateConnector(ConnectionInfo, _socketFactoryMock.Object))
                                .Returns(_connectorMock.Object);
             _connectorMock.Setup(p => p.Connect(ConnectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+                          .Returns(ClientSocket);
+            _serviceFactoryMock.Setup(p => p.CreateProtocolVersionExchange())
+                               .Returns(_protocolVersionExchangeMock.Object);
+            _protocolVersionExchangeMock.Setup(p => p.Start(Session.ClientVersion, ClientSocket, ConnectionInfo.Timeout))
+                                        .Returns(ServerIdentification);
             _serviceFactoryMock.Setup(
                 p =>
                     p.CreateKeyExchange(ConnectionInfo.KeyExchangeAlgorithms, new[] { _keyExchangeAlgorithm })).Returns(_keyExchangeMock.Object);
@@ -164,7 +183,6 @@ namespace Renci.SshNet.Tests.Classes
             SetupData();
             SetupMocks();
 
-            ServerListener.Start();
             Session.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessage.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessage.cs
index 1b887dc6..36a73d82 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessage.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessage.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -70,7 +71,7 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ErrorOccurredIsNeverRaised()
         {
-            Assert.AreEqual(0, ErrorOccurredRegister.Count);
+            Assert.AreEqual(0, ErrorOccurredRegister.Count, ErrorOccurredRegister.AsString());
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs
index d8a50a3d..f3bb9877 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -73,7 +74,7 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ErrorOccurredIsNeverRaised()
         {
-            Assert.AreEqual(0, ErrorOccurredRegister.Count);
+            Assert.AreEqual(0, ErrorOccurredRegister.Count, ErrorOccurredRegister.AsString());
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsUnsupportedMessageType.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsUnsupportedMessageType.cs
index 02e998a4..a40f6e03 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsUnsupportedMessageType.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerSendsUnsupportedMessageType.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -66,7 +67,7 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ErrorOccurredIsRaisedOnce()
         {
-            Assert.AreEqual(1, ErrorOccurredRegister.Count);
+            Assert.AreEqual(1, ErrorOccurredRegister.Count, ErrorOccurredRegister.AsString());
 
             var errorOccurred = ErrorOccurredRegister[0];
             Assert.IsNotNull(errorOccurred);
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_NotConnected.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_NotConnected.cs
index 4a8b3ded..97a49a0e 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_NotConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_NotConnected.cs
@@ -4,34 +4,27 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SessionTest_NotConnected
+    public class SessionTest_NotConnected : SessionTestBase
     {
         private ConnectionInfo _connectionInfo;
-        private IServiceFactory _serviceFactory;
         private Session _session;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
             _connectionInfo = CreateConnectionInfo(serverEndPoint, TimeSpan.FromSeconds(5));
-            _serviceFactory = new Mock<IServiceFactory>(MockBehavior.Strict).Object;
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _session = new Session(_connectionInfo, _serviceFactory);
+            _session = new Session(_connectionInfo, _serviceFactoryMock.Object, _socketFactoryMock.Object);
         }
 
         [TestMethod]
@@ -46,6 +39,18 @@ namespace Renci.SshNet.Tests.Classes
             Assert.AreSame(_connectionInfo, _session.ConnectionInfo);
         }
 
+        [TestMethod]
+        public void DisconnectShouldNotThrowException()
+        {
+            _session.Disconnect();
+        }
+
+        [TestMethod]
+        public void DisposeShouldNotThrowException()
+        {
+            _session.Dispose();
+        }
+
         [TestMethod]
         public void IsConnectedShouldReturnFalse()
         {
diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
index bcc42b6a..f5fb4d79 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_SocketConnected_BadPacketAndDispose.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
@@ -15,13 +14,17 @@ namespace Renci.SshNet.Tests.Classes
     public class SessionTest_SocketConnected_BadPacketAndDispose
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
+        private Mock<ISocketFactory> _socketFactoryMock;
         private Mock<IConnector> _connectorMock;
+        private Mock<IProtocolVersionExchange> _protocolVersionExchangeMock;
         private ConnectionInfo _connectionInfo;
         private Session _session;
         private AsyncSocketListener _serverListener;
         private IPEndPoint _serverEndPoint;
         private Socket _serverSocket;
+        private Socket _clientSocket;
         private SshConnectionException _actualException;
+        private SocketFactory _socketFactory;
 
         [TestInitialize]
         public void Setup()
@@ -42,7 +45,9 @@ namespace Renci.SshNet.Tests.Classes
         protected void CreateMocks()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
             _connectorMock = new Mock<IConnector>(MockBehavior.Strict);
+            _protocolVersionExchangeMock = new Mock<IProtocolVersionExchange>(MockBehavior.Strict);
         }
 
         protected void SetupData()
@@ -55,30 +60,37 @@ namespace Renci.SshNet.Tests.Classes
                 new PasswordAuthenticationMethod("user", "password"));
             _connectionInfo.Timeout = TimeSpan.FromMilliseconds(200);
             _actualException = null;
+            _socketFactory = new SocketFactory();
 
             _serverListener = new AsyncSocketListener(_serverEndPoint);
             _serverListener.Connected += (socket) =>
                 {
                     _serverSocket = socket;
 
-                    socket.Send(Encoding.ASCII.GetBytes("\r\n"));
-                    socket.Send(Encoding.ASCII.GetBytes("WELCOME banner\r\n"));
-                    socket.Send(Encoding.ASCII.GetBytes("SSH-2.0-SshStub\r\n"));
-                };
-            _serverListener.BytesReceived += (received, socket) =>
-                {
+                    // Since we're mocking the protocol version exchange, we can immediately send the bad
+                    // packet upon establishing the connection
+
                     var badPacket = new byte[] { 0x0a, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05 };
                     _serverSocket.Send(badPacket, 0, badPacket.Length, SocketFlags.None);
                     _serverSocket.Shutdown(SocketShutdown.Send);
                 };
+            _serverListener.Start();
+
+            _session = new Session(_connectionInfo, _serviceFactoryMock.Object, _socketFactoryMock.Object);
+
+            _clientSocket = new DirectConnector(_socketFactory).Connect(_connectionInfo);
         }
 
         protected void SetupMocks()
         {
-            _serviceFactoryMock.Setup(p => p.CreateConnector(_connectionInfo))
+            _serviceFactoryMock.Setup(p => p.CreateConnector(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_connectorMock.Object);
             _connectorMock.Setup(p => p.Connect(_connectionInfo))
-                          .Returns<IConnectionInfo>(c => new DirectConnector().Connect(c));
+                          .Returns(_clientSocket);
+            _serviceFactoryMock.Setup(p => p.CreateProtocolVersionExchange())
+                               .Returns(_protocolVersionExchangeMock.Object);
+            _protocolVersionExchangeMock.Setup(p => p.Start(_session.ClientVersion, _clientSocket, _connectionInfo.Timeout))
+                                        .Returns(new SshIdentification("2.0", "XXX"));
         }
 
         protected void Arrange()
@@ -86,15 +98,13 @@ namespace Renci.SshNet.Tests.Classes
             CreateMocks();
             SetupData();
             SetupMocks();
-
-            _serverListener.Start();
         }
 
         protected virtual void Act()
         {
             try
             {
-                using (_session = new Session(_connectionInfo, _serviceFactoryMock.Object))
+
                 {
                     _session.Connect();
                 }
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTestBase.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTestBase.cs
new file mode 100644
index 00000000..11657962
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTestBase.cs
@@ -0,0 +1,19 @@
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes
+{
+    public abstract class SftpClientTestBase : BaseClientTestBase
+    {
+        internal Mock<ISftpResponseFactory> _sftpResponseFactoryMock { get; private set; }
+        internal Mock<ISftpSession> _sftpSessionMock { get; private set; }
+
+        protected override void CreateMocks()
+        {
+            base.CreateMocks();
+
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs
index afbc247b..b3bcb8e8 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs
@@ -4,59 +4,35 @@ using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Security;
 using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SftpClientTest_Connect_SftpSessionConnectFailure
+    public class SftpClientTest_Connect_SftpSessionConnectFailure : SftpClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
-        private Mock<ISftpSession> _sftpSessionMock;
         private ConnectionInfo _connectionInfo;
         private ApplicationException _sftpSessionConnectionException;
         private SftpClient _sftpClient;
         private ApplicationException _actualException;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        private void Arrange()
-        {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
-
-            _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
-        }
-
-        private void SetupData()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _sftpSessionConnectionException = new ApplicationException();
         }
 
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
+        protected override void SetupMocks()
         {
             var sequence = new MockSequence();
 
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence)
                         .Setup(p => p.Connect());
@@ -75,7 +51,14 @@ namespace Renci.SshNet.Tests.Classes
                         .Setup(p => p.Dispose());
         }
 
-        private void Act()
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
+        }
+
+        protected override void Act()
         {
             try
             {
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
index ba7d080f..239c8493 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
@@ -6,44 +6,30 @@ using Renci.SshNet.Sftp;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SftpClientTest_Dispose_Connected
+    public class SftpClientTest_Dispose_Connected : SftpClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
-        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
                                .Setup(p => p.CreateSftpResponseFactory())
@@ -55,11 +41,16 @@ namespace Renci.SshNet.Tests.Classes
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sftpClient.Connect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sftpClient.Dispose();
         }
@@ -78,10 +69,17 @@ namespace Renci.SshNet.Tests.Classes
                 Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
index 516b8aeb..192c5e95 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
@@ -6,40 +6,31 @@ using Renci.SshNet.Sftp;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SftpClientTest_Dispose_Disconnected
+    public class SftpClientTest_Dispose_Disconnected : SftpClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
-        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
 
         private int _operationTimeout;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
                                .Setup(p => p.CreateSftpResponseFactory())
@@ -51,12 +42,17 @@ namespace Renci.SshNet.Tests.Classes
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sftpClient.Connect();
             _sftpClient.Disconnect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sftpClient.Dispose();
         }
@@ -75,10 +71,17 @@ namespace Renci.SshNet.Tests.Classes
                 Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
index 73b07ad4..11e00ad0 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
@@ -6,44 +6,30 @@ using Renci.SshNet.Sftp;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SftpClientTest_Dispose_Disposed
+    public class SftpClientTest_Dispose_Disposed : SftpClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
-        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
+
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
                                .Setup(p => p.CreateSftpResponseFactory())
@@ -55,12 +41,17 @@ namespace Renci.SshNet.Tests.Classes
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sftpClient.Connect();
             _sftpClient.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sftpClient.Dispose();
         }
@@ -79,10 +70,17 @@ namespace Renci.SshNet.Tests.Classes
                 Times.Once);
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
index 1c1328d7..033f0ea0 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
@@ -6,54 +6,49 @@ using Renci.SshNet.Sftp;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SftpClientTest_Finalize_Connected
+    public class SftpClientTest_Finalize_Connected : SftpClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
-        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private int _operationTimeout;
+        private WeakReference _sftpClientWeakRefence;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Loose);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
             _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
+            _sftpClientWeakRefence = new WeakReference(_sftpClient);
+        }
 
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
-                .Returns(_sessionMock.Object);
+        protected override void SetupMocks()
+        {
+            _serviceFactoryMock.Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.Setup(p => p.Connect());
             _serviceFactoryMock.Setup(p => p.CreateSftpResponseFactory())
                                .Returns(_sftpResponseFactoryMock.Object);
             _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object))
                                .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.Setup(p => p.Connect());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sftpClient.Connect();
             _sftpClient = null;
 
-            // we need to dereference all other mocks as they might otherwise hold the target alive
-            _sessionMock = null;
-            _connectionInfo = null;
-            _serviceFactoryMock = null;
+            // We need to dereference all mocks as they might otherwise hold the target alive
+            //(through recorded invocations?)
+            CreateMocks();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -62,13 +57,25 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void DisconnectOnSftpSessionShouldNeverBeInvoked()
         {
+            // Since we recreated the mocks, this test has no value
+            // We'll leaving ths test just in case we have a solution that does not require us
+            // to recreate the mocks
             _sftpSessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
         public void DisposeOnSftpSessionShouldNeverBeInvoked()
         {
+            // Since we recreated the mocks, this test has no value
+            // We'll leaving ths test just in case we have a solution that does not require us
+            // to recreate the mocks
             _sftpSessionMock.Verify(p => p.Dispose(), Times.Never);
         }
+
+        [TestMethod]
+        public void SftpClientShouldHaveBeenFinalized()
+        {
+            Assert.IsNull(_sftpClientWeakRefence.Target);
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected.cs
index 99aba81f..df1ea835 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected.cs
@@ -8,11 +8,8 @@ using Renci.SshNet.Common;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class
-        SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected
+    public class SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSizeAndTerminalModes_Connected : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
         private string _terminalName;
@@ -25,14 +22,7 @@ namespace Renci.SshNet.Tests.Classes
         private ShellStream _expected;
         private ShellStream _actual;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        private void SetupData()
+        protected override void SetupData()
         {
             var random = new Random();
 
@@ -49,18 +39,15 @@ namespace Renci.SshNet.Tests.Classes
             _expected = CreateShellStream();
         }
 
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
+        protected override void SetupMocks()
         {
             var sequence = new MockSequence();
 
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence)
                         .Setup(p => p.Connect());
@@ -76,17 +63,15 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(_expected);
         }
 
-        private void Arrange()
+        protected override void Arrange()
         {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _actual = _sshClient.CreateShellStream(_terminalName,
                                                    _widthColumns,
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected.cs
index 14f52887..337f9bce 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected.cs
@@ -8,10 +8,8 @@ using Renci.SshNet.Common;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected
+    public class SshClientTest_CreateShellStream_TerminalNameAndColumnsAndRowsAndWidthAndHeightAndBufferSize_Connected : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
         private string _terminalName;
@@ -23,14 +21,7 @@ namespace Renci.SshNet.Tests.Classes
         private ShellStream _expected;
         private ShellStream _actual;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        private void SetupData()
+        protected override void SetupData()
         {
             var random = new Random();
 
@@ -46,18 +37,15 @@ namespace Renci.SshNet.Tests.Classes
             _expected = CreateShellStream();
         }
 
-        private void CreateMocks()
-        {
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-        }
-
-        private void SetupMocks()
+        protected override void SetupMocks()
         {
             var sequence = new MockSequence();
 
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSession(_connectionInfo))
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
                                .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence)
                         .Setup(p => p.Connect());
@@ -73,17 +61,15 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(_expected);
         }
 
-        private void Arrange()
+        protected override void Arrange()
         {
-            SetupData();
-            CreateMocks();
-            SetupMocks();
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _actual = _sshClient.CreateShellStream(_terminalName,
                                                    _widthColumns,
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
index a5f19697..e2c22b9a 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
@@ -5,42 +5,37 @@ using Moq;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_Disconnect_ForwardedPortStarted
+    public class SshClientTest_Disconnect_ForwardedPortStarted : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private Mock<ForwardedPort> _forwardedPortMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _forwardedPortMock = new Mock<ForwardedPort>(MockBehavior.Strict);
-
-            _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
@@ -49,7 +44,7 @@ namespace Renci.SshNet.Tests.Classes
             _forwardedPortMock.Object.Start();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sshClient.Disconnect();
         }
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs
index a2133775..55108df6 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs
@@ -4,51 +4,55 @@ using Moq;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_Dispose_Connected
+    public class SshClientTest_Dispose_Connected : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+        }
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
-            _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sshClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs
index b4d28cb0..1d78561b 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs
@@ -4,52 +4,56 @@ using Moq;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_Dispose_Disconnected
+    public class SshClientTest_Dispose_Disconnected : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+        }
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
-            _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
             _sshClient.Disconnect();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sshClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs
index b5ffd003..54e07be9 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs
@@ -4,52 +4,56 @@ using Moq;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_Dispose_Disposed
+    public class SshClientTest_Dispose_Disposed : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+        }
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
-            _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
             _sshClient.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sshClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSocketFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSocketFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object),
+                                       Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs
index 28df578d..0b6da3cd 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs
@@ -6,42 +6,44 @@ using Moq;
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class SshClientTest_Dispose_ForwardedPortStarted
+    public class SshClientTest_Dispose_ForwardedPortStarted : BaseClientTestBase
     {
-        private Mock<IServiceFactory> _serviceFactoryMock;
-        private Mock<ISession> _sessionMock;
         private Mock<ForwardedPort> _forwardedPortMock;
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void CreateMocks()
         {
-            Arrange();
-            Act();
+            base.CreateMocks();
+
+            _forwardedPortMock = new Mock<ForwardedPort>(MockBehavior.Strict);
         }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
-        protected void Arrange()
+        protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+        }
 
+        protected override void SetupMocks()
+        {
             var sequence = new MockSequence();
 
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
-            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _forwardedPortMock = new Mock<ForwardedPort>(MockBehavior.Strict);
-
-            _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSocketFactory())
+                               .Returns(_socketFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSession(_connectionInfo, _socketFactoryMock.Object))
+                               .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
             _sshClient.Connect();
@@ -50,7 +52,7 @@ namespace Renci.SshNet.Tests.Classes
             _forwardedPortMock.Object.Start();
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _sshClient.Dispose();
         }
diff --git a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
index dbb6128b..e7b051dd 100644
--- a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
+++ b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -12,9 +13,11 @@ namespace Renci.SshNet.Tests.Common
     {
         private readonly IPEndPoint _endPoint;
         private readonly ManualResetEvent _acceptCallbackDone;
+        private List<Socket> _connectedClients;
         private Socket _listener;
         private Thread _receiveThread;
         private bool _started;
+        private object _syncLock;
 
         public delegate void BytesReceivedHandler(byte[] bytesReceived, Socket socket);
         public delegate void ConnectedHandler(Socket socket);
@@ -27,6 +30,8 @@ namespace Renci.SshNet.Tests.Common
         {
             _endPoint = endPoint;
             _acceptCallbackDone = new ManualResetEvent(false);
+            _connectedClients = new List<Socket>();
+            _syncLock = new object();
             ShutdownRemoteCommunicationSocket = true;
         }
 
@@ -56,11 +61,31 @@ namespace Renci.SshNet.Tests.Common
         public void Stop()
         {
             _started = false;
+
+            lock (_syncLock)
+            {
+                foreach (var connectedClient in _connectedClients)
+                {
+                    try
+                    {
+                        connectedClient.Shutdown(SocketShutdown.Send);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.Error.WriteLine("[{0}] Failure shutting down socket: {1}",
+                                                typeof(AsyncSocketListener).FullName,
+                                                ex);
+                    }
+
+                    DrainSocket(connectedClient);
+                }
+            }
+
             if (_listener != null)
             {
                 _listener.Dispose();
-                _listener = null;
             }
+
             if (_receiveThread != null)
             {
                 _receiveThread.Join();
@@ -87,15 +112,23 @@ namespace Renci.SshNet.Tests.Common
 
         private void AcceptCallback(IAsyncResult ar)
         {
-            // Signal the main thread to continue.
+            // Signal the main thread to continue
             _acceptCallbackDone.Set();
 
-            // Get the socket that handles the client request.
-            var listener = (Socket)ar.AsyncState;
+            // Get the socket that listens for inbound connections
+            var listener = (Socket) ar.AsyncState;
+
+            // Get the socket that handles the client request
+            var handler = listener.EndAccept(ar);
+
+            // Signal new connection
+            SignalConnected(handler);
+
+            // Register client socket
+            _connectedClients.Add(handler);
+
             try
             {
-                var handler = listener.EndAccept(ar);
-                SignalConnected(handler);
                 var state = new SocketStateObject(handler);
                 handler.BeginReceive(state.Buffer, 0, state.Buffer.Length, 0, ReadCallback, state);
             }
@@ -109,7 +142,7 @@ namespace Renci.SshNet.Tests.Common
         private void ReadCallback(IAsyncResult ar)
         {
             // Retrieve the state object and the handler socket
-            // from the asynchronous state object.
+            // from the asynchronous state object
             var state = (SocketStateObject) ar.AsyncState;
             var handler = state.Socket;
 
@@ -132,8 +165,6 @@ namespace Renci.SshNet.Tests.Common
                 var bytesReceived = new byte[bytesRead];
                 Array.Copy(state.Buffer, bytesReceived, bytesRead);
                 SignalBytesReceived(bytesReceived, handler);
-
-                // prepare to receive more bytes
                 handler.BeginReceive(state.Buffer, 0, state.Buffer.Length, 0, ReadCallback, state);
             }
             else
@@ -142,8 +173,13 @@ namespace Renci.SshNet.Tests.Common
 
                 if (ShutdownRemoteCommunicationSocket)
                 {
-                    handler.Shutdown(SocketShutdown.Both);
-                    handler.Close();
+                    lock (_syncLock)
+                    {
+                        handler.Shutdown(SocketShutdown.Send);
+                        handler.Close();
+
+                        _connectedClients.Remove(handler);
+                    }
                 }
             }
         }
@@ -169,6 +205,30 @@ namespace Renci.SshNet.Tests.Common
                 subscribers(client);
         }
 
+        private static void DrainSocket(Socket socket)
+        {
+            var buffer = new byte[128];
+
+            try
+            {
+                while (true && socket.Connected)
+                {
+                    var bytesRead = socket.Receive(buffer);
+                    if (bytesRead == 0)
+                    {
+                        break;
+                    }
+                }
+            }
+            catch (SocketException ex)
+            {
+                Console.Error.WriteLine("[{0}] Failure draining socket ({1}): {2}",
+                                        typeof(AsyncSocketListener).FullName,
+                                        ex.SocketErrorCode.ToString("G"),
+                                        ex);
+            }
+        }
+
         private class SocketStateObject
         {
             public Socket Socket { get; private set; }
diff --git a/src/Renci.SshNet.Tests/Common/TripleATestBase.cs b/src/Renci.SshNet.Tests/Common/TripleATestBase.cs
new file mode 100644
index 00000000..8e8f6005
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Common/TripleATestBase.cs
@@ -0,0 +1,29 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Renci.SshNet.Tests.Common
+{
+    public abstract class TripleATestBase
+    {
+        [TestInitialize]
+        public void Init()
+        {
+            Arrange();
+            Act();
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            TearDown();
+        }
+
+        protected virtual void TearDown()
+        {
+        }
+
+        protected abstract void Arrange();
+
+        protected abstract void Act();
+    }
+}
+
diff --git a/src/Renci.SshNet/BaseClient.cs b/src/Renci.SshNet/BaseClient.cs
index 0b5e627f..5b0e01c9 100644
--- a/src/Renci.SshNet/BaseClient.cs
+++ b/src/Renci.SshNet/BaseClient.cs
@@ -457,7 +457,7 @@ namespace Renci.SshNet
 
         private ISession CreateAndConnectSession()
         {
-            var session = _serviceFactory.CreateSession(ConnectionInfo);
+            var session = _serviceFactory.CreateSession(ConnectionInfo, _serviceFactory.CreateSocketFactory());
             session.HostKeyReceived += Session_HostKeyReceived;
             session.ErrorOccured += Session_ErrorOccured;
 
diff --git a/src/Renci.SshNet/Connection/ConnectorBase.cs b/src/Renci.SshNet/Connection/ConnectorBase.cs
index a1dd051f..6e9bed7a 100644
--- a/src/Renci.SshNet/Connection/ConnectorBase.cs
+++ b/src/Renci.SshNet/Connection/ConnectorBase.cs
@@ -9,6 +9,16 @@ namespace Renci.SshNet.Connection
 {
     internal abstract class ConnectorBase : IConnector
     {
+        protected ConnectorBase(ISocketFactory socketFactory)
+        {
+            if (socketFactory == null)
+                throw new ArgumentNullException("socketFactory");
+
+            SocketFactory = socketFactory;
+        }
+
+        internal ISocketFactory SocketFactory { get; private set; }
+
         public abstract Socket Connect(IConnectionInfo connectionInfo);
 
         /// <summary>
@@ -26,18 +36,35 @@ namespace Renci.SshNet.Connection
 
             DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));
 
-            var socket = SocketAbstraction.Connect(ep, timeout);
+            var socket = SocketFactory.Create(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
-            const int socketBufferSize = 2 * Session.MaximumSshPacketSize;
-            socket.SendBufferSize = socketBufferSize;
-            socket.ReceiveBufferSize = socketBufferSize;
-            return socket;
+            try
+            {
+                SocketAbstraction.Connect(socket, ep, timeout);
+
+                const int socketBufferSize = 2 * Session.MaximumSshPacketSize;
+                socket.SendBufferSize = socketBufferSize;
+                socket.ReceiveBufferSize = socketBufferSize;
+                return socket;
+            }
+            catch (Exception)
+            {
+                socket.Dispose();
+                throw;
+            }
         }
 
         protected static byte SocketReadByte(Socket socket)
         {
             var buffer = new byte[1];
-            SocketRead(socket, buffer, 0, 1);
+            SocketRead(socket, buffer, 0, 1, Session.InfiniteTimeSpan);
+            return buffer[0];
+        }
+
+        protected static byte SocketReadByte(Socket socket, TimeSpan readTimeout)
+        {
+            var buffer = new byte[1];
+            SocketRead(socket, buffer, 0, 1, readTimeout);
             return buffer[0];
         }
 
@@ -52,16 +79,31 @@ namespace Renci.SshNet.Connection
         /// The number of bytes read.
         /// </returns>
         /// <exception cref="SshConnectionException">The socket is closed.</exception>
-        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
         /// <exception cref="SocketException">The read failed.</exception>
         protected static int SocketRead(Socket socket, byte[] buffer, int offset, int length)
         {
-            var bytesRead = SocketAbstraction.Read(socket, buffer, offset, length, Session.InfiniteTimeSpan);
+            return SocketRead(socket, buffer, offset, length, Session.InfiniteTimeSpan);
+        }
+
+        /// <summary>
+        /// Performs a blocking read on the socket until <paramref name="length"/> bytes are received.
+        /// </summary>
+        /// <param name="socket">The <see cref="Socket"/> to read from.</param>
+        /// <param name="buffer">An array of type <see cref="byte"/> that is the storage location for the received data.</param>
+        /// <param name="offset">The position in <paramref name="buffer"/> parameter to store the received data.</param>
+        /// <param name="length">The number of bytes to read.</param>
+        /// <param name="readTimeout">The maximum time to wait until <paramref name="length"/> bytes have been received.</param>
+        /// <returns>
+        /// The number of bytes read.
+        /// </returns>
+        /// <exception cref="SshConnectionException">The socket is closed.</exception>
+        /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
+        /// <exception cref="SocketException">The read failed.</exception>
+        protected static int SocketRead(Socket socket, byte[] buffer, int offset, int length, TimeSpan readTimeout)
+        {
+            var bytesRead = SocketAbstraction.Read(socket, buffer, offset, length, readTimeout);
             if (bytesRead == 0)
             {
-                // when we're in the disconnecting state (either triggered by client or server), then the
-                // SshConnectionException will interrupt the message listener loop (if not already interrupted)
-                // and the exception itself will be ignored (in RaiseError)
                 throw new SshConnectionException("An established connection was aborted by the server.",
                                                  DisconnectReason.ConnectionLost);
             }
diff --git a/src/Renci.SshNet/Connection/DirectConnector.cs b/src/Renci.SshNet/Connection/DirectConnector.cs
index 05dc833e..ec846450 100644
--- a/src/Renci.SshNet/Connection/DirectConnector.cs
+++ b/src/Renci.SshNet/Connection/DirectConnector.cs
@@ -4,6 +4,10 @@ namespace Renci.SshNet.Connection
 {
     internal class DirectConnector : ConnectorBase
     {
+        public DirectConnector(ISocketFactory socketFactory) : base(socketFactory)
+        {
+        }
+
         public override Socket Connect(IConnectionInfo connectionInfo)
         {
             return SocketConnect(connectionInfo.Host, connectionInfo.Port, connectionInfo.Timeout);
diff --git a/src/Renci.SshNet/Connection/HttpConnector.cs b/src/Renci.SshNet/Connection/HttpConnector.cs
index d4ff0e15..b77f0734 100644
--- a/src/Renci.SshNet/Connection/HttpConnector.cs
+++ b/src/Renci.SshNet/Connection/HttpConnector.cs
@@ -8,18 +8,57 @@ using System.Text.RegularExpressions;
 
 namespace Renci.SshNet.Connection
 {
+    /// <summary>
+    /// Establishes a tunnel via an HTTP proxy server.
+    /// </summary>
+    /// <remarks>
+    /// <list type="table">
+    ///   <listheader>
+    ///     <term>Specification</term>
+    ///     <description>URL</description>
+    ///   </listheader>
+    ///   <item>
+    ///     <term>HTTP CONNECT method</term>
+    ///     <description>https://tools.ietf.org/html/rfc7231#section-4.3.6</description>
+    ///   </item>
+    ///   <item>
+    ///     <term>HTTP Authentication: Basic and Digest Access Authentication</term>
+    ///     <description>https://tools.ietf.org/html/rfc2617</description>
+    ///   </item>
+    /// </list>
+    /// </remarks>
     internal class HttpConnector : ConnectorBase
     {
+        public HttpConnector(ISocketFactory socketFactory) : base(socketFactory)
+        {
+        }
+
         public override Socket Connect(IConnectionInfo connectionInfo)
         {
             var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
 
+            try
+            {
+                HandleProxyConnect(connectionInfo, socket);
+                return socket;
+            }
+            catch (Exception)
+            {
+                socket.Shutdown(SocketShutdown.Both);
+                socket.Dispose();
+
+                throw;
+            }
+        }
+
+        private void HandleProxyConnect(IConnectionInfo connectionInfo, Socket socket)
+        {
             var httpResponseRe = new Regex(@"HTTP/(?<version>\d[.]\d) (?<statusCode>\d{3}) (?<reasonPhrase>.+)$");
             var httpHeaderRe = new Regex(@"(?<fieldName>[^\[\]()<>@,;:\""/?={} \t]+):(?<fieldValue>.+)?");
 
             SocketAbstraction.Send(socket, SshData.Ascii.GetBytes(string.Format("CONNECT {0}:{1} HTTP/1.0\r\n", connectionInfo.Host, connectionInfo.Port)));
 
-            //  Sent proxy authorization is specified
+            //  Sent proxy authorization if specified
             if (!string.IsNullOrEmpty(connectionInfo.ProxyUsername))
             {
                 var authorization = string.Format("Proxy-Authorization: Basic {0}\r\n",
@@ -50,9 +89,9 @@ namespace Renci.SshNet.Connection
                         statusCode = (HttpStatusCode)int.Parse(httpStatusCode);
                         if (statusCode != HttpStatusCode.OK)
                         {
-                            var reasonPhrase = statusMatch.Result("${reasonPhrase}");
-                            throw new ProxyException(string.Format("HTTP: Status code {0}, \"{1}\"", httpStatusCode,
-                                reasonPhrase));
+                            throw new ProxyException(string.Format("HTTP: Status code {0}, \"{1}\"",
+                                                                   httpStatusCode,
+                                                                   statusMatch.Result("${reasonPhrase}")));
                         }
                     }
 
@@ -78,7 +117,7 @@ namespace Renci.SshNet.Connection
                     if (contentLength > 0)
                     {
                         var contentBody = new byte[contentLength];
-                        SocketRead(socket, contentBody, 0, contentLength);
+                        SocketRead(socket, contentBody, 0, contentLength, connectionInfo.Timeout);
                     }
                     break;
                 }
@@ -88,21 +127,19 @@ namespace Renci.SshNet.Connection
             {
                 throw new ProxyException("HTTP response does not contain status line.");
             }
-
-            return socket;
         }
 
         /// <summary>
         /// Performs a blocking read on the socket until a line is read.
         /// </summary>
         /// <param name="socket">The <see cref="Socket"/> to read from.</param>
-        /// <param name="timeout">A <see cref="TimeSpan"/> that represents the time to wait until a line is read.</param>
+        /// <param name="readTimeout">A <see cref="TimeSpan"/> that represents the time to wait until a line is read.</param>
         /// <exception cref="SshOperationTimeoutException">The read has timed-out.</exception>
         /// <exception cref="SocketException">An error occurred when trying to access the socket.</exception>
         /// <returns>
         /// The line read from the socket, or <c>null</c> when the remote server has shutdown and all data has been received.
         /// </returns>
-        private static string SocketReadLine(Socket socket, TimeSpan timeout)
+        private static string SocketReadLine(Socket socket, TimeSpan readTimeout)
         {
             var encoding = SshData.Ascii;
             var buffer = new List<byte>();
@@ -112,10 +149,12 @@ namespace Renci.SshNet.Connection
             // to be processed by subsequent invocations
             do
             {
-                var bytesRead = SocketAbstraction.Read(socket, data, 0, data.Length, timeout);
+                var bytesRead = SocketAbstraction.Read(socket, data, 0, data.Length, readTimeout);
                 if (bytesRead == 0)
+                {
                     // the remote server shut down the socket
                     break;
+                }
 
                 var b = data[0];
                 buffer.Add(b);
diff --git a/src/Renci.SshNet/Connection/ISocketFactory.cs b/src/Renci.SshNet/Connection/ISocketFactory.cs
new file mode 100644
index 00000000..0d76eeb2
--- /dev/null
+++ b/src/Renci.SshNet/Connection/ISocketFactory.cs
@@ -0,0 +1,9 @@
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal interface ISocketFactory
+    {
+        Socket Create(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType);
+    }
+}
diff --git a/src/Renci.SshNet/Connection/SocketFactory.cs b/src/Renci.SshNet/Connection/SocketFactory.cs
new file mode 100644
index 00000000..8c61b87c
--- /dev/null
+++ b/src/Renci.SshNet/Connection/SocketFactory.cs
@@ -0,0 +1,12 @@
+using System.Net.Sockets;
+
+namespace Renci.SshNet.Connection
+{
+    internal class SocketFactory : ISocketFactory
+    {
+        public Socket Create(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
+        {
+            return new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp) { NoDelay = true };
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Connection/Socks4Connector.cs b/src/Renci.SshNet/Connection/Socks4Connector.cs
index 64b15e07..096be937 100644
--- a/src/Renci.SshNet/Connection/Socks4Connector.cs
+++ b/src/Renci.SshNet/Connection/Socks4Connector.cs
@@ -2,26 +2,58 @@
 using Renci.SshNet.Common;
 using System;
 using System.Net.Sockets;
+using System.Text;
 
 namespace Renci.SshNet.Connection
 {
+    /// <summary>
+    /// Establishes a tunnel via a SOCKS4 proxy server.
+    /// </summary>
+    /// <remarks>
+    /// https://www.openssh.com/txt/socks4.protocol
+    /// </remarks>
     internal class Socks4Connector : ConnectorBase
     {
+        public Socks4Connector(ISocketFactory socketFactory) : base(socketFactory)
+        {
+        }
+
         public override Socket Connect(IConnectionInfo connectionInfo)
         {
             var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
 
+            try
+            {
+                HandleProxyConnect(connectionInfo, socket);
+                return socket;
+            }
+            catch (Exception)
+            {
+                socket.Shutdown(SocketShutdown.Both);
+                socket.Dispose();
+
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Establishes a connection to the server via a SOCKS5 proxy.
+        /// </summary>
+        /// <param name="connectionInfo">The connection information.</param>
+        /// <param name="socket">The <see cref="Socket"/>.</param>
+        private void HandleProxyConnect(IConnectionInfo connectionInfo, Socket socket)
+        {
             var connectionRequest = CreateSocks4ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port, connectionInfo.ProxyUsername);
             SocketAbstraction.Send(socket, connectionRequest);
 
-            //  Read null byte
-            if (SocketReadByte(socket) != 0)
+            //  Read reply version
+            if (SocketReadByte(socket, connectionInfo.Timeout) != 0x00)
             {
                 throw new ProxyException("SOCKS4: Null is expected.");
             }
 
             //  Read response code
-            var code = SocketReadByte(socket);
+            var code = SocketReadByte(socket, connectionInfo.Timeout);
 
             switch (code)
             {
@@ -37,15 +69,14 @@ namespace Renci.SshNet.Connection
                     throw new ProxyException("SOCKS4: Not valid response.");
             }
 
-            var dummyBuffer = new byte[6]; // field 3 (2 bytes) and field 4 (4) should be ignored
-            SocketRead(socket, dummyBuffer, 0, 6);
-
-            return socket;
+            var destBuffer = new byte[6]; // destination port and IP address should be ignored
+            SocketRead(socket, destBuffer, 0, destBuffer.Length, connectionInfo.Timeout);
         }
 
         private static byte[] CreateSocks4ConnectionRequest(string hostname, ushort port, string username)
         {
             var addressBytes = GetSocks4DestinationAddress(hostname);
+            var proxyUserBytes = GetProxyUserBytes(username);
 
             var connectionRequest = new byte
                 [
@@ -58,7 +89,7 @@ namespace Renci.SshNet.Connection
                     // IP address
                     addressBytes.Length +
                     // Username
-                    username.Length +
+                    proxyUserBytes.Length +
                     // Null terminator
                     1
                 ];
@@ -79,6 +110,11 @@ namespace Renci.SshNet.Connection
             Buffer.BlockCopy(addressBytes, 0, connectionRequest, index, addressBytes.Length);
             index += addressBytes.Length;
 
+            // User name
+            Buffer.BlockCopy(proxyUserBytes, 0, connectionRequest, index, proxyUserBytes.Length);
+            index += proxyUserBytes.Length;
+
+            // Null terminator
             connectionRequest[index] = 0x00;
 
             return connectionRequest;
@@ -99,5 +135,15 @@ namespace Renci.SshNet.Connection
 
             throw new ProxyException(string.Format("SOCKS4 only supports IPv4. No such address found for '{0}'.", hostname));
         }
+
+        private static byte[] GetProxyUserBytes(string proxyUser)
+        {
+            if (proxyUser == null)
+            {
+                return Array<byte>.Empty;
+            }
+
+            return Encoding.ASCII.GetBytes(proxyUser);
+        }
     }
 }
diff --git a/src/Renci.SshNet/Connection/Socks5Connector.cs b/src/Renci.SshNet/Connection/Socks5Connector.cs
index c000af80..720ac500 100644
--- a/src/Renci.SshNet/Connection/Socks5Connector.cs
+++ b/src/Renci.SshNet/Connection/Socks5Connector.cs
@@ -5,12 +5,43 @@ using System.Net.Sockets;
 
 namespace Renci.SshNet.Connection
 {
+    /// <summary>
+    /// Establishes a tunnel via a SOCKS5 proxy server.
+    /// </summary>
+    /// <remarks>
+    /// https://en.wikipedia.org/wiki/SOCKS#SOCKS5
+    /// </remarks>
     internal class Socks5Connector : ConnectorBase
     {
+        public Socks5Connector(ISocketFactory socketFactory) : base(socketFactory)
+        {
+        }
+
         public override Socket Connect(IConnectionInfo connectionInfo)
         {
             var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout);
 
+            try
+            {
+                HandleProxyConnect(connectionInfo, socket);
+                return socket;
+            }
+            catch (Exception)
+            {
+                socket.Shutdown(SocketShutdown.Both);
+                socket.Dispose();
+
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Establishes a connection to the server via a SOCKS5 proxy.
+        /// </summary>
+        /// <param name="connectionInfo">The connection information.</param>
+        /// <param name="socket">The <see cref="Socket"/>.</param>
+        private void HandleProxyConnect(IConnectionInfo connectionInfo, Socket socket)
+        {
             var greeting = new byte[]
                 {
                     // SOCKS version number
@@ -26,7 +57,9 @@ namespace Renci.SshNet.Connection
 
             var socksVersion = SocketReadByte(socket);
             if (socksVersion != 0x05)
+            {
                 throw new ProxyException(string.Format("SOCKS Version '{0}' is not supported.", socksVersion));
+            }
 
             var authenticationMethod = SocketReadByte(socket);
             switch (authenticationMethod)
@@ -50,7 +83,7 @@ namespace Renci.SshNet.Connection
                     throw new ProxyException("SOCKS5: No acceptable authentication methods were offered.");
             }
 
-            var connectionRequest = CreateSocks5ConnectionRequest(connectionInfo.Host, (ushort)connectionInfo.Port);
+            var connectionRequest = CreateSocks5ConnectionRequest(connectionInfo.Host, (ushort) connectionInfo.Port);
             SocketAbstraction.Send(socket, connectionRequest);
 
             //  Read Server SOCKS5 version
@@ -111,8 +144,6 @@ namespace Renci.SshNet.Connection
 
             //  Read 2 bytes to be ignored
             SocketRead(socket, port, 0, 2);
-
-            return socket;
         }
 
         /// <summary>
@@ -145,14 +176,14 @@ namespace Renci.SshNet.Connection
             authenticationRequest[index++] = 0x01;
 
             // Length of the username
-            authenticationRequest[index++] = (byte)username.Length;
+            authenticationRequest[index++] = (byte) username.Length;
 
             // Username
             SshData.Ascii.GetBytes(username, 0, username.Length, authenticationRequest, index);
             index += username.Length;
 
             // Length of the password
-            authenticationRequest[index++] = (byte)password.Length;
+            authenticationRequest[index++] = (byte) password.Length;
 
             // Password
             SshData.Ascii.GetBytes(password, 0, password.Length, authenticationRequest, index);
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 5b501961..dad93e23 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Sockets;
 using System.Text;
 using Renci.SshNet.Common;
 using Renci.SshNet.Connection;
@@ -16,14 +17,17 @@ namespace Renci.SshNet
         IClientAuthentication CreateClientAuthentication();
 
         /// <summary>
-        /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/>.
+        /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/> and
+        /// <see cref="ISocketFactory"/>.
         /// </summary>
         /// <param name="connectionInfo">The <see cref="ConnectionInfo"/> to use for creating a new session.</param>
+        /// <param name="socketFactory">A factory to create <see cref="Socket"/> instances.</param>
         /// <returns>
         /// An <see cref="ISession"/> for the specified <see cref="ConnectionInfo"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <c>null</c>.</exception>
-        ISession CreateSession(ConnectionInfo connectionInfo);
+        /// <exception cref="ArgumentNullException"><paramref name="socketFactory"/> is <c>null</c>.</exception>
+        ISession CreateSession(ConnectionInfo connectionInfo, ISocketFactory socketFactory);
 
         /// <summary>
         /// Creates a new <see cref="ISftpSession"/> in a given <see cref="ISession"/> and with
@@ -114,20 +118,31 @@ namespace Renci.SshNet
         /// to the server identified by the specified <paramref name="connectionInfo"/>.
         /// </summary>
         /// <param name="connectionInfo">A <see cref="IConnectionInfo"/> detailing the server to establish a connection to.</param>
+        /// <param name="socketFactory">A factory to create <see cref="Socket"/> instances.</param>
         /// <returns>
-        /// An <see cref="IConnector"/>.
+        /// An <see cref="IConnector"/> that can be used to establish a connection to the
+        /// server identified by the specified <paramref name="connectionInfo"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="socketFactory"/> is <see langword="null"/>.</exception>
         /// <exception cref="NotSupportedException">The <see cref="IConnectionInfo.ProxyType"/> value of <paramref name="connectionInfo"/> is not supported.</exception>
-        IConnector CreateConnector(IConnectionInfo connectionInfo);
+        IConnector CreateConnector(IConnectionInfo connectionInfo, ISocketFactory socketFactory);
 
         /// <summary>
-        /// Create an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
+        /// Creates an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
         /// version exchange.
         /// </summary>
         /// <returns>
         /// An <see cref="IProtocolVersionExchange"/>.
         /// </returns>
         IProtocolVersionExchange CreateProtocolVersionExchange();
+
+        /// <summary>
+        /// Creates a factory to create <see cref="Socket"/> instances.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="ISocketFactory"/>.
+        /// </returns>
+        ISocketFactory CreateSocketFactory();
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index 72112f32..f04e6116 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -8,6 +8,7 @@ using Renci.SshNet.Security;
 using Renci.SshNet.Sftp;
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Connection;
+using System.Net.Sockets;
 
 namespace Renci.SshNet
 {
@@ -34,16 +35,19 @@ namespace Renci.SshNet
         }
 
         /// <summary>
-        /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/>.
+        /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/> and
+        /// <see cref="ISocketFactory"/>.
         /// </summary>
         /// <param name="connectionInfo">The <see cref="ConnectionInfo"/> to use for creating a new session.</param>
+        /// <param name="socketFactory">A factory to create <see cref="Socket"/> instances.</param>
         /// <returns>
         /// An <see cref="ISession"/> for the specified <see cref="ConnectionInfo"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <c>null</c>.</exception>
-        public ISession CreateSession(ConnectionInfo connectionInfo)
+        /// <exception cref="ArgumentNullException"><paramref name="socketFactory"/> is <c>null</c>.</exception>
+        public ISession CreateSession(ConnectionInfo connectionInfo, ISocketFactory socketFactory)
         {
-            return new Session(connectionInfo, this);
+            return new Session(connectionInfo, this, socketFactory);
         }
 
         /// <summary>
@@ -195,34 +199,38 @@ namespace Renci.SshNet
         /// to the server identified by the specified <paramref name="connectionInfo"/>.
         /// </summary>
         /// <param name="connectionInfo">A <see cref="IConnectionInfo"/> detailing the server to establish a connection to.</param>
+        /// <param name="socketFactory">A factory to create <see cref="Socket"/> instances.</param>
         /// <returns>
         /// An <see cref="IConnector"/> that can be used to establish a connection to the
         /// server identified by the specified <paramref name="connectionInfo"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="socketFactory"/> is <see langword="null"/>.</exception>
         /// <exception cref="NotSupportedException">The <see cref="IConnectionInfo.ProxyType"/> value of <paramref name="connectionInfo"/> is not supported.</exception>
-        public IConnector CreateConnector(IConnectionInfo connectionInfo)
+        public IConnector CreateConnector(IConnectionInfo connectionInfo, ISocketFactory socketFactory)
         {
             if (connectionInfo == null)
                 throw new ArgumentNullException("connectionInfo");
+            if (socketFactory == null)
+                throw new ArgumentNullException("socketFactory");
 
             switch (connectionInfo.ProxyType)
             {
                 case ProxyTypes.None:
-                    return new DirectConnector();
+                    return new DirectConnector(socketFactory);
                 case ProxyTypes.Socks4:
-                    return new Socks4Connector();
+                    return new Socks4Connector(socketFactory);
                 case ProxyTypes.Socks5:
-                    return new Socks5Connector();
+                    return new Socks5Connector(socketFactory);
                 case ProxyTypes.Http:
-                    return new HttpConnector();
+                    return new HttpConnector(socketFactory);
                 default:
                     throw new NotSupportedException(string.Format("ProxyTypes '{0}' is not supported.", connectionInfo.ProxyType));
             }
         }
 
         /// <summary>
-        /// Create an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
+        /// Creates an <see cref="IProtocolVersionExchange"/> that deals with the SSH protocol
         /// version exchange.
         /// </summary>
         /// <returns>
@@ -232,5 +240,16 @@ namespace Renci.SshNet
         {
             return new ProtocolVersionExchange();
         }
+
+        /// <summary>
+        /// Creates a factory to create <see cref="Socket"/> instances.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="ISocketFactory"/>.
+        /// </returns>
+        public ISocketFactory CreateSocketFactory()
+        {
+            return new SocketFactory();
+        }
     }
 }
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index bc3c0769..0748b8da 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
 using Renci.SshNet.Compression;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Messages;
 using Renci.SshNet.Messages.Authentication;
 using Renci.SshNet.Messages.Connection;
@@ -161,6 +162,7 @@ namespace Renci.SshNet
         /// Holds the factory to use for creating new services.
         /// </summary>
         private readonly IServiceFactory _serviceFactory;
+        private readonly ISocketFactory _socketFactory;
 
         /// <summary>
         /// Holds connection socket.
@@ -531,18 +533,23 @@ namespace Renci.SshNet
         /// </summary>
         /// <param name="connectionInfo">The connection info.</param>
         /// <param name="serviceFactory">The factory to use for creating new services.</param>
+        /// <param name="socketFactory">A factory to create <see cref="Socket"/> instances.</param>
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="serviceFactory"/> is <c>null</c>.</exception>
-        internal Session(ConnectionInfo connectionInfo, IServiceFactory serviceFactory)
+        /// <exception cref="ArgumentNullException"><paramref name="socketFactory"/> is <c>null</c>.</exception>
+        internal Session(ConnectionInfo connectionInfo, IServiceFactory serviceFactory, ISocketFactory socketFactory)
         {
             if (connectionInfo == null)
                 throw new ArgumentNullException("connectionInfo");
             if (serviceFactory == null)
                 throw new ArgumentNullException("serviceFactory");
+            if (socketFactory == null)
+                throw new ArgumentNullException("socketFactory");
 
             ClientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
             ConnectionInfo = connectionInfo;
             _serviceFactory = serviceFactory;
+            _socketFactory = socketFactory;
             _messageListenerCompleted = new ManualResetEvent(true);
         }
 
@@ -577,14 +584,14 @@ namespace Renci.SshNet
                     // Build list of available messages while connecting
                     _sshMessageFactory = new SshMessageFactory();
 
-                    _socket = _serviceFactory.CreateConnector(ConnectionInfo)
+                    _socket = _serviceFactory.CreateConnector(ConnectionInfo, _socketFactory)
                                              .Connect(ConnectionInfo);
 
                     var serverIdentification = _serviceFactory.CreateProtocolVersionExchange()
                                                               .Start(ClientVersion, _socket, ConnectionInfo.Timeout);
 
                     // Set connection versions
-                    ConnectionInfo.ServerVersion = serverIdentification.ToString();
+                    ServerVersion = ConnectionInfo.ServerVersion = serverIdentification.ToString();
                     ConnectionInfo.ClientVersion = ClientVersion;
 
                     DiagnosticAbstraction.Log(string.Format("Server version '{0}' on '{1}'.", serverIdentification.ProtocolVersion, serverIdentification.SoftwareVersion));

From 43f18cb3d4c4437f243880183ec85dedebdb33f6 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Tue, 29 Dec 2020 20:13:19 +0100
Subject: [PATCH 11/19] Fix test failures.

---
 .../Classes/ServiceFactoryTest_CreateConnector.cs          | 1 +
 .../SshClientTest_Disconnect_ForwardedPortStarted.cs       | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
index af2764b8..ae168a6d 100644
--- a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
+++ b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
@@ -17,6 +17,7 @@ namespace Renci.SshNet.Tests.Classes
         {
             _serviceFactory = new ServiceFactory();
             _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            _socketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
index e2c22b9a..6b1259f0 100644
--- a/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
@@ -11,6 +11,13 @@ namespace Renci.SshNet.Tests.Classes
         private SshClient _sshClient;
         private ConnectionInfo _connectionInfo;
 
+        protected override void CreateMocks()
+        {
+            base.CreateMocks();
+
+            _forwardedPortMock = new Mock<ForwardedPort>(MockBehavior.Strict);
+        }
+
         protected override void SetupData()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));

From f09496b782811b34e3d5a23ca6ff0783e3b9cc86 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Tue, 29 Dec 2020 20:22:10 +0100
Subject: [PATCH 12/19] Fix remaining test failure.

---
 .../Classes/ServiceFactoryTest_CreateConnector.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
index ae168a6d..22d2d4c0 100644
--- a/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
+++ b/src/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateConnector.cs
@@ -134,7 +134,7 @@ namespace Renci.SshNet.Tests.Classes
                 Assert.AreEqual("ProxyTypes '666' is not supported.", ex.Message);
             }
 
-            _connectionInfoMock.Verify(p => p.ProxyType, Times.Once);
+            _connectionInfoMock.Verify(p => p.ProxyType, Times.Exactly(2));
         }
     }
 }

From 8d485f918bec2c99011083474bd535929a783059 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 11:43:35 +0100
Subject: [PATCH 13/19] Remove unused import.

---
 ...Connected_ServerAndClientDisconnectRace.cs | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
index cee331f9..68bcbdaa 100644
--- a/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
+++ b/src/Renci.SshNet.Tests/Classes/SessionTest_Connected_ServerAndClientDisconnectRace.cs
@@ -4,7 +4,6 @@ using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Common;
@@ -108,18 +107,18 @@ namespace Renci.SshNet.Tests.Classes
                     // having established the connection instead of when the client has been identified
 
                     var keyExchangeInitMessage = new KeyExchangeInitMessage
-                    {
-                        CompressionAlgorithmsClientToServer = new string[0],
-                        CompressionAlgorithmsServerToClient = new string[0],
-                        EncryptionAlgorithmsClientToServer = new string[0],
-                        EncryptionAlgorithmsServerToClient = new string[0],
-                        KeyExchangeAlgorithms = new[] { _keyExchangeAlgorithm },
-                        LanguagesClientToServer = new string[0],
-                        LanguagesServerToClient = new string[0],
-                        MacAlgorithmsClientToServer = new string[0],
-                        MacAlgorithmsServerToClient = new string[0],
-                        ServerHostKeyAlgorithms = new string[0]
-                    };
+                        {
+                            CompressionAlgorithmsClientToServer = new string[0],
+                            CompressionAlgorithmsServerToClient = new string[0],
+                            EncryptionAlgorithmsClientToServer = new string[0],
+                            EncryptionAlgorithmsServerToClient = new string[0],
+                            KeyExchangeAlgorithms = new[] { _keyExchangeAlgorithm },
+                            LanguagesClientToServer = new string[0],
+                            LanguagesServerToClient = new string[0],
+                            MacAlgorithmsClientToServer = new string[0],
+                            MacAlgorithmsServerToClient = new string[0],
+                            ServerHostKeyAlgorithms = new string[0]
+                        };
                     var keyExchangeInit = keyExchangeInitMessage.GetPacket(8, null);
                     ServerSocket.Send(keyExchangeInit, 4, keyExchangeInit.Length - 4, SocketFlags.None);
                 };

From e8db68c37150325c712d70bd9b857835f9e40019 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 11:44:25 +0100
Subject: [PATCH 14/19] Improve exception messages.

---
 ...nectorTest_Connect_ProxyUserNameIsEmpty.cs |  11 +-
 ...ectionClosedByServer_NoDataSentByServer.cs |   4 +-
 ...ndWithIdentificationStringBeforeTimeout.cs |   6 +-
 ...est_ServerResponseContainsNullCharacter.cs |   2 +-
 ...entificationOnlyContainsProtocolVersion.cs |  11 +-
 ...changeTest_ServerResponseValid_Comments.cs |   4 +-
 ...angeTest_ServerResponseValid_NoComments.cs |   4 +-
 .../Common/AsyncSocketListener.cs             | 130 +++++++++++++++---
 .../Connection/ProtocolVersionExchange.cs     |  17 ++-
 9 files changed, 151 insertions(+), 38 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
index 63bb1baa..33c22253 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs
@@ -75,16 +75,15 @@ namespace Renci.SshNet.Tests.Classes.Connection
         {
             base.TearDown();
 
-            if (_clientSocket != null)
-            {
-                _clientSocket.Shutdown(SocketShutdown.Send);
-                _clientSocket.Close();
-            }
-
             if (_proxyServer != null)
             {
                 _proxyServer.Dispose();
             }
+
+            if (_clientSocket != null)
+            {
+                _clientSocket.Close();
+            }
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
index 2e9eed4c..a26cf1a3 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer
@@ -58,7 +58,7 @@ namespace Renci.SshNet.Tests.Classes
             _server.BytesReceived += (bytes, socket) =>
                 {
                     _dataReceivedByServer.AddRange(bytes);
-                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Shutdown(SocketShutdown.Send);
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
index 34353ed3..f2ca0f46 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
@@ -10,7 +10,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout
@@ -65,8 +65,10 @@ namespace Renci.SshNet.Tests.Classes
                 {
                     _dataReceivedByServer.AddRange(bytes);
                     socket.Send(Encoding.UTF8.GetBytes("Welcome!\r\n"));
+                    /*
                     Thread.Sleep(_timeout.Add(TimeSpan.FromMilliseconds(50)));
-                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Shutdown(SocketShutdown.Send);
+                    */
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
index b3694c60..f3134a72 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
@@ -9,7 +9,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
index fe3eb0a7..2bfdf8c5 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
@@ -9,7 +9,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion
@@ -63,7 +63,7 @@ namespace Renci.SshNet.Tests.Classes
                 {
                     _dataReceivedByServer.AddRange(bytes);
                     socket.Send(_serverIdentification);
-                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Shutdown(SocketShutdown.Send);
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
@@ -89,8 +89,11 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void StartShouldHaveThrownSshConnectionException()
         {
-            var expectedMessage = "Server response does not contain SSH protocol identification:" + Environment.NewLine +
-                                  "  00000000  53 53 48 2D 32 2E 30 0D 0A                       SSH-2.0..";
+            var expectedMessage = string.Format("The server response does not contain an SSH protocol identification:{0}{0}" +
+                                                "  00000000  53 53 48 2D 32 2E 30 0D 0A                       SSH-2.0..{0}{0}" +
+                                                "More information is available here:{0}" +
+                                                "https://tools.ietf.org/html/rfc4253#section-4.2",
+                                                Environment.NewLine);
 
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
index d4aa0c7c..df533ebe 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
@@ -9,7 +9,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ServerResponseValid_Comments
@@ -63,7 +63,7 @@ namespace Renci.SshNet.Tests.Classes
                 {
                     _dataReceivedByServer.AddRange(bytes);
                     socket.Send(_serverIdentification);
-                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Shutdown(SocketShutdown.Send);
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
index 4b2b0e83..8b4f5997 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
@@ -9,7 +9,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 
-namespace Renci.SshNet.Tests.Classes
+namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
     public class ProtocolVersionExchangeTest_ServerResponseValid_NoComments
@@ -63,7 +63,7 @@ namespace Renci.SshNet.Tests.Classes
                 {
                     _dataReceivedByServer.AddRange(bytes);
                     socket.Send(_serverIdentification);
-                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Shutdown(SocketShutdown.Send);
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
diff --git a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
index e7b051dd..5512b15c 100644
--- a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
+++ b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
@@ -18,6 +18,7 @@ namespace Renci.SshNet.Tests.Common
         private Thread _receiveThread;
         private bool _started;
         private object _syncLock;
+        private string _stackTrace;
 
         public delegate void BytesReceivedHandler(byte[] bytesReceived, Socket socket);
         public delegate void ConnectedHandler(Socket socket);
@@ -56,6 +57,8 @@ namespace Renci.SshNet.Tests.Common
 
             _receiveThread = new Thread(StartListener);
             _receiveThread.Start(_listener);
+
+            _stackTrace = Environment.StackTrace;
         }
 
         public void Stop()
@@ -78,7 +81,10 @@ namespace Renci.SshNet.Tests.Common
                     }
 
                     DrainSocket(connectedClient);
+                    connectedClient.Dispose();
                 }
+
+                _connectedClients.Clear();
             }
 
             if (_listener != null)
@@ -116,26 +122,62 @@ namespace Renci.SshNet.Tests.Common
             _acceptCallbackDone.Set();
 
             // Get the socket that listens for inbound connections
-            var listener = (Socket) ar.AsyncState;
+            var listener = (Socket)ar.AsyncState;
 
             // Get the socket that handles the client request
-            var handler = listener.EndAccept(ar);
+            Socket handler;
+
+            try
+            {
+                handler = listener.EndAccept(ar);
+            }
+            catch (ObjectDisposedException ex)
+            {
+                // The listener is stopped through a Dispose() call, which in turn causes
+                // Socket.EndAccept(IAsyncResult) to throw an ObjectDisposedException
+                //
+                // Since we consider this ObjectDisposedException normal when the listener
+                // is being stopped, we only write a message to stderr if the listener
+                // is considered to be up and running
+                if (_started)
+                {
+                    Console.Error.WriteLine("[{0}] Failure accepting new connection: {1}",
+                                            typeof(AsyncSocketListener).FullName,
+                                            ex);
+                }
+
+                return;
+            }
 
             // Signal new connection
             SignalConnected(handler);
 
-            // Register client socket
-            _connectedClients.Add(handler);
+            lock (_syncLock)
+            {
+                // Register client socket
+                _connectedClients.Add(handler);
+            }
+
+            var state = new SocketStateObject(handler);
 
             try
             {
-                var state = new SocketStateObject(handler);
                 handler.BeginReceive(state.Buffer, 0, state.Buffer.Length, 0, ReadCallback, state);
             }
-            catch (ObjectDisposedException)
+            catch (ObjectDisposedException ex)
             {
-                // when the socket is closed, an ObjectDisposedException is thrown
-                // by Socket.EndAccept(IAsyncResult)
+                // The listener is stopped through a Dispose() call, which in turn causes
+                // Socket.BeginReceive(...) to throw an ObjectDisposedException
+                //
+                // Since we consider this ObjectDisposedException normal when the listener
+                // is being stopped, we only write a message to stderr if the listener
+                // is considered to be up and running
+                if (_started)
+                {
+                    Console.Error.WriteLine("[{0}] Failure receiving new data: {1}",
+                                            typeof(AsyncSocketListener).FullName,
+                                            ex);
+                }
             }
         }
 
@@ -143,7 +185,7 @@ namespace Renci.SshNet.Tests.Common
         {
             // Retrieve the state object and the handler socket
             // from the asynchronous state object
-            var state = (SocketStateObject) ar.AsyncState;
+            var state = (SocketStateObject)ar.AsyncState;
             var handler = state.Socket;
 
             int bytesRead;
@@ -152,11 +194,38 @@ namespace Renci.SshNet.Tests.Common
                 // Read data from the client socket.
                 bytesRead = handler.EndReceive(ar);
             }
-            catch (ObjectDisposedException)
+            catch (SocketException ex)
             {
-                // when the socket is closed, the callback will be invoked for any pending BeginReceive
-                // we could use the Socket.Connected property to detect this here, but the proper thing
-                // to do is invoke EndReceive knowing that it will throw an ObjectDisposedException
+                // The listener is stopped through a Dispose() call, which in turn causes
+                // Socket.EndReceive(...) to throw a SocketException or
+                // ObjectDisposedException
+                //
+                // Since we consider such an exception normal when the listener is being
+                // stopped, we only write a message to stderr if the listener is considered
+                // to be up and running
+                if (_started)
+                {
+                    Console.Error.WriteLine("[{0}] Failure receiving new data: {1}",
+                                            typeof(AsyncSocketListener).FullName,
+                                            ex);
+                }
+                return;
+            }
+            catch (ObjectDisposedException ex)
+            {
+                // The listener is stopped through a Dispose() call, which in turn causes
+                // Socket.EndReceive(...) to throw a SocketException or
+                // ObjectDisposedException
+                //
+                // Since we consider such an exception normal when the listener is being
+                // stopped, we only write a message to stderr if the listener is considered
+                // to be up and running
+                if (_started)
+                {
+                    Console.Error.WriteLine("[{0}] Failure receiving new data: {1}",
+                                            typeof(AsyncSocketListener).FullName,
+                                            ex);
+                }
                 return;
             }
 
@@ -165,7 +234,21 @@ namespace Renci.SshNet.Tests.Common
                 var bytesReceived = new byte[bytesRead];
                 Array.Copy(state.Buffer, bytesReceived, bytesRead);
                 SignalBytesReceived(bytesReceived, handler);
-                handler.BeginReceive(state.Buffer, 0, state.Buffer.Length, 0, ReadCallback, state);
+
+                try
+                {
+                    handler.BeginReceive(state.Buffer, 0, state.Buffer.Length, 0, ReadCallback, state);
+                }
+                catch (SocketException ex)
+                {
+                    if (!_started)
+                    {
+                        throw new Exception("BeginReceive while stopping!", ex);
+                    }
+
+                    throw new Exception("BeginReceive while started!: " + ex.SocketErrorCode + " " + _stackTrace, ex);
+                }
+
             }
             else
             {
@@ -175,8 +258,23 @@ namespace Renci.SshNet.Tests.Common
                 {
                     lock (_syncLock)
                     {
-                        handler.Shutdown(SocketShutdown.Send);
-                        handler.Close();
+                        if (!_started)
+                        {
+                            return;
+                        }
+                        try
+                        {
+                            handler.Shutdown(SocketShutdown.Send);
+                            handler.Close();
+                        }
+                        catch (SocketException ex)
+                        {
+                            throw new Exception("Exception in ReadCallback: " + ex.SocketErrorCode + " " + _stackTrace, ex);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Exception in ReadCallback: " + _stackTrace, ex);
+                        }
 
                         _connectedClients.Remove(handler);
                     }
diff --git a/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
index 6b43bb59..ab7a066b 100644
--- a/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
+++ b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
@@ -13,6 +13,9 @@ namespace Renci.SshNet.Connection
     /// <summary>
     /// Handles the SSH protocol version exchange.
     /// </summary>
+    /// <remarks>
+    /// https://tools.ietf.org/html/rfc4253#section-4.2
+    /// </remarks>
     internal class ProtocolVersionExchange : IProtocolVersionExchange
     {
         private const byte Null = 0x00;
@@ -49,10 +52,14 @@ namespace Renci.SshNet.Connection
                 {
                     if (bytesReceived.Count == 0)
                     {
-                        throw new SshConnectionException("Server response does not contain SSH protocol identification. Connection to remote server was closed before any data was received.", DisconnectReason.ConnectionLost);
+                        throw new SshConnectionException("The server response does not contain an SSH protocol identification. Connection to remote server was closed before any data was received.", DisconnectReason.ConnectionLost);
                     }
 
-                    throw new SshConnectionException(string.Format("Server response does not contain SSH protocol identification:{0}{1}", Environment.NewLine, PacketDump.Create(bytesReceived, 2)),
+                    throw new SshConnectionException(string.Format("The server response does not contain an SSH protocol identification:{0}{0}{1}{0}{0}" +
+                                                                   "More information is available here:{0}" +
+                                                                   "https://tools.ietf.org/html/rfc4253#section-4.2",
+                                                                   Environment.NewLine,
+                                                                   PacketDump.Create(bytesReceived, 2)),
                                                      DisconnectReason.ProtocolError);
                 }
 
@@ -112,7 +119,11 @@ namespace Renci.SshNet.Connection
                 if (byteRead == Null)
                 {
                     throw new SshConnectionException(string.Format(CultureInfo.InvariantCulture,
-                                                                   "The identification string contains a null character at position 0x{0:X8}:{1}{2}",
+                                                                   "The server response contains a null character at position 0x{0:X8}:{1}{1}{2}{1}{1}" +
+                                                                   "A server must not send a null character before the Protocol Version Exchange is{1}" +
+                                                                   "complete.{1}{1}" +
+                                                                   "More information is available here:{1}" +
+                                                                   "https://tools.ietf.org/html/rfc4253#section-4.2",
                                                                    buffer.Count,
                                                                    Environment.NewLine,
                                                                    PacketDump.Create(buffer.ToArray(), 2)));

From d5fefcc369cf25e82e268e221e2f0871a51543f8 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 13:13:20 +0100
Subject: [PATCH 15/19] Fix and rename test.

---
 ...est_TimeoutReadingIdentificationString.cs} | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
 rename src/Renci.SshNet.Tests/Classes/Connection/{ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs => ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs} (81%)

diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs
similarity index 81%
rename from src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
rename to src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs
index f2ca0f46..6ef1668f 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs
@@ -8,12 +8,11 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
     [TestClass]
-    public class ProtocolVersionExchangeTest_ServerDoesNotRespondWithIdentificationStringBeforeTimeout
+    public class ProtocolVersionExchangeTest_TimeoutReadingIdentificationString
     {
         private AsyncSocketListener _server;
         private ProtocolVersionExchange _protocolVersionExchange;
@@ -21,10 +20,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
         private TimeSpan _timeout;
         private IPEndPoint _serverEndPoint;
         private List<byte> _dataReceivedByServer;
-        private byte[] _serverIdentification;
         private bool _clientDisconnected;
         private Socket _client;
-        private SshIdentification _actual;
         private SshOperationTimeoutException _actualException;
 
         [TestInitialize]
@@ -45,7 +42,6 @@ namespace Renci.SshNet.Tests.Classes.Connection
 
             if (_client != null)
             {
-                _client.Shutdown(SocketShutdown.Both);
                 _client.Close();
                 _client = null;
             }
@@ -57,7 +53,7 @@ namespace Renci.SshNet.Tests.Classes.Connection
             _timeout = TimeSpan.FromMilliseconds(200);
             _serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
             _dataReceivedByServer = new List<byte>();
-            _serverIdentification = Encoding.UTF8.GetBytes("SSH-Zero-OurSSHAppliance\r\n!");
+            _clientDisconnected = false;
 
             _server = new AsyncSocketListener(_serverEndPoint);
             _server.Start();
@@ -65,10 +61,6 @@ namespace Renci.SshNet.Tests.Classes.Connection
                 {
                     _dataReceivedByServer.AddRange(bytes);
                     socket.Send(Encoding.UTF8.GetBytes("Welcome!\r\n"));
-                    /*
-                    Thread.Sleep(_timeout.Add(TimeSpan.FromMilliseconds(50)));
-                    socket.Shutdown(SocketShutdown.Send);
-                    */
                 };
             _server.Disconnected += (socket) => _clientDisconnected = true;
 
@@ -112,16 +104,10 @@ namespace Renci.SshNet.Tests.Classes.Connection
         }
 
         [TestMethod]
-        public void ConnectionIsClosedByServer()
+        public void ClientSocketShouldBeConnected()
         {
             Assert.IsTrue(_client.Connected);
             Assert.IsFalse(_clientDisconnected);
-
-            var bytesReceived = _client.Receive(new byte[1]);
-            Assert.AreEqual(0, bytesReceived);
-
-            Assert.IsTrue(_client.Connected);
-            Assert.IsFalse(_clientDisconnected);
         }
     }
 }

From a5148aea1a22e4d8e0fa365adb1d5e4188e037fe Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 15:13:57 +0100
Subject: [PATCH 16/19] Fix some test failures on .NET Core.

---
 ...rectoryInfo_SendExecRequestReturnsFalse.cs |  4 +++
 ...AndFileInfo_SendExecRequestReturnsFalse.cs |  4 +++
 ...thAndStream_SendExecRequestReturnsFalse.cs | 23 +++++++++-------
 ...InfoAndPath_SendExecRequestReturnsFalse.cs |  4 +++
 ...InfoAndPath_SendExecRequestReturnsFalse.cs | 27 +++++++++++--------
 ...ientTest_Upload_FileInfoAndPath_Success.cs | 25 ++++++++++-------
 ...reamAndPath_SendExecRequestReturnsFalse.cs | 23 +++++++++-------
 7 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
index 17372ee6..9c5ed485 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
@@ -55,6 +55,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
index 355f0ea8..8ba4525b 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
@@ -54,6 +54,10 @@ namespace Renci.SshNet.Tests.Classes
                 .Setup(p => p.SendExecRequest(string.Format("scp -pf {0}", _transformedPath))).Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
index 8aceeee4..c1504aec 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
@@ -19,15 +19,6 @@ namespace Renci.SshNet.Tests.Classes
         private IList<ScpUploadEventArgs> _uploadingRegister;
         private SshException _actualException;
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (_destination != null)
-            {
-                _destination.Dispose();
-            }
-        }
-
         protected override void SetupData()
         {
             var random = new Random();
@@ -64,6 +55,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
@@ -75,6 +70,16 @@ namespace Renci.SshNet.Tests.Classes
             _scpClient.Connect();
         }
 
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_destination != null)
+            {
+                _destination.Dispose();
+            }
+        }
+
         protected override void Act()
         {
             try
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
index dd907f86..6791e296 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -54,6 +54,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
index 28ce4538..9a065ee2 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -21,16 +21,6 @@ namespace Renci.SshNet.Tests.Classes
         private IList<ScpUploadEventArgs> _uploadingRegister;
         private SshException _actualException;
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (_fileName != null)
-            {
-                File.Delete(_fileName);
-                _fileName = null;
-            }
-        }
-
         protected override void SetupData()
         {
             var random = new Random();
@@ -70,7 +60,11 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
-        }
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
+}
 
         protected override void Arrange()
         {
@@ -81,6 +75,17 @@ namespace Renci.SshNet.Tests.Classes
             _scpClient.Connect();
         }
 
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_fileName != null)
+            {
+                File.Delete(_fileName);
+                _fileName = null;
+            }
+        }
+
         protected override void Act()
         {
             try
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
index 4a036c37..d86191e5 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
@@ -25,16 +25,6 @@ namespace Renci.SshNet.Tests.Classes
         private int _fileSize;
         private IList<ScpUploadEventArgs> _uploadingRegister;
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (_fileName != null)
-            {
-                File.Delete(_fileName);
-                _fileName = null;
-            }
-        }
-
         protected override void SetupData()
         {
             var random = new Random();
@@ -95,6 +85,10 @@ namespace Renci.SshNet.Tests.Classes
             _pipeStreamMock.InSequence(sequence).Setup(p => p.ReadByte()).Returns(0);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
@@ -109,6 +103,17 @@ namespace Renci.SshNet.Tests.Classes
             _scpClient.Connect();
         }
 
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_fileName != null)
+            {
+                File.Delete(_fileName);
+                _fileName = null;
+            }
+        }
+
         protected override void Act()
         {
             _scpClient.Upload(_fileInfo, _remotePath);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
index 4050d1cd..5facca29 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
@@ -20,15 +20,6 @@ namespace Renci.SshNet.Tests.Classes
         private IList<ScpUploadEventArgs> _uploadingRegister;
         private SshException _actualException;
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (_source != null)
-            {
-                _source.Dispose();
-            }
-        }
-
         protected override void SetupData()
         {
             var random = new Random();
@@ -67,6 +58,10 @@ namespace Renci.SshNet.Tests.Classes
                                .Returns(false);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
+
+            // On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
+            // an interface, we need to expect this call as well
+            _pipeStreamMock.Setup(p => p.Close());
         }
 
         protected override void Arrange()
@@ -78,6 +73,16 @@ namespace Renci.SshNet.Tests.Classes
             _scpClient.Connect();
         }
 
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_source != null)
+            {
+                _source.Dispose();
+            }
+        }
+
         protected override void Act()
         {
             try

From f60f24fb9c941ad3b5108fdc6f52255c55788cb7 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 16:06:24 +0100
Subject: [PATCH 17/19] Fix more tests to pass on .NET Core.

---
 .../Common/PipeStream_Close_BlockingRead.cs   | 25 ++++++++---------
 .../Common/PipeStream_Close_BlockingWrite.cs  | 28 +++++++++----------
 ...ipeStream_Flush_BytesRemainingAfterRead.cs | 25 ++++++++---------
 ...eStream_Flush_NoBytesRemainingAfterRead.cs | 24 ++++++++--------
 4 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
index 7438ceda..fb010c14 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
@@ -1,18 +1,18 @@
-using System;
+using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
     [TestClass]
-    public class PipeStream_Close_BlockingRead
+    public class PipeStream_Close_BlockingRead : TripleATestBase
     {
         private PipeStream _pipeStream;
         private int _bytesRead;
-        private IAsyncResult _asyncReadResult;
+        private Thread _readThread;
 
-        [TestInitialize]
-        public void Init()
+        protected override void Arrange()
         {
             _pipeStream = new PipeStream();
 
@@ -22,26 +22,25 @@ namespace Renci.SshNet.Tests.Classes.Common
 
             _bytesRead = 123;
 
-            Action readAction = () => _bytesRead = _pipeStream.Read(new byte[4], 0, 4);
-            _asyncReadResult = readAction.BeginInvoke(null, null);
-            // ensure we've started reading
-            _asyncReadResult.AsyncWaitHandle.WaitOne(50);
+            _readThread = new Thread(() => _bytesRead = _pipeStream.Read(new byte[4], 0, 4));
+            _readThread.Start();
 
-            Act();
+            // ensure we've started reading
+            Assert.IsFalse(_readThread.Join(50));
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _pipeStream.Close();
 
             // give async read time to complete
-            _asyncReadResult.AsyncWaitHandle.WaitOne(100);
+            _readThread.Join(100);
         }
 
         [TestMethod]
         public void BlockingReadShouldHaveBeenInterrupted()
         {
-            Assert.IsTrue(_asyncReadResult.IsCompleted);
+            Assert.AreEqual(ThreadState.Stopped, _readThread.ThreadState);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingWrite.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingWrite.cs
index d270679a..1fbd2d15 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingWrite.cs
@@ -1,22 +1,23 @@
 using System;
+using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
     [TestClass]
-    public class PipeStream_Close_BlockingWrite
+    public class PipeStream_Close_BlockingWrite : TripleATestBase
     {
         private PipeStream _pipeStream;
         private Exception _writeException;
-        private IAsyncResult _asyncWriteResult;
+        private Thread _writehread;
 
-        [TestInitialize]
-        public void Init()
+        protected override void Arrange()
         {
             _pipeStream = new PipeStream {MaxBufferLength = 3};
 
-            Action writeAction = () =>
+            _writehread = new Thread(() =>
                 {
                     _pipeStream.WriteByte(10);
                     _pipeStream.WriteByte(13);
@@ -33,26 +34,25 @@ namespace Renci.SshNet.Tests.Classes.Common
                         _writeException = ex;
                         throw;
                     }
-                };
-            _asyncWriteResult = writeAction.BeginInvoke(null, null);
-            // ensure we've started writing
-            _asyncWriteResult.AsyncWaitHandle.WaitOne(50);
+                });
+            _writehread.Start();
 
-            Act();
+            // ensure we've started writing
+            Assert.IsFalse(_writehread.Join(50));
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _pipeStream.Close();
 
-            // give async write time to complete
-            _asyncWriteResult.AsyncWaitHandle.WaitOne(100);
+            // give write time to complete
+            _writehread.Join(100);
         }
 
         [TestMethod]
         public void BlockingWriteShouldHaveBeenInterrupted()
         {
-            Assert.IsTrue(_asyncWriteResult.IsCompleted);
+            Assert.AreEqual(ThreadState.Stopped, _writehread.ThreadState);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_BytesRemainingAfterRead.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_BytesRemainingAfterRead.cs
index b16c908e..3af0a3de 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_BytesRemainingAfterRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_BytesRemainingAfterRead.cs
@@ -1,20 +1,19 @@
-using System;
-using System.Threading;
+using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
     [TestClass]
-    public class PipeStream_Flush_BytesRemainingAfterRead
+    public class PipeStream_Flush_BytesRemainingAfterRead : TripleATestBase
     {
         private PipeStream _pipeStream;
         private byte[] _readBuffer;
         private int _bytesRead;
-        private IAsyncResult _asyncReadResult;
+        private Thread _readThread;
 
-        [TestInitialize]
-        public void Init()
+        protected override void Arrange()
         {
             _pipeStream = new PipeStream();
             _pipeStream.WriteByte(10);
@@ -27,25 +26,25 @@ namespace Renci.SshNet.Tests.Classes.Common
             _bytesRead = 0;
             _readBuffer = new byte[4];
 
-            Action readAction = () => _bytesRead = _pipeStream.Read(_readBuffer, 0, _readBuffer.Length);
-            _asyncReadResult = readAction.BeginInvoke(null, null);
-            _asyncReadResult.AsyncWaitHandle.WaitOne(50);
+            _readThread = new Thread(() => _bytesRead = _pipeStream.Read(_readBuffer, 0, _readBuffer.Length));
+            _readThread.Start();
 
-            Act();
+            // ensure we've started reading
+            _readThread.Join(50);
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _pipeStream.Flush();
 
             // give async read time to complete
-            _asyncReadResult.AsyncWaitHandle.WaitOne(100);
+            _readThread.Join(100);
         }
 
         [TestMethod]
         public void AsyncReadShouldHaveFinished()
         {
-            Assert.IsTrue(_asyncReadResult.IsCompleted);
+            Assert.AreEqual(ThreadState.Stopped, _readThread.ThreadState);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_NoBytesRemainingAfterRead.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_NoBytesRemainingAfterRead.cs
index eac2f20b..44c7f3f7 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_NoBytesRemainingAfterRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_NoBytesRemainingAfterRead.cs
@@ -1,19 +1,19 @@
-using System;
+using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
     [TestClass]
-    public class PipeStream_Flush_NoBytesRemainingAfterRead
+    public class PipeStream_Flush_NoBytesRemainingAfterRead : TripleATestBase
     {
         private PipeStream _pipeStream;
         private byte[] _readBuffer;
         private int _bytesRead;
-        private IAsyncResult _asyncReadResult;
+        private Thread _readThread;
 
-        [TestInitialize]
-        public void Init()
+        protected override void Arrange()
         {
             _pipeStream = new PipeStream();
             _pipeStream.WriteByte(10);
@@ -22,25 +22,25 @@ namespace Renci.SshNet.Tests.Classes.Common
             _bytesRead = 0;
             _readBuffer = new byte[4];
 
-            Action readAction = () => _bytesRead = _pipeStream.Read(_readBuffer, 0, _readBuffer.Length);
-            _asyncReadResult = readAction.BeginInvoke(null, null);
-            _asyncReadResult.AsyncWaitHandle.WaitOne(50);
+            _readThread = new Thread(() => _bytesRead = _pipeStream.Read(_readBuffer, 0, _readBuffer.Length));
+            _readThread.Start();
 
-            Act();
+            // ensure we've started reading
+            Assert.IsFalse(_readThread.Join(50));
         }
 
-        protected void Act()
+        protected override void Act()
         {
             _pipeStream.Flush();
 
             // give async read time to complete
-            _asyncReadResult.AsyncWaitHandle.WaitOne(100);
+            _readThread.Join(100);
         }
 
         [TestMethod]
         public void AsyncReadShouldHaveFinished()
         {
-            Assert.IsTrue(_asyncReadResult.IsCompleted);
+            Assert.AreEqual(ThreadState.Stopped, _readThread.ThreadState);
         }
 
         [TestMethod]

From 767fafbfc1606e55ee144fa8a49167bae0f0d798 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 21:19:30 +0100
Subject: [PATCH 18/19] Improve exception messages further.

---
 ..._ConnectionClosedByServer_NoDataSentByServer.cs |  7 ++++++-
 ...angeTest_ServerResponseContainsNullCharacter.cs |  8 ++++++--
 ...SshIdentificationOnlyContainsProtocolVersion.cs |  4 ++--
 .../Connection/ProtocolVersionExchange.cs          | 14 +++++++++-----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
index a26cf1a3..5a8fb691 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
@@ -86,7 +86,12 @@ namespace Renci.SshNet.Tests.Classes.Connection
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual("Server response does not contain SSH protocol identification. Connection to remote server was closed before any data was received.", _actualException.Message);
+            Assert.AreEqual(string.Format("The server response does not contain an SSH protocol identification.{0}" +
+                                          "The connection to the remote server was closed before any data was received.{0}{0}" +
+                                          "More information on the Protocol Version Exchange is available here:{0}" +
+                                          "https://tools.ietf.org/html/rfc4253#section-4.2",
+                                          Environment.NewLine),
+                            _actualException.Message);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
index f3134a72..29792888 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
@@ -88,8 +88,12 @@ namespace Renci.SshNet.Tests.Classes.Connection
         [TestMethod]
         public void StartShouldHaveThrownSshConnectionException()
         {
-            var expectedMessage = "The identification string contains a null character at position 0x00000005:" + Environment.NewLine +
-                                  "  00000000  ED 95 9C 21 00                                   ...!.";
+            var expectedMessage = string.Format("The server response contains a null character at position 0x00000005:{0}{0}" +
+                                                "  00000000  ED 95 9C 21 00                                   ...!.{0}{0}" +
+                                                "A server must not send a null character before the Protocol Version Exchange is complete.{0}{0}" +
+                                                "More information is available here:{0}" +
+                                                "https://tools.ietf.org/html/rfc4253#section-4.2",
+                                                Environment.NewLine);
 
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
index 2bfdf8c5..ff2bc5e5 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
@@ -89,9 +89,9 @@ namespace Renci.SshNet.Tests.Classes.Connection
         [TestMethod]
         public void StartShouldHaveThrownSshConnectionException()
         {
-            var expectedMessage = string.Format("The server response does not contain an SSH protocol identification:{0}{0}" +
+            var expectedMessage = string.Format("The server response does not contain an SSH identification string:{0}{0}" +
                                                 "  00000000  53 53 48 2D 32 2E 30 0D 0A                       SSH-2.0..{0}{0}" +
-                                                "More information is available here:{0}" +
+                                                "More information on the Protocol Version Exchange is available here:{0}" +
                                                 "https://tools.ietf.org/html/rfc4253#section-4.2",
                                                 Environment.NewLine);
 
diff --git a/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
index ab7a066b..21b0e469 100644
--- a/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
+++ b/src/Renci.SshNet/Connection/ProtocolVersionExchange.cs
@@ -52,11 +52,16 @@ namespace Renci.SshNet.Connection
                 {
                     if (bytesReceived.Count == 0)
                     {
-                        throw new SshConnectionException("The server response does not contain an SSH protocol identification. Connection to remote server was closed before any data was received.", DisconnectReason.ConnectionLost);
+                        throw new SshConnectionException(string.Format("The server response does not contain an SSH identification string.{0}" +
+                                                                       "The connection to the remote server was closed before any data was received.{0}{0}" +
+                                                                       "More information on the Protocol Version Exchange is available here:{0}" +
+                                                                       "https://tools.ietf.org/html/rfc4253#section-4.2",
+                                                                       Environment.NewLine),
+                                                         DisconnectReason.ConnectionLost);
                     }
 
-                    throw new SshConnectionException(string.Format("The server response does not contain an SSH protocol identification:{0}{0}{1}{0}{0}" +
-                                                                   "More information is available here:{0}" +
+                    throw new SshConnectionException(string.Format("The server response does not contain an SSH identification string:{0}{0}{1}{0}{0}" +
+                                                                   "More information on the Protocol Version Exchange is available here:{0}" +
                                                                    "https://tools.ietf.org/html/rfc4253#section-4.2",
                                                                    Environment.NewLine,
                                                                    PacketDump.Create(bytesReceived, 2)),
@@ -120,8 +125,7 @@ namespace Renci.SshNet.Connection
                 {
                     throw new SshConnectionException(string.Format(CultureInfo.InvariantCulture,
                                                                    "The server response contains a null character at position 0x{0:X8}:{1}{1}{2}{1}{1}" +
-                                                                   "A server must not send a null character before the Protocol Version Exchange is{1}" +
-                                                                   "complete.{1}{1}" +
+                                                                   "A server must not send a null character before the Protocol Version Exchange is complete.{1}{1}" +
                                                                    "More information is available here:{1}" +
                                                                    "https://tools.ietf.org/html/rfc4253#section-4.2",
                                                                    buffer.Count,

From 41e378cfc0cfa26602e6b53678e99592a309e674 Mon Sep 17 00:00:00 2001
From: drieseng <gert.driesen@telenet.be>
Date: Wed, 30 Dec 2020 22:12:54 +0100
Subject: [PATCH 19/19] Fix test.

---
 ...nExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
index 5a8fb691..c01aacc1 100644
--- a/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
@@ -86,7 +86,7 @@ namespace Renci.SshNet.Tests.Classes.Connection
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual(string.Format("The server response does not contain an SSH protocol identification.{0}" +
+            Assert.AreEqual(string.Format("The server response does not contain an SSH identification string.{0}" +
                                           "The connection to the remote server was closed before any data was received.{0}{0}" +
                                           "More information on the Protocol Version Exchange is available here:{0}" +
                                           "https://tools.ietf.org/html/rfc4253#section-4.2",