Fixed wrong R/W timeout handling on tcp listener handling. v0.4.2

This will provide the file also in the NuGet package and can be seen when looking into projects dependencies.

AMWD.Protocols.Modbus.Common/Contracts/ModbusClientBase.cs

@@ -10,19 +10,27 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 	/// <summary>
 	/// Base implementation of a Modbus client.
 	/// </summary>
-	public abstract class ModbusClientBase : IDisposable
+	/// <remarks>
+	/// Initializes a new instance of the <see cref="ModbusClientBase"/> class with a specific <see cref="IModbusConnection"/>.
+	/// </remarks>
+	/// <param name="connection">The <see cref="IModbusConnection"/> responsible for invoking the requests.</param>
+	/// <param name="disposeConnection">
+	/// <see langword="true"/> if the connection should be disposed of by Dispose(),
+	/// <see langword="false"/> otherwise if you inted to reuse the connection.
+	/// </param>
+	public abstract class ModbusClientBase(IModbusConnection connection, bool disposeConnection) : IDisposable
 	{
 		private bool _isDisposed;
 
 		/// <summary>
 		/// Gets or sets a value indicating whether the connection should be disposed of by <see cref="Dispose()"/>.
 		/// </summary>
-		protected readonly bool disposeConnection;
+		protected readonly bool disposeConnection = disposeConnection;
 
 		/// <summary>
 		/// Gets or sets the <see cref="IModbusConnection"/> responsible for invoking the requests.
 		/// </summary>
-		protected readonly IModbusConnection connection;
+		protected readonly IModbusConnection connection = connection ?? throw new ArgumentNullException(nameof(connection));
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ModbusClientBase"/> class with a specific <see cref="IModbusConnection"/>.
@@ -32,20 +40,6 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			: this(connection, true)
 		{ }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ModbusClientBase"/> class with a specific <see cref="IModbusConnection"/>.
-		/// </summary>
-		/// <param name="connection">The <see cref="IModbusConnection"/> responsible for invoking the requests.</param>
-		/// <param name="disposeConnection">
-		/// <see langword="true"/> if the connection should be disposed of by Dispose(),
-		/// <see langword="false"/> otherwise if you inted to reuse the connection.
-		/// </param>
-		public ModbusClientBase(IModbusConnection connection, bool disposeConnection)
-		{
-			this.connection = connection ?? throw new ArgumentNullException(nameof(connection));
-			this.disposeConnection = disposeConnection;
-		}
-
 		/// <summary>
 		/// Gets or sets the protocol type to use.
 		/// </summary>
@@ -67,7 +61,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeReadCoils(unitId, startAddress, count);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			// The protocol processes complete bytes from the response.
@@ -92,7 +86,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeReadDiscreteInputs(unitId, startAddress, count);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			// The protocol processes complete bytes from the response.
@@ -117,7 +111,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeReadHoldingRegisters(unitId, startAddress, count);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var holdingRegisters = Protocol.DeserializeReadHoldingRegisters(response).ToList();
@@ -140,7 +134,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeReadInputRegisters(unitId, startAddress, count);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var inputRegisters = Protocol.DeserializeReadInputRegisters(response).ToList();
@@ -184,7 +178,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			do
 			{
 				var request = Protocol.SerializeReadDeviceIdentification(unitId, category, requestObjectId);
-				var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+				var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				Protocol.ValidateResponse(request, response);
 
 				result = Protocol.DeserializeReadDeviceIdentification(response);
@@ -247,7 +241,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeWriteSingleCoil(unitId, coil);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var result = Protocol.DeserializeWriteSingleCoil(response);
@@ -268,7 +262,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeWriteSingleHoldingRegister(unitId, register);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var result = Protocol.DeserializeWriteSingleHoldingRegister(response);
@@ -289,7 +283,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeWriteMultipleCoils(unitId, coils);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var (firstAddress, count) = Protocol.DeserializeWriteMultipleCoils(response);
@@ -309,7 +303,7 @@ namespace AMWD.Protocols.Modbus.Common.Contracts
 			Assertions();
 
 			var request = Protocol.SerializeWriteMultipleHoldingRegisters(unitId, registers);
-			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken);
+			var response = await connection.InvokeAsync(request, Protocol.CheckResponseComplete, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 			Protocol.ValidateResponse(request, response);
 
 			var (firstAddress, count) = Protocol.DeserializeWriteMultipleHoldingRegisters(response);

AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs

@@ -10,6 +10,22 @@ namespace AMWD.Protocols.Modbus.Common.Protocols
 	/// </summary>
 	public class RtuProtocol : IModbusProtocol
 	{
+		#region Fields
+
+		private static readonly byte[] _readFunctionCodes = [
+			(byte)ModbusFunctionCode.ReadCoils,
+			(byte)ModbusFunctionCode.ReadDiscreteInputs,
+			(byte)ModbusFunctionCode.ReadHoldingRegisters,
+			(byte)ModbusFunctionCode.ReadInputRegisters];
+
+		private static readonly byte[] _writeFunctionCodes = [
+			(byte)ModbusFunctionCode.WriteSingleCoil,
+			(byte)ModbusFunctionCode.WriteSingleRegister,
+			(byte)ModbusFunctionCode.WriteMultipleCoils,
+			(byte)ModbusFunctionCode.WriteMultipleRegisters];
+
+		#endregion Fields
+
 		#region Constants
 
 		/// <summary>
@@ -627,7 +643,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols
 			// - 0x03 Read Holding Registers
 			// - 0x04 Read Input Registers
 			// do have a "following bytes" at position 3
-			if (new[] { 0x01, 0x02, 0x03, 0x04 }.Contains(responseBytes[1]))
+			if (_readFunctionCodes.Contains(responseBytes[1]))
 			{
 				// Unit ID, Function Code, ByteCount, 2x CRC and length of ByteCount
 				if (responseBytes.Count < 5 + responseBytes[2])
@@ -638,7 +654,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols
 			// - 0x06 Write Single Register
 			// - 0x0F Write Multiple Coils
 			// - 0x10 Write Multiple Registers
-			if (new[] { 0x05, 0x06, 0x0F, 0x10 }.Contains(responseBytes[1]))
+			if (_writeFunctionCodes.Contains(responseBytes[1]))
 			{
 				// Write Single => Unit ID, Function code, 2x Address, 2x Value, 2x CRC
 				// Write Multi  => Unit ID, Function code, 2x Address, 2x QuantityWritten, 2x CRC
@@ -715,13 +731,13 @@ namespace AMWD.Protocols.Modbus.Common.Protocols
 			if (isError)
 				throw new ModbusException("Remote Error") { ErrorCode = (ModbusErrorCode)response[2] };
 
-			if (new[] { 0x01, 0x02, 0x03, 0x04 }.Contains(fnCode))
+			if (_readFunctionCodes.Contains(fnCode))
 			{
 				if (response.Count != 5 + response[2])
 					throw new ModbusException("Number of following bytes does not match.");
 			}
 
-			if (new[] { 0x05, 0x06, 0x0F, 0x10 }.Contains(fnCode))
+			if (_writeFunctionCodes.Contains(fnCode))
 			{
 				if (response.Count != 8)
 					throw new ModbusException("Number of bytes does not match.");

AMWD.Protocols.Modbus.Common/Protocols/VirtualProtocol.cs

@@ -71,7 +71,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols
 
 		public DeviceIdentificationRaw DeserializeReadDeviceIdentification(IReadOnlyList<byte> response)
 		{
-			if (!_devices.TryGetValue(response[0], out var device))
+			if (!_devices.TryGetValue(response[0], out var _))
 				throw new TimeoutException("Device not found.");
 
 			var result = new DeviceIdentificationRaw

AMWD.Protocols.Modbus.Serial/ModbusRtuProxy.cs

@@ -192,17 +192,16 @@ namespace AMWD.Protocols.Modbus.Serial
 		public Task StopAsync(CancellationToken cancellationToken = default)
 		{
 			Assertions();
-			return StopAsyncInternal(cancellationToken);
+			StopAsyncInternal();
+			return Task.CompletedTask;
 		}
 
-		private Task StopAsyncInternal(CancellationToken cancellationToken)
+		private void StopAsyncInternal()
 		{
 			_stopCts?.Cancel();
 
 			_serialPort.Close();
 			_serialPort.DataReceived -= OnDataReceived;
-
-			return Task.CompletedTask;
 		}
 
 		/// <summary>
@@ -215,7 +214,7 @@ namespace AMWD.Protocols.Modbus.Serial
 
 			_isDisposed = true;
 
-			StopAsyncInternal(CancellationToken.None).Wait();
+			StopAsyncInternal();
 
 			_serialPort.Dispose();
 			_stopCts?.Dispose();
@@ -332,7 +331,7 @@ namespace AMWD.Protocols.Modbus.Serial
 			responseBytes.AddRange(requestBytes.Take(2));
 			try
 			{
-				var coils = await Client.ReadCoilsAsync(unitId, firstAddress, count, cancellationToken);
+				var coils = await Client.ReadCoilsAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[(int)Math.Ceiling(coils.Count / 8.0)];
 				for (int i = 0; i < coils.Count; i++)
@@ -371,7 +370,7 @@ namespace AMWD.Protocols.Modbus.Serial
 			responseBytes.AddRange(requestBytes.Take(2));
 			try
 			{
-				var discreteInputs = await Client.ReadDiscreteInputsAsync(unitId, firstAddress, count, cancellationToken);
+				var discreteInputs = await Client.ReadDiscreteInputsAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[(int)Math.Ceiling(discreteInputs.Count / 8.0)];
 				for (int i = 0; i < discreteInputs.Count; i++)
@@ -410,7 +409,7 @@ namespace AMWD.Protocols.Modbus.Serial
 			responseBytes.AddRange(requestBytes.Take(2));
 			try
 			{
-				var holdingRegisters = await Client.ReadHoldingRegistersAsync(unitId, firstAddress, count, cancellationToken);
+				var holdingRegisters = await Client.ReadHoldingRegistersAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[holdingRegisters.Count * 2];
 				for (int i = 0; i < holdingRegisters.Count; i++)
@@ -444,7 +443,7 @@ namespace AMWD.Protocols.Modbus.Serial
 			responseBytes.AddRange(requestBytes.Take(2));
 			try
 			{
-				var inputRegisters = await Client.ReadInputRegistersAsync(unitId, firstAddress, count, cancellationToken);
+				var inputRegisters = await Client.ReadInputRegistersAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[count * 2];
 				for (int i = 0; i < count; i++)
@@ -492,7 +491,7 @@ namespace AMWD.Protocols.Modbus.Serial
 					LowByte = requestBytes[5],
 				};
 
-				bool isSuccess = await Client.WriteSingleCoilAsync(requestBytes[0], coil, cancellationToken);
+				bool isSuccess = await Client.WriteSingleCoilAsync(requestBytes[0], coil, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -531,7 +530,7 @@ namespace AMWD.Protocols.Modbus.Serial
 					LowByte = requestBytes[5]
 				};
 
-				bool isSuccess = await Client.WriteSingleHoldingRegisterAsync(requestBytes[0], register, cancellationToken);
+				bool isSuccess = await Client.WriteSingleHoldingRegisterAsync(requestBytes[0], register, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -591,7 +590,7 @@ namespace AMWD.Protocols.Modbus.Serial
 					});
 				}
 
-				bool isSuccess = await Client.WriteMultipleCoilsAsync(requestBytes[0], coils, cancellationToken);
+				bool isSuccess = await Client.WriteMultipleCoilsAsync(requestBytes[0], coils, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -648,7 +647,7 @@ namespace AMWD.Protocols.Modbus.Serial
 					});
 				}
 
-				bool isSuccess = await Client.WriteMultipleHoldingRegistersAsync(requestBytes[0], list, cancellationToken);
+				bool isSuccess = await Client.WriteMultipleHoldingRegistersAsync(requestBytes[0], list, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -705,7 +704,7 @@ namespace AMWD.Protocols.Modbus.Serial
 
 			try
 			{
-				var deviceInfo = await Client.ReadDeviceIdentificationAsync(requestBytes[0], category, firstObject, cancellationToken);
+				var deviceInfo = await Client.ReadDeviceIdentificationAsync(requestBytes[0], category, firstObject, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				var bodyBytes = new List<byte>();
 
@@ -855,5 +854,21 @@ namespace AMWD.Protocols.Modbus.Serial
 		}
 
 		#endregion Request Handling
+
+		/// <inheritdoc/>
+		public override string ToString()
+		{
+			var sb = new StringBuilder();
+
+			sb.AppendLine($"RTU Proxy");
+			sb.AppendLine($"  {nameof(PortName)}:   {PortName}");
+			sb.AppendLine($"  {nameof(BaudRate)}:   {(int)BaudRate}");
+			sb.AppendLine($"  {nameof(DataBits)}:   {DataBits}");
+			sb.AppendLine($"  {nameof(StopBits)}:   {StopBits}");
+			sb.AppendLine($"  {nameof(Parity)}:     {Parity}");
+			sb.AppendLine($"  {nameof(Client)}:     {Client.GetType().Name}");
+
+			return sb.ToString();
+		}
 	}
 }

AMWD.Protocols.Modbus.Serial/ModbusSerialConnection.cs

@@ -31,8 +31,7 @@ namespace AMWD.Protocols.Modbus.Serial
 		private readonly Task _processingTask;
 		private readonly AsyncQueue<RequestQueueItem> _requestQueue = new();
 
-		// Only required to cover all logic branches on unit tests.
-		private bool _isUnitTest = false;
+		private readonly bool _isLinux;
 
 		#endregion Fields
 
@@ -41,6 +40,8 @@ namespace AMWD.Protocols.Modbus.Serial
 		/// </summary>
 		public ModbusSerialConnection(string portName)
 		{
+			_isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+
 			if (string.IsNullOrWhiteSpace(portName))
 				throw new ArgumentNullException(nameof(portName));
 
@@ -268,7 +269,7 @@ namespace AMWD.Protocols.Modbus.Serial
 				try
 				{
 					// Get next request to process
-					var item = await _requestQueue.DequeueAsync(cancellationToken);
+					var item = await _requestQueue.DequeueAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 					// Remove registration => already removed from queue
 					item.CancellationTokenRegistration.Dispose();
@@ -276,13 +277,13 @@ namespace AMWD.Protocols.Modbus.Serial
 					// Build combined cancellation token
 					using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, item.CancellationTokenSource.Token);
 					// Wait for exclusive access
-					await _portLock.WaitAsync(linkedCts.Token);
+					await _portLock.WaitAsync(linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 					try
 					{
 						// Ensure connection is up
 						await AssertConnection(linkedCts.Token);
 
-						await _serialPort.WriteAsync(item.Request, linkedCts.Token);
+						await _serialPort.WriteAsync(item.Request, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 
 						linkedCts.Token.ThrowIfCancellationRequested();
 
@@ -291,7 +292,7 @@ namespace AMWD.Protocols.Modbus.Serial
 
 						do
 						{
-							int readCount = await _serialPort.ReadAsync(buffer, 0, buffer.Length, linkedCts.Token);
+							int readCount = await _serialPort.ReadAsync(buffer, 0, buffer.Length, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 							if (readCount < 1)
 								throw new EndOfStreamException();
 
@@ -322,7 +323,7 @@ namespace AMWD.Protocols.Modbus.Serial
 						_portLock.Release();
 						_idleTimer.Change(IdleTimeout, Timeout.InfiniteTimeSpan);
 
-						await Task.Delay(InterRequestDelay, cancellationToken);
+						await Task.Delay(InterRequestDelay, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					}
 				}
 				catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
@@ -353,7 +354,7 @@ namespace AMWD.Protocols.Modbus.Serial
 					_serialPort.Close();
 					_serialPort.ResetRS485DriverStateFlags();
 
-					if (DriverEnabledRS485 && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || _isUnitTest))
+					if (DriverEnabledRS485 && _isLinux)
 					{
 						var flags = _serialPort.GetRS485DriverStateFlags();
 						flags |= RS485Flags.Enabled;
@@ -361,7 +362,7 @@ namespace AMWD.Protocols.Modbus.Serial
 						_serialPort.ChangeRS485DriverStateFlags(flags);
 					}
 
-					using var connectTask = Task.Run(_serialPort.Open);
+					using var connectTask = Task.Run(_serialPort.Open, cancellationToken);
 					if (await Task.WhenAny(connectTask, Task.Delay(ReadTimeout, cancellationToken)) == connectTask)
 					{
 						await connectTask;
@@ -379,7 +380,7 @@ namespace AMWD.Protocols.Modbus.Serial
 
 					try
 					{
-						await Task.Delay(TimeSpan.FromSeconds(delay), cancellationToken);
+						await Task.Delay(TimeSpan.FromSeconds(delay), cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					}
 					catch
 					{ /* keep it quiet */ }

AMWD.Protocols.Modbus.Tcp/Extensions/StreamExtensions.cs

@@ -12,7 +12,7 @@ namespace System.IO
 			int offset = 0;
 			do
 			{
-				int count = await stream.ReadAsync(buffer, offset, expectedBytes - offset, cancellationToken);
+				int count = await stream.ReadAsync(buffer, offset, expectedBytes - offset, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (count < 1)
 					throw new EndOfStreamException();
 
@@ -30,7 +30,7 @@ namespace System.IO
 			int offset = 0;
 			do
 			{
-				int count = await stream.ReadAsync(buffer, offset, expectedBytes - offset, cancellationToken);
+				int count = await stream.ReadAsync(buffer, offset, expectedBytes - offset, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (count < 1)
 					throw new EndOfStreamException();
 

AMWD.Protocols.Modbus.Tcp/Extensions/TaskExtensions.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace AMWD.Protocols.Modbus.Tcp.Extensions
+{
+	internal static class TaskExtensions
+	{
+		public static async void Forget(this Task task)
+		{
+			try
+			{
+				await task;
+			}
+			catch
+			{ /* keep it quiet */ }
+		}
+	}
+}

AMWD.Protocols.Modbus.Tcp/ModbusTcpConnection.cs

@@ -65,8 +65,12 @@ namespace AMWD.Protocols.Modbus.Tcp
 			get => _readTimeout;
 			set
 			{
+#if NET8_0_OR_GREATER
+				ArgumentOutOfRangeException.ThrowIfLessThan(value, TimeSpan.Zero);
+#else
 				if (value < TimeSpan.Zero)
 					throw new ArgumentOutOfRangeException(nameof(value));
+#endif
 
 				_readTimeout = value;
 
@@ -81,8 +85,12 @@ namespace AMWD.Protocols.Modbus.Tcp
 			get => _writeTimeout;
 			set
 			{
+#if NET8_0_OR_GREATER
+				ArgumentOutOfRangeException.ThrowIfLessThan(value, TimeSpan.Zero);
+#else
 				if (value < TimeSpan.Zero)
 					throw new ArgumentOutOfRangeException(nameof(value));
+#endif
 
 				_writeTimeout = value;
 
@@ -208,7 +216,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 				try
 				{
 					// Get next request to process
-					var item = await _requestQueue.DequeueAsync(cancellationToken);
+					var item = await _requestQueue.DequeueAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 					// Remove registration => already removed from queue
 					item.CancellationTokenRegistration.Dispose();
@@ -216,19 +224,19 @@ namespace AMWD.Protocols.Modbus.Tcp
 					// Build combined cancellation token
 					using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, item.CancellationTokenSource.Token);
 					// Wait for exclusive access
-					await _clientLock.WaitAsync(linkedCts.Token);
+					await _clientLock.WaitAsync(linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 					try
 					{
 						// Ensure connection is up
-						await AssertConnection(linkedCts.Token);
+						await AssertConnection(linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 
 						var stream = _tcpClient.GetStream();
 						await stream.FlushAsync(linkedCts.Token);
 
 #if NET6_0_OR_GREATER
-						await stream.WriteAsync(item.Request, linkedCts.Token);
+						await stream.WriteAsync(item.Request, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 #else
-						await stream.WriteAsync(item.Request, 0, item.Request.Length, linkedCts.Token);
+						await stream.WriteAsync(item.Request, 0, item.Request.Length, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 #endif
 
 						linkedCts.Token.ThrowIfCancellationRequested();
@@ -239,9 +247,9 @@ namespace AMWD.Protocols.Modbus.Tcp
 						do
 						{
 #if NET6_0_OR_GREATER
-							int readCount = await stream.ReadAsync(buffer, linkedCts.Token);
+							int readCount = await stream.ReadAsync(buffer, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 #else
-							int readCount = await stream.ReadAsync(buffer, 0, buffer.Length, linkedCts.Token);
+							int readCount = await stream.ReadAsync(buffer, 0, buffer.Length, linkedCts.Token).ConfigureAwait(continueOnCapturedContext: false);
 #endif
 							if (readCount < 1)
 								throw new EndOfStreamException();
@@ -332,7 +340,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 
 					try
 					{
-						await Task.Delay(TimeSpan.FromSeconds(delay), cancellationToken);
+						await Task.Delay(TimeSpan.FromSeconds(delay), cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					}
 					catch
 					{ /* keep it quiet */ }
@@ -376,10 +384,9 @@ namespace AMWD.Protocols.Modbus.Tcp
 
 			try
 			{
-				return Dns.GetHostAddresses(hostname)
+				return [.. Dns.GetHostAddresses(hostname)
 					.Where(a => a.AddressFamily == AddressFamily.InterNetwork || a.AddressFamily == AddressFamily.InterNetworkV6)
-					.OrderBy(a => a.AddressFamily) // prefer IPv4
-					.ToArray();
+					.OrderBy(a => a.AddressFamily)]; // prefer IPv4
 			}
 			catch
 			{

AMWD.Protocols.Modbus.Tcp/ModbusTcpProxy.cs

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using AMWD.Protocols.Modbus.Common;
 using AMWD.Protocols.Modbus.Common.Contracts;
 using AMWD.Protocols.Modbus.Common.Protocols;
+using AMWD.Protocols.Modbus.Tcp.Extensions;
 using AMWD.Protocols.Modbus.Tcp.Utils;
 
 namespace AMWD.Protocols.Modbus.Tcp
@@ -17,7 +18,12 @@ namespace AMWD.Protocols.Modbus.Tcp
 	/// <summary>
 	/// Implements a Modbus TCP server proxying all requests to a Modbus client of choice.
 	/// </summary>
-	public class ModbusTcpProxy : IModbusProxy
+	/// <remarks>
+	/// Initializes a new instance of the <see cref="ModbusTcpProxy"/> class.
+	/// </remarks>
+	/// <param name="client">The <see cref="ModbusClientBase"/> used to request the remote device, that should be proxied.</param>
+	/// <param name="listenAddress">An <see cref="IPAddress"/> to listen on.</param>
+	public class ModbusTcpProxy(ModbusClientBase client, IPAddress listenAddress) : IModbusProxy
 	{
 		#region Fields
 
@@ -25,30 +31,17 @@ namespace AMWD.Protocols.Modbus.Tcp
 
 		private TimeSpan _readWriteTimeout = TimeSpan.FromSeconds(100);
 
-		private TcpListenerWrapper _tcpListener;
+		private readonly TcpListenerWrapper _tcpListener = new(listenAddress, 502);
 		private CancellationTokenSource _stopCts;
 		private Task _clientConnectTask = Task.CompletedTask;
 
 		private readonly SemaphoreSlim _clientListLock = new(1, 1);
 		private readonly List<TcpClientWrapper> _clients = [];
-		private readonly List<Task> _clientTasks = [];
 
 		#endregion Fields
 
 		#region Constructors
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ModbusTcpProxy"/> class.
-		/// </summary>
-		/// <param name="client">The <see cref="ModbusClientBase"/> used to request the remote device, that should be proxied.</param>
-		/// <param name="listenAddress">An <see cref="IPAddress"/> to listen on.</param>
-		public ModbusTcpProxy(ModbusClientBase client, IPAddress listenAddress)
-		{
-			Client = client ?? throw new ArgumentNullException(nameof(client));
-
-			_tcpListener = new TcpListenerWrapper(listenAddress, 502);
-		}
-
 		#endregion Constructors
 
 		#region Properties
@@ -56,7 +49,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 		/// <summary>
 		/// Gets the Modbus client used to request the remote device, that should be proxied.
 		/// </summary>
-		public ModbusClientBase Client { get; }
+		public ModbusClientBase Client { get; } = client ?? throw new ArgumentNullException(nameof(client));
 
 		/// <summary>
 		/// Gets the <see cref="IPAddress"/> to listen on.
@@ -115,7 +108,10 @@ namespace AMWD.Protocols.Modbus.Tcp
 			_stopCts?.Dispose();
 			_stopCts = new CancellationTokenSource();
 
-			_tcpListener.Socket.DualMode = ListenAddress.AddressFamily == AddressFamily.InterNetworkV6;
+			// Only allowed to set, if the socket is in the InterNetworkV6 address family.
+			// See: https://learn.microsoft.com/en-us/dotnet/api/system.net.sockets.socket.dualmode?view=netstandard-2.0#exceptions
+			if (ListenAddress.AddressFamily == AddressFamily.InterNetworkV6)
+				_tcpListener.Socket.DualMode = true;
 
 			_tcpListener.Start();
 			_clientConnectTask = WaitForClientAsync(_stopCts.Token);
@@ -140,16 +136,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 
 			try
 			{
-				await Task.WhenAny(_clientConnectTask, Task.Delay(Timeout.Infinite, cancellationToken));
-			}
-			catch (OperationCanceledException)
-			{
-				// Terminated
-			}
-
-			try
-			{
-				await Task.WhenAny(Task.WhenAll(_clientTasks), Task.Delay(Timeout.Infinite, cancellationToken));
+				await Task.WhenAny(_clientConnectTask, Task.Delay(Timeout.Infinite, cancellationToken)).ConfigureAwait(continueOnCapturedContext: false);
 			}
 			catch (OperationCanceledException)
 			{
@@ -174,6 +161,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			_tcpListener.Dispose();
 
 			_stopCts?.Dispose();
+			GC.SuppressFinalize(this);
 		}
 
 		private void Assertions()
@@ -196,12 +184,13 @@ namespace AMWD.Protocols.Modbus.Tcp
 			{
 				try
 				{
-					var client = await _tcpListener.AcceptTcpClientAsync(cancellationToken);
-					await _clientListLock.WaitAsync(cancellationToken);
+					var client = await _tcpListener.AcceptTcpClientAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
+					await _clientListLock.WaitAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					try
 					{
 						_clients.Add(client);
-						_clientTasks.Add(HandleClientAsync(client, cancellationToken));
+						// Can be ignored as it will terminate by itself on cancellation
+						HandleClientAsync(client, cancellationToken).Forget();
 					}
 					finally
 					{
@@ -224,23 +213,32 @@ namespace AMWD.Protocols.Modbus.Tcp
 				{
 					var requestBytes = new List<byte>();
 
-					using (var cts = new CancellationTokenSource(ReadWriteTimeout))
-					using (cancellationToken.Register(cts.Cancel))
-					{
-						byte[] headerBytes = await stream.ReadExpectedBytesAsync(6, cts.Token);
+					// Waiting for next request
+					byte[] headerBytes = await stream.ReadExpectedBytesAsync(6, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					requestBytes.AddRange(headerBytes);
 
 					ushort length = headerBytes
 						.Skip(4).Take(2).ToArray()
 						.GetBigEndianUInt16();
 
-						byte[] bodyBytes = await stream.ReadExpectedBytesAsync(length, cts.Token);
+					// Waiting for the remaining required data
+					using (var cts = new CancellationTokenSource(ReadWriteTimeout))
+					using (cancellationToken.Register(cts.Cancel))
+					{
+						byte[] bodyBytes = await stream.ReadExpectedBytesAsync(length, cts.Token).ConfigureAwait(continueOnCapturedContext: false);
 						requestBytes.AddRange(bodyBytes);
 					}
 
-					byte[] responseBytes = await HandleRequestAsync([.. requestBytes], cancellationToken);
+					byte[] responseBytes = await HandleRequestAsync([.. requestBytes], cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 					if (responseBytes != null)
-						await stream.WriteAsync(responseBytes, 0, responseBytes.Length, cancellationToken);
+					{
+						// Write response when available
+						using (var cts = new CancellationTokenSource(ReadWriteTimeout))
+						using (cancellationToken.Register(cts.Cancel))
+						{
+							await stream.WriteAsync(responseBytes, 0, responseBytes.Length, cts.Token).ConfigureAwait(continueOnCapturedContext: false);
+						}
+					}
 				}
 			}
 			catch
@@ -249,7 +247,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			}
 			finally
 			{
-				await _clientListLock.WaitAsync(cancellationToken);
+				await _clientListLock.WaitAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				try
 				{
 					_clients.Remove(client);
@@ -324,7 +322,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			responseBytes.AddRange(requestBytes.Take(8));
 			try
 			{
-				var coils = await Client.ReadCoilsAsync(unitId, firstAddress, count, cancellationToken);
+				var coils = await Client.ReadCoilsAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[(int)Math.Ceiling(coils.Count / 8.0)];
 				for (int i = 0; i < coils.Count; i++)
@@ -363,7 +361,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			responseBytes.AddRange(requestBytes.Take(8));
 			try
 			{
-				var discreteInputs = await Client.ReadDiscreteInputsAsync(unitId, firstAddress, count, cancellationToken);
+				var discreteInputs = await Client.ReadDiscreteInputsAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[(int)Math.Ceiling(discreteInputs.Count / 8.0)];
 				for (int i = 0; i < discreteInputs.Count; i++)
@@ -402,7 +400,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			responseBytes.AddRange(requestBytes.Take(8));
 			try
 			{
-				var holdingRegisters = await Client.ReadHoldingRegistersAsync(unitId, firstAddress, count, cancellationToken);
+				var holdingRegisters = await Client.ReadHoldingRegistersAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[holdingRegisters.Count * 2];
 				for (int i = 0; i < holdingRegisters.Count; i++)
@@ -436,7 +434,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			responseBytes.AddRange(requestBytes.Take(8));
 			try
 			{
-				var inputRegisters = await Client.ReadInputRegistersAsync(unitId, firstAddress, count, cancellationToken);
+				var inputRegisters = await Client.ReadInputRegistersAsync(unitId, firstAddress, count, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				byte[] values = new byte[count * 2];
 				for (int i = 0; i < count; i++)
@@ -484,7 +482,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 					LowByte = requestBytes[11],
 				};
 
-				bool isSuccess = await Client.WriteSingleCoilAsync(requestBytes[6], coil, cancellationToken);
+				bool isSuccess = await Client.WriteSingleCoilAsync(requestBytes[6], coil, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -524,7 +522,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 					LowByte = requestBytes[11]
 				};
 
-				bool isSuccess = await Client.WriteSingleHoldingRegisterAsync(requestBytes[6], register, cancellationToken);
+				bool isSuccess = await Client.WriteSingleHoldingRegisterAsync(requestBytes[6], register, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -584,7 +582,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 					});
 				}
 
-				bool isSuccess = await Client.WriteMultipleCoilsAsync(requestBytes[6], coils, cancellationToken);
+				bool isSuccess = await Client.WriteMultipleCoilsAsync(requestBytes[6], coils, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -641,7 +639,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 					});
 				}
 
-				bool isSuccess = await Client.WriteMultipleHoldingRegistersAsync(requestBytes[6], list, cancellationToken);
+				bool isSuccess = await Client.WriteMultipleHoldingRegistersAsync(requestBytes[6], list, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 				if (isSuccess)
 				{
 					// Response is an echo of the request
@@ -698,7 +696,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 
 			try
 			{
-				var deviceInfo = await Client.ReadDeviceIdentificationAsync(requestBytes[6], category, firstObject, cancellationToken);
+				var deviceInfo = await Client.ReadDeviceIdentificationAsync(requestBytes[6], category, firstObject, cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
 
 				var bodyBytes = new List<byte>();
 
@@ -761,7 +759,7 @@ namespace AMWD.Protocols.Modbus.Tcp
 			}
 		}
 
-		private byte[] GetDeviceObject(byte objectId, DeviceIdentification deviceIdentification)
+		private static byte[] GetDeviceObject(byte objectId, DeviceIdentification deviceIdentification)
 		{
 			var result = new List<byte> { objectId };
 			switch ((ModbusDeviceIdentificationObject)objectId)
@@ -851,5 +849,18 @@ namespace AMWD.Protocols.Modbus.Tcp
 		}
 
 		#endregion Request Handling
+
+		/// <inheritdoc/>
+		public override string ToString()
+		{
+			var sb = new StringBuilder();
+
+			sb.AppendLine($"TCP Proxy");
+			sb.AppendLine($"  {nameof(ListenAddress)}:   {ListenAddress}");
+			sb.AppendLine($"  {nameof(ListenPort)}:      {ListenPort}");
+			sb.AppendLine($"  {nameof(Client)}:          {Client.GetType().Name}");
+
+			return sb.ToString();
+		}
 	}
 }

AMWD.Protocols.Modbus.Tcp/Utils/IPEndPointWrapper.cs

@@ -1,15 +1,13 @@
 using System.Net;
+using System.Net.Sockets;
 
 namespace AMWD.Protocols.Modbus.Tcp.Utils
 {
-	internal class IPEndPointWrapper
+	/// <inheritdoc cref="IPEndPoint" />
+	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+	internal class IPEndPointWrapper(EndPoint endPoint)
 	{
-		private IPEndPoint _ipEndPoint;
-
-		public IPEndPointWrapper(EndPoint endPoint)
-		{
-			_ipEndPoint = (IPEndPoint)endPoint;
-		}
+		private readonly IPEndPoint _ipEndPoint = (IPEndPoint)endPoint;
 
 		#region Properties
 

AMWD.Protocols.Modbus.Tcp/Utils/NetworkStreamWrapper.cs

@@ -8,14 +8,9 @@ namespace AMWD.Protocols.Modbus.Tcp.Utils
 {
 	/// <inheritdoc cref="NetworkStream" />
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-	internal class NetworkStreamWrapper : IDisposable
+	internal class NetworkStreamWrapper(NetworkStream stream) : IDisposable
 	{
-		private readonly NetworkStream _stream;
-
-		public NetworkStreamWrapper(NetworkStream stream)
-		{
-			_stream = stream;
-		}
+		private readonly NetworkStream _stream = stream;
 
 		/// <inheritdoc cref="NetworkStream.Dispose" />
 		public virtual void Dispose()

AMWD.Protocols.Modbus.Tcp/Utils/SocketWrapper.cs

@@ -3,14 +3,11 @@ using System.Net.Sockets;
 
 namespace AMWD.Protocols.Modbus.Tcp.Utils
 {
-	internal class SocketWrapper : IDisposable
+	/// <inheritdoc cref="Socket" />
+	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+	internal class SocketWrapper(Socket socket) : IDisposable
 	{
-		private Socket _socket;
-
-		public SocketWrapper(Socket socket)
-		{
-			_socket = socket;
-		}
+		private readonly Socket _socket = socket;
 
 		/// <inheritdoc  cref="Socket.DualMode" />
 		public virtual bool DualMode

AMWD.Protocols.Modbus.Tcp/Utils/TcpClientWrapperFactory.cs

@@ -3,6 +3,9 @@ using System.Net.Sockets;
 
 namespace AMWD.Protocols.Modbus.Tcp.Utils
 {
+	/// <summary>
+	/// Factory for creating <see cref="TcpClientWrapper"/> instances.
+	/// </summary>
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	internal class TcpClientWrapperFactory
 	{

AMWD.Protocols.Modbus.Tcp/Utils/TcpListenerWrapper.cs

@@ -6,22 +6,18 @@ using System.Threading.Tasks;
 
 namespace AMWD.Protocols.Modbus.Tcp.Utils
 {
+	/// <inheritdoc cref="TcpListener" />
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-	internal class TcpListenerWrapper : IDisposable
+	internal class TcpListenerWrapper(IPAddress localaddr, int port) : IDisposable
 	{
 		#region Fields
 
-		private TcpListener _tcpListener;
+		private readonly TcpListener _tcpListener = new(localaddr, port);
 
 		#endregion Fields
 
 		#region Constructor
 
-		public TcpListenerWrapper(IPAddress localaddr, int port)
-		{
-			_tcpListener = new TcpListener(localaddr, port);
-		}
-
 		#endregion Constructor
 
 		#region Properties

AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs

@@ -105,16 +105,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowExceptionOnNullConnection()
 		{
 			// Arrange
 			IModbusConnection connection = null;
 
-			// Act
-			new ModbusClientBaseWrapper(connection);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => new ModbusClientBaseWrapper(connection));
 		}
 
 		[DataTestMethod]
@@ -155,31 +152,25 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public async Task ShouldAssertDisposed()
 		{
 			// Arrange
 			var client = GetClient();
 			client.Dispose();
 
-			// Act
-			await client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
-
-			// Assert - ObjectDisposedException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ObjectDisposedException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldAssertProtocolSet()
 		{
 			// Arrange
 			var client = GetClient();
 			client.Protocol = null;
 
-			// Act
-			await client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT));
 		}
 
 		#endregion Common/Connection/Assertions

AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs

@@ -41,20 +41,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetSingle()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetSingle(0);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetSingle(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetSingleForLength()
 		{
 			// Arrange
@@ -63,16 +59,13 @@
 				new() { Address = 101, HighByte = 0x01, LowByte = 0x02 }
 			};
 
-			// Act
-			registers.GetSingle(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetSingle(0));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetSingle(int startIndex)
 		{
 			// Arrange
@@ -82,14 +75,11 @@
 				new() { Address = 100, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetSingle(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetSingle(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetSingleForType()
 		{
 			// Arrange
@@ -99,10 +89,8 @@
 				new InputRegister { Address = 101, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetSingle(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetSingle(0));
 		}
 
 		[TestMethod]
@@ -145,20 +133,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetDouble()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetDouble(0);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetDouble(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetDoubleForLength()
 		{
 			// Arrange
@@ -169,16 +153,13 @@
 				new() { Address = 102, HighByte = 0x7A, LowByte = 0xE1 }
 			};
 
-			// Act
-			registers.GetDouble(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetDouble(0));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetDouble(int startIndex)
 		{
 			// Arrange
@@ -190,14 +171,11 @@
 				new() { Address = 103, HighByte = 0x47, LowByte = 0xAE }
 			};
 
-			// Act
-			registers.GetDouble(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetDouble(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetDoubleForType()
 		{
 			// Arrange
@@ -209,10 +187,8 @@
 				new InputRegister { Address = 103, HighByte = 0x47, LowByte = 0xAE }
 			};
 
-			// Act
-			registers.GetDouble(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetDouble(0));
 		}
 
 		#endregion Modbus to value

AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusExtensionsTest.cs

@@ -30,16 +30,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetBoolean()
 		{
 			// Arrange
 			Coil coil = null;
 
-			// Act
-			coil.GetBoolean();
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => coil.GetBoolean());
 		}
 
 		[TestMethod]
@@ -95,35 +92,28 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnString()
 		{
 			// Arrange
 			HoldingRegister[] list = null;
 
-			// Act
-			list.GetString(2);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => list.GetString(2));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnStringForEmptyList()
 		{
 			// Arrange
 			var registers = Array.Empty<HoldingRegister>();
 
-			// Act
-			registers.GetString(2);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetString(2));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnString(int startIndex)
 		{
 			// Arrange
@@ -133,14 +123,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
 				new() { Address = 2, HighByte = 67, LowByte = 0 }
 			};
 
-			// Act
-			registers.GetString(2, startIndex);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetString(2, startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnStringForMixedTypes()
 		{
 			// Arrange
@@ -150,10 +137,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
 				new InputRegister { Address = 2, HighByte = 67, LowByte = 0 }
 			};
 
-			// Act
-			registers.GetString(2);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetString(2));
 		}
 
 		#endregion Modbus to value
@@ -272,16 +257,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetString()
 		{
 			// Arrange
 			string str = null;
 
-			// Act
-			_ = str.ToRegisters(100).ToArray();
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => str.ToRegisters(100).ToArray());
 		}
 
 		#endregion Value to Modbus

AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusSignedExtensionsTest.cs

@@ -32,31 +32,23 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullForGetSByte()
 		{
 			// Arrange
 			HoldingRegister register = null;
 
-			// Act
-			register.GetSByte();
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => register.GetSByte());
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentForGetSByte()
 		{
 			// Arrange
 			var obj = new Coil();
 
-			// Act
-			obj.GetSByte();
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => obj.GetSByte());
 		}
 
 		[TestMethod]
@@ -86,31 +78,23 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullForGetInt16()
 		{
 			// Arrange
 			HoldingRegister register = null;
 
-			// Act
-			register.GetInt16();
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => register.GetInt16());
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentForGetInt16()
 		{
 			// Arrange
 			var obj = new Coil();
 
-			// Act
-			obj.GetInt16();
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => obj.GetInt16());
 		}
 
 		[TestMethod]
@@ -149,21 +133,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetInt32()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetInt32(0);
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetInt32(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetInt32ForLength()
 		{
 			// Arrange
@@ -172,17 +151,13 @@
 				new HoldingRegister { Address = 101, HighByte = 0x01, LowByte = 0x02 }
 			};
 
-			// Act
-			registers.GetInt32(0);
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetInt32(0));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetInt32(int startIndex)
 		{
 			// Arrange
@@ -192,15 +167,11 @@
 				new HoldingRegister { Address = 100, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetInt32(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetInt32(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetInt32ForType()
 		{
 			// Arrange
@@ -210,11 +181,8 @@
 				new InputRegister { Address = 101, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetInt32(0);
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetInt32(0));
 		}
 
 		[TestMethod]
@@ -257,21 +225,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetInt64()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetInt64(0);
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetInt64(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetInt64ForLength()
 		{
 			// Arrange
@@ -282,17 +245,13 @@
 				new HoldingRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetInt64(0);
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetInt64(0));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetInt64(int startIndex)
 		{
 			// Arrange
@@ -304,15 +263,11 @@
 				new HoldingRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetInt64(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetInt64(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetInt64ForType()
 		{
 			// Arrange
@@ -324,11 +279,8 @@
 				new InputRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetInt64(0);
-
-			// Assert - ArgumentException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetInt64(0));
 		}
 
 		#endregion Modbus to value

AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusUnsignedExtensionsTest.cs

@@ -32,29 +32,23 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullForGetByte()
 		{
 			// Arrange
 			HoldingRegister register = null;
 
-			// Act
-			register.GetByte();
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => register.GetByte());
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentForGetByte()
 		{
 			// Arrange
 			var obj = new Coil();
 
-			// Act
-			obj.GetByte();
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => obj.GetByte());
 		}
 
 		[TestMethod]
@@ -84,29 +78,23 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullForGetUInt16()
 		{
 			// Arrange
 			HoldingRegister register = null;
 
-			// Act
-			register.GetUInt16();
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => register.GetUInt16());
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentForGetUInt16()
 		{
 			// Arrange
 			var obj = new Coil();
 
-			// Act
-			obj.GetUInt16();
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => obj.GetUInt16());
 		}
 
 		[TestMethod]
@@ -145,21 +133,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetUInt32()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetUInt32(0);
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetUInt32(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetUInt32ForLength()
 		{
 			// Arrange
@@ -168,16 +151,13 @@
 				new() { Address = 101, HighByte = 0x01, LowByte = 0x02 }
 			};
 
-			// Act
-			registers.GetUInt32(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetUInt32(1));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetUInt32(int startIndex)
 		{
 			// Arrange
@@ -187,14 +167,11 @@
 				new() { Address = 100, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetUInt32(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetUInt32(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetUInt32ForType()
 		{
 			// Arrange
@@ -204,10 +181,8 @@
 				new InputRegister { Address = 101, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetUInt32(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetUInt32(0));
 		}
 
 		[TestMethod]
@@ -250,21 +225,16 @@
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowNullOnGetUInt64()
 		{
 			// Arrange
 			HoldingRegister[] registers = null;
 
-			// Act
-			registers.GetUInt64(0);
-
-			// Assert - ArgumentNullException
-			Assert.Fail();
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => registers.GetUInt64(0));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetUInt64ForLength()
 		{
 			// Arrange
@@ -275,16 +245,13 @@
 				new() { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetUInt64(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetUInt64(0));
 		}
 
 		[DataTestMethod]
 		[DataRow(1)]
 		[DataRow(-1)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeOnGetUInt64(int startIndex)
 		{
 			// Arrange
@@ -296,14 +263,11 @@
 				new() { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetUInt64(startIndex);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => registers.GetUInt64(startIndex));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentOnGetUInt64ForType()
 		{
 			// Arrange
@@ -315,10 +279,8 @@
 				new InputRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
 			};
 
-			// Act
-			registers.GetUInt64(0);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => registers.GetUInt64(0));
 		}
 
 		#endregion Modbus to value

AMWD.Protocols.Modbus.Tests/Common/Protocols/AsciiProtocolTest.cs

@@ -32,29 +32,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadCoils(int count)
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadCoils()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -88,7 +82,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadCoils()
 		{
 			// Arrange
@@ -98,10 +91,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			_ = protocol.DeserializeReadCoils(responseBytes);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadCoils(responseBytes));
 		}
 
 		#endregion Read Coils
@@ -129,29 +120,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadDiscreteInputs(int count)
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -185,7 +170,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDiscreteInputs()
 		{
 			// Arrange
@@ -195,10 +179,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.DeserializeReadDiscreteInputs(responseBytes);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDiscreteInputs(responseBytes));
 		}
 
 		#endregion Read Discrete Inputs
@@ -226,29 +208,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadHoldingRegisters(int count)
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -276,7 +252,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadHoldingRegisters()
 		{
 			// Arrange
@@ -286,10 +261,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.DeserializeReadHoldingRegisters(responseBytes);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadHoldingRegisters(responseBytes));
 		}
 
 		#endregion Read Holding Registers
@@ -317,29 +290,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadInputRegisters(int count)
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -367,7 +334,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadInputRegisters()
 		{
 			// Arrange
@@ -377,10 +343,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.DeserializeReadInputRegisters(responseBytes);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadInputRegisters(responseBytes));
 		}
 
 		#endregion Read Input Registers
@@ -410,16 +374,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeExceptionForCategoryOnSerializeReadDeviceIdentification()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode));
 		}
 
 		[DataTestMethod]
@@ -449,7 +410,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForMeiType()
 		{
 			// Arrange
@@ -459,12 +419,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(responseBytes);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(responseBytes));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForCategory()
 		{
 			// Arrange
@@ -474,8 +433,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(responseBytes);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(responseBytes));
 		}
 
 		#endregion Read Device Identification
@@ -502,16 +461,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleCoil()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleCoil(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleCoil(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -557,16 +513,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleHoldingRegister()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -619,22 +572,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleCoils()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(1969)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleCoils(int count)
 		{
 			// Arrange
@@ -644,14 +593,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -662,14 +608,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -680,10 +623,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
@@ -732,22 +673,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(124)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleHoldingRegisters(int count)
 		{
 			// Arrange
@@ -757,14 +694,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -775,14 +709,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -793,10 +724,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
@@ -898,7 +827,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForMissingHeaderOnValidateResponse()
 		{
 			// Arrange
@@ -907,12 +835,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForMissingTrailerOnValidateResponse()
 		{
 			// Arrange
@@ -920,12 +847,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			string response = $":{UNIT_ID:X2}010100";
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForUnitIdOnValidateResponse()
 		{
 			// Arrange
@@ -934,12 +860,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForLrcOnValidateResponse()
 		{
 			// Arrange
@@ -947,12 +872,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			string response = $":{UNIT_ID:X2}010001FF00XX\r\n";
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFunctionCodeOnValidateResponse()
 		{
 			// Arrange
@@ -961,12 +885,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForErrorOnValidateResponse()
 		{
 			// Arrange
@@ -975,8 +898,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[DataTestMethod]
@@ -984,7 +907,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataRow(0x02)]
 		[DataRow(0x03)]
 		[DataRow(0x04)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForReadLengthOnValidateResponse(int fn)
 		{
 			// Arrange
@@ -993,8 +915,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[DataTestMethod]
@@ -1002,7 +924,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataRow(0x06)]
 		[DataRow(0x0F)]
 		[DataRow(0x10)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForWriteLengthOnValidateResponse(int fn)
 		{
 			// Arrange
@@ -1011,8 +932,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			AddTrailer(ref response);
 			var protocol = new AsciiProtocol();
 
-			// Act
-			protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response));
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(Encoding.ASCII.GetBytes(request), Encoding.ASCII.GetBytes(response)));
 		}
 
 		[TestMethod]
@@ -1033,58 +954,46 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataRow("")]
 		[DataRow("     ")]
 		[DataRow("\t")]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionForMessageOnLrc(string msg)
 		{
 			// Arrange
 
-			// Act
-			AsciiProtocol.LRC(msg);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => AsciiProtocol.LRC(msg));
 		}
 
 		[DataTestMethod]
 		[DataRow(-1)]
 		[DataRow(4)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeExceptionForStartOnLrc(int start)
 		{
 			// Arrange
 			string msg = "0207";
 
-			// Act
-			AsciiProtocol.LRC(msg, start);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => AsciiProtocol.LRC(msg, start));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(5)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeExceptionForLengthOnLrc(int length)
 		{
 			// Arrange
 			string msg = "0207";
 
-			// Act
-			AsciiProtocol.LRC(msg, 0, length);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => AsciiProtocol.LRC(msg, 0, length));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForMessageLengthOnLrc()
 		{
 			// Arrange
 			string msg = "0207";
 
-			// Act
-			AsciiProtocol.LRC(msg);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => AsciiProtocol.LRC(msg));
 		}
 
 		#endregion Validation

AMWD.Protocols.Modbus.Tests/Common/Protocols/RtuOverTcpProtocolTest.cs

@@ -55,29 +55,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadCoils(int count)
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadCoils()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -106,16 +100,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadCoils()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadCoils([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x01, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadCoils([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x01, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]));
 		}
 
 		#endregion Read Coils
@@ -166,29 +157,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadDiscreteInputs(int count)
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -217,16 +202,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDiscreteInputs([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x02, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDiscreteInputs([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x02, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]));
 		}
 
 		#endregion Read Discrete Inputs
@@ -277,29 +259,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadHoldingRegisters(int count)
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -323,16 +299,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadHoldingRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x07, UNIT_ID, 0x03, 0x04, 0x02, 0x2B, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadHoldingRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x03, 0x04, 0x02, 0x2B, 0x00, 0x00]));
 		}
 
 		#endregion Read Holding Registers
@@ -383,29 +356,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadInputRegisters(int count)
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -429,16 +396,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadInputRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x07, UNIT_ID, 0x04, 0x04, 0x02, 0x2B, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadInputRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x08, UNIT_ID, 0x04, 0x04, 0x02, 0x2B, 0x00, 0x00]));
 		}
 
 		#endregion Read Input Registers
@@ -493,16 +457,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeExceptionForCategoryOnSerializeReadDeviceIdentification()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode));
 		}
 
 		[DataTestMethod]
@@ -529,27 +490,25 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForMeiType()
 		{
 			// Arrange
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x05, UNIT_ID, 0x2B, 0x0D, 0x00, 0x00];
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForCategory()
 		{
 			// Arrange
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x06, UNIT_ID, 0x2B, 0x0E, 0x08, 0x00, 0x00];
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		#endregion Read Device Identification
@@ -600,16 +559,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleCoil()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleCoil(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleCoil(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -676,16 +632,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleHoldingRegister()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -765,22 +718,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleCoils()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(1969)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleCoils(int count)
 		{
 			// Arrange
@@ -790,14 +739,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -808,14 +754,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -826,10 +769,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
@@ -908,22 +849,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(124)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleHoldingRegisters(int count)
 		{
 			// Arrange
@@ -933,14 +870,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -951,14 +885,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -969,10 +900,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
@@ -1065,7 +994,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0x00, 0x00)]
 		[DataRow(0x01, 0x01)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForTransactionIdOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1074,14 +1002,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
 		[DataRow(0x00, 0x01)]
 		[DataRow(0x01, 0x00)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForProtocolIdOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1090,12 +1017,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFollowingBytesOnValidateResponse()
 		{
 			// Arrange
@@ -1104,12 +1030,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForUnitIdOnValidateResponse()
 		{
 			// Arrange
@@ -1118,12 +1043,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFunctionCodeOnValidateResponse()
 		{
 			// Arrange
@@ -1132,12 +1056,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForModbusErrorOnValidateResponse()
 		{
 			// Arrange
@@ -1146,14 +1069,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
 		[DataRow(0x59, 0x6C)]
 		[DataRow(0x58, 0x6B)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForCrcOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1161,8 +1083,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x06, UNIT_ID, 0x01, 0x01, 0x00, (byte)hi, (byte)lo];
 			var protocol = new RtuOverTcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		#endregion Validation

AMWD.Protocols.Modbus.Tests/Common/Protocols/RtuProtocolTest.cs

@@ -43,29 +43,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadCoils(int count)
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadCoils()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -94,16 +88,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadCoils()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			_ = protocol.DeserializeReadCoils([UNIT_ID, 0x01, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadCoils([UNIT_ID, 0x01, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]));
 		}
 
 		#endregion Read Coils
@@ -142,29 +133,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadDiscreteInputs(int count)
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -193,16 +178,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			_ = protocol.DeserializeReadDiscreteInputs([UNIT_ID, 0x02, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDiscreteInputs([UNIT_ID, 0x02, 0x02, 0xCD, 0x6B, 0x05, 0x00, 0x00]));
 		}
 
 		#endregion Read Discrete Inputs
@@ -241,29 +223,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadHoldingRegisters(int count)
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -287,16 +263,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.DeserializeReadHoldingRegisters([UNIT_ID, 0x03, 0x04, 0x02, 0x2B, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadHoldingRegisters([UNIT_ID, 0x03, 0x04, 0x02, 0x2B, 0x00, 0x00]));
 		}
 
 		#endregion Read Holding Registers
@@ -335,29 +308,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadInputRegisters(int count)
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -381,16 +348,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.DeserializeReadInputRegisters([UNIT_ID, 0x04, 0x04, 0x02, 0x2B, 0x00, 0x00]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadInputRegisters([UNIT_ID, 0x04, 0x04, 0x02, 0x2B, 0x00, 0x00]));
 		}
 
 		#endregion Read Input Registers
@@ -433,16 +397,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeExceptionForCategoryOnSerializeReadDeviceIdentification()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode));
 		}
 
 		[DataTestMethod]
@@ -469,27 +430,25 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForMeiType()
 		{
 			// Arrange
 			byte[] response = [UNIT_ID, 0x2B, 0x0D, 0x00, 0x00];
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForCategory()
 		{
 			// Arrange
 			byte[] response = [UNIT_ID, 0x2B, 0x0E, 0x08, 0x00, 0x00];
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		#endregion Read Device Identification
@@ -528,16 +487,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleCoil()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleCoil(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleCoil(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -592,16 +548,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleHoldingRegister()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -669,22 +622,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleCoils()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(1969)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleCoils(int count)
 		{
 			// Arrange
@@ -694,14 +643,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -712,14 +658,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -730,10 +673,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
@@ -800,22 +741,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(124)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleHoldingRegisters(int count)
 		{
 			// Arrange
@@ -825,14 +762,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -843,14 +777,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -861,10 +792,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
@@ -1105,7 +1034,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForUnitIdOnValidateResponse()
 		{
 			// Arrange
@@ -1114,14 +1042,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
 		[DataRow(0x57, 0x6C)]
 		[DataRow(0x58, 0x6B)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForCrcOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1129,12 +1056,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [UNIT_ID, 0x01, 0x01, 0x00, (byte)hi, (byte)lo];
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFunctionCodeOnValidateResponse()
 		{
 			// Arrange
@@ -1143,12 +1069,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForErrorOnValidateResponse()
 		{
 			// Arrange
@@ -1157,8 +1082,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
@@ -1166,7 +1091,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataRow(0x02)]
 		[DataRow(0x03)]
 		[DataRow(0x04)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForReadLengthOnValidateResponse(int fn)
 		{
 			// Arrange
@@ -1175,8 +1099,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
@@ -1184,7 +1108,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataRow(0x06)]
 		[DataRow(0x0F)]
 		[DataRow(0x10)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForWriteLengthOnValidateResponse(int fn)
 		{
 			// Arrange
@@ -1193,8 +1116,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			SetCrc(response);
 			var protocol = new RtuProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
@@ -1217,43 +1140,36 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(null)]
 		[DataRow(new byte[0])]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShuldThrowArgumentNullExceptionForBytesOnCrc16(byte[] bytes)
 		{
-			// Act
-			_ = RtuProtocol.CRC16(bytes);
+			// Arrange
 
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => RtuProtocol.CRC16(bytes));
 		}
 
 		[DataTestMethod]
 		[DataRow(-1)]
 		[DataRow(10)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeForStartOnCrc16(int start)
 		{
 			// Arrange
 			byte[] bytes = Encoding.UTF8.GetBytes("0123456789");
 
-			// Act
-			_ = RtuProtocol.CRC16(bytes, start);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => RtuProtocol.CRC16(bytes, start));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(11)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeForLengthOnCrc16(int length)
 		{
 			// Arrange
 			byte[] bytes = Encoding.UTF8.GetBytes("0123456789");
 
-			// Act
-			_ = RtuProtocol.CRC16(bytes, 0, length);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => RtuProtocol.CRC16(bytes, 0, length));
 		}
 
 		#endregion Validation

AMWD.Protocols.Modbus.Tests/Common/Protocols/TcpProtocolTest.cs

@@ -53,29 +53,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadCoils(int count)
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadCoils()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadCoils(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -104,16 +98,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadCoils()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			var coils = protocol.DeserializeReadCoils([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x01, 0x02, 0xCD, 0x6B, 0x05]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadCoils([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x01, 0x02, 0xCD, 0x6B, 0x05]));
 		}
 
 		#endregion Read Coils
@@ -162,29 +153,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(2001)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadDiscreteInputs(int count)
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDiscreteInputs(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -213,16 +198,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDiscreteInputs()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDiscreteInputs([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x02, 0x03, 0xCD, 0x6B]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDiscreteInputs([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x02, 0x03, 0xCD, 0x6B]));
 		}
 
 		#endregion Read Discrete Inputs
@@ -271,29 +253,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadHoldingRegisters(int count)
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadHoldingRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -317,16 +293,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.DeserializeReadHoldingRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x03, 0x04, 0x02, 0x2B]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadHoldingRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x03, 0x04, 0x02, 0x2B]));
 		}
 
 		#endregion Read Holding Registers
@@ -375,29 +348,23 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(126)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeReadInputRegisters(int count)
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, 19, (ushort)count));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForStartingAddressOnSerializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadInputRegisters(UNIT_ID, ushort.MaxValue, 2));
 		}
 
 		[TestMethod]
@@ -421,16 +388,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadInputRegisters()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.DeserializeReadInputRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x04, 0x04, 0x02, 0x2B]);
-
-			// Assert - ModbusException
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadInputRegisters([0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x2A, 0x04, 0x04, 0x02, 0x2B]));
 		}
 
 		#endregion Read Input Registers
@@ -483,16 +447,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeExceptionOnSerializeReadDeviceIdentification()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeReadDeviceIdentification(UNIT_ID, (ModbusDeviceIdentificationCategory)10, ModbusDeviceIdentificationObject.ProductCode));
 		}
 
 		[DataTestMethod]
@@ -519,27 +480,25 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForMeiType()
 		{
 			// Arrange
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0x2A, 0x2B, 0x0D];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowExceptionOnDeserializeReadDeviceIdentificationForCategory()
 		{
 			// Arrange
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0x2A, 0x2B, 0x0E, 0x08];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.DeserializeReadDeviceIdentification(response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.DeserializeReadDeviceIdentification(response));
 		}
 
 		#endregion Read Device Identification
@@ -588,16 +547,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleCoil()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleCoil(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleCoil(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -662,16 +618,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteSingleHoldingRegister()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteSingleHoldingRegister(UNIT_ID, null));
 		}
 
 		[TestMethod]
@@ -749,22 +702,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleCoils()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(1969)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleCoils(int count)
 		{
 			// Arrange
@@ -774,14 +723,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -792,14 +738,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleCoils()
 		{
 			// Arrange
@@ -810,10 +753,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleCoils(UNIT_ID, coils);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleCoils(UNIT_ID, coils));
 		}
 
 		[TestMethod]
@@ -890,22 +831,18 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullOnSerializeWriteMultipleHoldingRegisters()
 		{
 			// Arrange
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(124)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowOutOfRangeForCountOnSerializeWriteMultipleHoldingRegisters(int count)
 		{
 			// Arrange
@@ -915,14 +852,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForDuplicateEntryOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -933,14 +867,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentException))]
 		public void ShouldThrowArgumentExceptionForGapInAddressOnSerializeMultipleHoldingRegisters()
 		{
 			// Arrange
@@ -951,10 +882,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			};
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers);
-
-			// Assert - ArgumentException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentException>(() => protocol.SerializeWriteMultipleHoldingRegisters(UNIT_ID, registers));
 		}
 
 		[TestMethod]
@@ -1045,7 +974,6 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 		[DataTestMethod]
 		[DataRow(0x00, 0x00)]
 		[DataRow(0x01, 0x01)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForTransactionIdOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1053,14 +981,13 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x2A, 0x01, 0x01, 0x00];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[DataTestMethod]
 		[DataRow(0x00, 0x01)]
 		[DataRow(0x01, 0x00)]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForProtocolIdOnValidateResponse(int hi, int lo)
 		{
 			// Arrange
@@ -1068,12 +995,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x2A, 0x01, 0x01, 0x00];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFollowingBytesOnValidateResponse()
 		{
 			// Arrange
@@ -1081,12 +1007,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x2A, 0x01, 0x01, 0x00];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForUnitIdOnValidateResponse()
 		{
 			// Arrange
@@ -1094,12 +1019,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x2B, 0x01, 0x01, 0x00];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForFunctionCodeOnValidateResponse()
 		{
 			// Arrange
@@ -1107,12 +1031,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x2A, 0x02, 0x01, 0x00];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ModbusException))]
 		public void ShouldThrowForModbusErrorOnValidateResponse()
 		{
 			// Arrange
@@ -1120,8 +1043,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
 			byte[] response = [0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x2A, 0x81, 0x01];
 			var protocol = new TcpProtocol();
 
-			// Act
-			protocol.ValidateResponse(request, response);
+			// Act + Assert
+			Assert.ThrowsException<ModbusException>(() => protocol.ValidateResponse(request, response));
 		}
 
 		#endregion Validation

AMWD.Protocols.Modbus.Tests/Serial/ModbusRtuProxyTest.cs

@@ -144,49 +144,40 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionOnCreateInstanceForClient()
 		{
 			// Arrange
 
-			// Act
-			new ModbusRtuProxy(null, "some-port");
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => new ModbusRtuProxy(null, "some-port"));
 		}
 
 		[DataTestMethod]
 		[DataRow(null)]
 		[DataRow("")]
 		[DataRow("  ")]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionOnCreateInstanceForPortName(string portName)
 		{
 			// Arrange
 			var connection = new Mock<IModbusConnection>();
 			var clientMock = new Mock<ModbusClientBase>(connection.Object);
 
-			// Act
-			new ModbusRtuProxy(clientMock.Object, portName);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => new ModbusRtuProxy(clientMock.Object, portName));
 		}
 
 		[DataTestMethod]
 		[DataRow(null)]
 		[DataRow("")]
 		[DataRow("  ")]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldThrowArgumentNullExceptionOnMissingPortName(string portName)
 		{
 			// Arrange
 			using var proxy = GetProxy();
 			_serialPortMock.Setup(m => m.PortName).Returns(portName);
 
-			// Act
-			await proxy.StartAsync();
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => proxy.StartAsync());
 		}
 
 		[TestMethod]

AMWD.Protocols.Modbus.Tests/Serial/ModbusSerialConnectionTest.cs

@@ -94,58 +94,46 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 		[DataRow(null)]
 		[DataRow("")]
 		[DataRow("  ")]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionOnCreate(string portName)
 		{
 			// Arrange
 
-			// Act
-			using var test = new ModbusSerialClient(portName);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => new ModbusSerialClient(portName));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public async Task ShouldThrowDisposedExceptionOnInvokeAsync()
 		{
 			// Arrange
 			var connection = GetConnection();
 			connection.Dispose();
 
-			// Act
-			await connection.InvokeAsync(null, null);
-
-			// Assert - OjbectDisposedException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ObjectDisposedException>(() => connection.InvokeAsync(null, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(null)]
 		[DataRow(new byte[0])]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldThrowArgumentNullExceptionForMissingRequestOnInvokeAsync(byte[] request)
 		{
 			// Arrange
 			var connection = GetConnection();
 
-			// Act
-			await connection.InvokeAsync(request, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => connection.InvokeAsync(request, null));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldThrowArgumentNullExceptionForMissingValidationOnInvokeAsync()
 		{
 			// Arrange
 			byte[] request = new byte[1];
 			var connection = GetConnection();
 
-			// Act
-			await connection.InvokeAsync(request, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => connection.InvokeAsync(request, null));
 		}
 
 		[TestMethod]
@@ -176,10 +164,8 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			_serialPortMock.VerifyNoOtherCalls();
 		}
 
-		[DataTestMethod]
-		[DataRow(false)]
-		[DataRow(true)]
-		public async Task ShouldOpenAndCloseOnInvokeAsync(bool modifyDriver)
+		[TestMethod]
+		public async Task ShouldOpenAndCloseOnInvokeAsyncOnLinuxNotModifyingDriver()
 		{
 			// Arrange
 			_alwaysOpen = false;
@@ -193,8 +179,9 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			_serialLineResponseQueue.Enqueue(expectedResponse);
 
 			var connection = GetSerialConnection();
+			connection.GetType().GetField("_isLinux", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(connection, true);
 			connection.IdleTimeout = TimeSpan.FromMilliseconds(200);
-			connection.DriverEnabledRS485 = modifyDriver;
+			connection.DriverEnabledRS485 = false;
 
 			// Act
 			var response = await connection.InvokeAsync(request, validation);
@@ -213,11 +200,50 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			_serialPortMock.Verify(c => c.ResetRS485DriverStateFlags(), Times.Exactly(2));
 			_serialPortMock.Verify(c => c.Open(), Times.Once);
 
-			if (modifyDriver)
+			_serialPortMock.Verify(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()), Times.Once);
+			_serialPortMock.Verify(ns => ns.ReadAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Once);
+
+			_serialPortMock.VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public async Task ShouldOpenAndCloseOnInvokeAsyncOnLinuxModifyingDriver()
 		{
+			// Arrange
+			_alwaysOpen = false;
+			_isOpenQueue.Enqueue(false);
+			_isOpenQueue.Enqueue(true);
+			_isOpenQueue.Enqueue(true);
+
+			byte[] request = [1, 2, 3];
+			byte[] expectedResponse = [9, 8, 7];
+			var validation = new Func<IReadOnlyList<byte>, bool>(_ => true);
+			_serialLineResponseQueue.Enqueue(expectedResponse);
+
+			var connection = GetSerialConnection();
+			connection.GetType().GetField("_isLinux", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(connection, true);
+			connection.IdleTimeout = TimeSpan.FromMilliseconds(200);
+			connection.DriverEnabledRS485 = true;
+
+			// Act
+			var response = await connection.InvokeAsync(request, validation);
+			await Task.Delay(500);
+
+			// Assert
+			Assert.IsNotNull(response);
+
+			CollectionAssert.AreEqual(expectedResponse, response.ToArray());
+			CollectionAssert.AreEqual(request, _serialLineRequestCallbacks.First());
+
+			_serialPortMock.VerifyGet(c => c.ReadTimeout, Times.Once);
+
+			_serialPortMock.Verify(c => c.IsOpen, Times.Exactly(3));
+			_serialPortMock.Verify(c => c.Close(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.ResetRS485DriverStateFlags(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.Open(), Times.Once);
+
 			_serialPortMock.Verify(c => c.GetRS485DriverStateFlags(), Times.Once);
 			_serialPortMock.Verify(c => c.ChangeRS485DriverStateFlags(It.IsAny<RS485Flags>()), Times.Once);
-			}
 
 			_serialPortMock.Verify(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()), Times.Once);
 			_serialPortMock.Verify(ns => ns.ReadAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Once);
@@ -226,7 +252,90 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(EndOfStreamException))]
+		public async Task ShouldOpenAndCloseOnInvokeAsyncOnOtherOsNotModifyingDriver()
+		{
+			// Arrange
+			_alwaysOpen = false;
+			_isOpenQueue.Enqueue(false);
+			_isOpenQueue.Enqueue(true);
+			_isOpenQueue.Enqueue(true);
+
+			byte[] request = [1, 2, 3];
+			byte[] expectedResponse = [9, 8, 7];
+			var validation = new Func<IReadOnlyList<byte>, bool>(_ => true);
+			_serialLineResponseQueue.Enqueue(expectedResponse);
+
+			var connection = GetSerialConnection();
+			connection.GetType().GetField("_isLinux", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(connection, false);
+			connection.IdleTimeout = TimeSpan.FromMilliseconds(200);
+			connection.DriverEnabledRS485 = false;
+
+			// Act
+			var response = await connection.InvokeAsync(request, validation);
+			await Task.Delay(500);
+
+			// Assert
+			Assert.IsNotNull(response);
+
+			CollectionAssert.AreEqual(expectedResponse, response.ToArray());
+			CollectionAssert.AreEqual(request, _serialLineRequestCallbacks.First());
+
+			_serialPortMock.VerifyGet(c => c.ReadTimeout, Times.Once);
+
+			_serialPortMock.Verify(c => c.IsOpen, Times.Exactly(3));
+			_serialPortMock.Verify(c => c.Close(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.ResetRS485DriverStateFlags(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.Open(), Times.Once);
+
+			_serialPortMock.Verify(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()), Times.Once);
+			_serialPortMock.Verify(ns => ns.ReadAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Once);
+
+			_serialPortMock.VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public async Task ShouldOpenAndCloseOnInvokeAsyncOnOtherOsModifyingDriver()
+		{
+			// Arrange
+			_alwaysOpen = false;
+			_isOpenQueue.Enqueue(false);
+			_isOpenQueue.Enqueue(true);
+			_isOpenQueue.Enqueue(true);
+
+			byte[] request = [1, 2, 3];
+			byte[] expectedResponse = [9, 8, 7];
+			var validation = new Func<IReadOnlyList<byte>, bool>(_ => true);
+			_serialLineResponseQueue.Enqueue(expectedResponse);
+
+			var connection = GetSerialConnection();
+			connection.GetType().GetField("_isLinux", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(connection, false);
+			connection.IdleTimeout = TimeSpan.FromMilliseconds(200);
+			connection.DriverEnabledRS485 = true;
+
+			// Act
+			var response = await connection.InvokeAsync(request, validation);
+			await Task.Delay(500);
+
+			// Assert
+			Assert.IsNotNull(response);
+
+			CollectionAssert.AreEqual(expectedResponse, response.ToArray());
+			CollectionAssert.AreEqual(request, _serialLineRequestCallbacks.First());
+
+			_serialPortMock.VerifyGet(c => c.ReadTimeout, Times.Once);
+
+			_serialPortMock.Verify(c => c.IsOpen, Times.Exactly(3));
+			_serialPortMock.Verify(c => c.Close(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.ResetRS485DriverStateFlags(), Times.Exactly(2));
+			_serialPortMock.Verify(c => c.Open(), Times.Once);
+
+			_serialPortMock.Verify(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()), Times.Once);
+			_serialPortMock.Verify(ns => ns.ReadAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Once);
+
+			_serialPortMock.VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
 		public async Task ShouldThrowEndOfStreamExceptionOnInvokeAsync()
 		{
 			// Arrange
@@ -235,10 +344,8 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 
 			var connection = GetConnection();
 
-			// Act
-			var response = await connection.InvokeAsync(request, validation);
-
-			// Assert - EndOfStreamException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<EndOfStreamException>(() => connection.InvokeAsync(request, validation));
 		}
 
 		[TestMethod]
@@ -320,7 +427,6 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(TaskCanceledException))]
 		public async Task ShouldThrowTaskCancelledExceptionForDisposeOnInvokeAsync()
 		{
 			// Arrange
@@ -332,16 +438,16 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 				.Setup(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
 				.Returns(Task.Delay(100));
 
-			// Act
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<TaskCanceledException>(async () =>
+			{
 				var task = connection.InvokeAsync(request, validation);
 				connection.Dispose();
 				await task;
-
-			// Assert - TaskCancelledException
+			});
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(TaskCanceledException))]
 		public async Task ShouldThrowTaskCancelledExceptionForCancelOnInvokeAsync()
 		{
 			// Arrange
@@ -354,12 +460,13 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 				.Setup(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
 				.Returns(Task.Delay(100));
 
-			// Act
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<TaskCanceledException>(async () =>
+			{
 				var task = connection.InvokeAsync(request, validation, cts.Token);
 				cts.Cancel();
 				await task;
-
-			// Assert - TaskCancelledException
+			});
 		}
 
 		[TestMethod]
@@ -375,7 +482,7 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			var connection = GetConnection();
 			_serialPortMock
 				.Setup(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
-				.Callback<byte[], CancellationToken>((req, _) => _serialLineRequestCallbacks.Add(req.ToArray()))
+				.Callback<byte[], CancellationToken>((req, _) => _serialLineRequestCallbacks.Add([.. req]))
 				.Returns(Task.Delay(100));
 
 			// Act
@@ -418,7 +525,7 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			var connection = GetConnection();
 			_serialPortMock
 				.Setup(ns => ns.WriteAsync(It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
-				.Callback<byte[], CancellationToken>((req, _) => _serialLineRequestCallbacks.Add(req.ToArray()))
+				.Callback<byte[], CancellationToken>((req, _) => _serialLineRequestCallbacks.Add([.. req]))
 				.Returns(Task.Delay(100));
 
 			// Act
@@ -489,9 +596,6 @@ namespace AMWD.Protocols.Modbus.Tests.Serial
 			(connectionField.GetValue(connection) as SerialPortWrapper)?.Dispose();
 			connectionField.SetValue(connection, _serialPortMock.Object);
 
-			// Set unit test mode
-			connection.GetType().GetField("_isUnitTest", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(connection, true);
-
 			return connection;
 		}
 	}

AMWD.Protocols.Modbus.Tests/Tcp/ModbusTcpClientTest.cs

@@ -162,5 +162,18 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 
 			_tcpConnectionMock.VerifyNoOtherCalls();
 		}
+
+		[TestMethod]
+		public void ShouldPrintCleanString()
+		{
+			// Arrange
+			using var client = new ModbusTcpClient(_tcpConnectionMock.Object);
+
+			// Act
+			string str = client.ToString();
+
+			// Assert
+			SnapshotAssert.AreEqual(str);
+		}
 	}
 }

AMWD.Protocols.Modbus.Tests/Tcp/ModbusTcpConnectionTest.cs

@@ -80,31 +80,25 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 		[DataRow(null)]
 		[DataRow("")]
 		[DataRow("   ")]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionForInvalidHostname(string hostname)
 		{
 			// Arrange
 			var connection = GetTcpConnection();
 
-			// Act
-			connection.Hostname = hostname;
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => connection.Hostname = hostname);
 		}
 
 		[DataTestMethod]
 		[DataRow(0)]
 		[DataRow(65536)]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeExceptionForInvalidPort(int port)
 		{
 			// Arrange
 			var connection = GetTcpConnection();
 
-			// Act
-			connection.Port = port;
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => connection.Port = port);
 		}
 
 		[TestMethod]
@@ -119,46 +113,37 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public async Task ShouldThrowDisposedExceptionOnInvokeAsync()
 		{
 			// Arrange
 			var connection = GetConnection();
 			connection.Dispose();
 
-			// Act
-			await connection.InvokeAsync(null, null);
-
-			// Assert - OjbectDisposedException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ObjectDisposedException>(() => connection.InvokeAsync(null, null));
 		}
 
 		[DataTestMethod]
 		[DataRow(null)]
 		[DataRow(new byte[0])]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldThrowArgumentNullExceptionForMissingRequestOnInvokeAsync(byte[] request)
 		{
 			// Arrange
 			var connection = GetConnection();
 
-			// Act
-			await connection.InvokeAsync(request, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => connection.InvokeAsync(request, null));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public async Task ShouldThrowArgumentNullExceptionForMissingValidationOnInvokeAsync()
 		{
 			// Arrange
 			byte[] request = new byte[1];
 			var connection = GetConnection();
 
-			// Act
-			await connection.InvokeAsync(request, null);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => connection.InvokeAsync(request, null));
 		}
 
 		[TestMethod]
@@ -235,7 +220,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(EndOfStreamException))]
 		public async Task ShouldThrowEndOfStreamExceptionOnInvokeAsync()
 		{
 			// Arrange
@@ -244,14 +228,11 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 
 			var connection = GetConnection();
 
-			// Act
-			var response = await connection.InvokeAsync(request, validation);
-
-			// Assert - EndOfStreamException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<EndOfStreamException>(() => connection.InvokeAsync(request, validation));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ApplicationException))]
 		public async Task ShouldThrowApplicationExceptionWhenHostNotResolvableOnInvokeAsync()
 		{
 			// Arrange
@@ -264,10 +245,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			var connection = GetConnection();
 			connection.GetType().GetField("_hostname", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(connection, "");
 
-			// Act
-			var response = await connection.InvokeAsync(request, validation);
-
-			// Assert - ApplicationException
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<ApplicationException>(() => connection.InvokeAsync(request, validation));
 		}
 
 		[TestMethod]
@@ -351,8 +330,7 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(TaskCanceledException))]
-		public async Task ShouldThrowTaskCancelledExceptionForDisposeOnInvokeAsync()
+		public async Task ShouldThrowTaskCanceledExceptionForDisposeOnInvokeAsync()
 		{
 			// Arrange
 			byte[] request = [1, 2, 3];
@@ -363,17 +341,17 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 				.Setup(ns => ns.WriteAsync(It.IsAny<ReadOnlyMemory<byte>>(), It.IsAny<CancellationToken>()))
 				.Returns(new ValueTask(Task.Delay(100)));
 
-			// Act
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<TaskCanceledException>(async () =>
+			{
 				var task = connection.InvokeAsync(request, validation);
 				connection.Dispose();
 				await task;
-
-			// Assert - TaskCancelledException
+			});
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(TaskCanceledException))]
-		public async Task ShouldThrowTaskCancelledExceptionForCancelOnInvokeAsync()
+		public async Task ShouldThrowTaskCanceledExceptionForCancelOnInvokeAsync()
 		{
 			// Arrange
 			byte[] request = [1, 2, 3];
@@ -385,12 +363,13 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 				.Setup(ns => ns.WriteAsync(It.IsAny<ReadOnlyMemory<byte>>(), It.IsAny<CancellationToken>()))
 				.Returns(new ValueTask(Task.Delay(100)));
 
-			// Act
+			// Act + Assert
+			await Assert.ThrowsExceptionAsync<TaskCanceledException>(async () =>
+			{
 				var task = connection.InvokeAsync(request, validation, cts.Token);
 				cts.Cancel();
 				await task;
-
-			// Assert - TaskCancelledException
+			});
 		}
 
 		[TestMethod]

AMWD.Protocols.Modbus.Tests/Tcp/ModbusTcpProxyTest.cs

@@ -143,7 +143,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await proxy.StopAsync();
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
 
@@ -151,21 +150,40 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Exactly(2));
 			_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.Once);
 
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public async Task ShouldSetSocketToDualModeOnIpV6()
+		{
+			// Arrange
+			_connectClient = false;
+			using var proxy = GetProxy(IPAddress.IPv6Loopback);
+
+			// Act
+			await proxy.StartAsync();
+			await proxy.StopAsync();
+
+			// Assert
+			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
+			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
+			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
+			_socketMock.VerifySet(m => m.DualMode = true, Times.Once);
+
+			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
+			_tcpListenerMock.Verify(m => m.Stop(), Times.Exactly(2));
+			_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.Once);
 
 			VerifyNoOtherCalls();
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionOnCreateInstanceForClient()
 		{
 			// Arrange
 
-			// Act
-			new ModbusTcpProxy(null, IPAddress.Loopback);
-
-			// Assert - ArgumentNullException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentNullException>(() => new ModbusTcpProxy(null, IPAddress.Loopback));
 		}
 
 		[TestMethod]
@@ -212,17 +230,14 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentOutOfRangeException))]
 		public void ShouldThrowArgumentOutOfRangeExceptionForInvalidTimeout()
 		{
 			// Arrange
 			_connectClient = false;
 			using var proxy = GetProxy();
 
-			// Act
-			proxy.ReadWriteTimeout = TimeSpan.FromSeconds(-3);
-
-			// Assert - ArgumentOutOfRangeException
+			// Act + Assert
+			Assert.ThrowsException<ArgumentOutOfRangeException>(() => proxy.ReadWriteTimeout = TimeSpan.FromSeconds(-3));
 		}
 
 		[TestMethod]
@@ -244,7 +259,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
@@ -252,7 +266,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.AtLeast(1));
 
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			VerifyNoOtherCalls();
 		}
@@ -269,10 +282,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -300,10 +311,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -347,10 +356,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -388,10 +395,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -425,10 +430,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -477,10 +480,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -518,10 +519,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -555,10 +554,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -605,10 +602,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -646,10 +641,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -683,10 +676,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -733,10 +724,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -774,10 +763,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -811,10 +798,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -862,10 +847,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -886,6 +869,7 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			Assert.AreEqual(ModbusDeviceIdentificationObject.VendorName, objectId);
 
 			CollectionAssert.AreEqual(expectedResponse, _responseBytesCallbacks.First());
+			SnapshotAssert.AreEqual(_clientDeviceIdentificationResponse.ToString());
 		}
 
 		[TestMethod]
@@ -903,10 +887,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -935,10 +917,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -970,10 +950,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1005,10 +983,9 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
+
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1046,10 +1023,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1094,10 +1069,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1151,10 +1124,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1197,10 +1168,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1243,10 +1212,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1293,10 +1260,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1334,10 +1299,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1366,10 +1329,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1402,10 +1363,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1449,10 +1408,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1495,10 +1452,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1536,10 +1491,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1569,10 +1522,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1616,10 +1567,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1662,10 +1611,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1707,10 +1654,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1739,10 +1684,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1775,10 +1718,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1826,10 +1767,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1876,10 +1815,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1921,10 +1858,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1953,10 +1888,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1989,10 +1922,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -2040,10 +1971,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			await Task.Delay(100);
 
 			// Assert
-			_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
 			_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
 			_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
-			_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
 
 			_tcpListenerMock.Verify(m => m.Start(), Times.Once);
 			_tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -2099,9 +2028,9 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
 			return [.. CreateHeader(request), .. request];
 		}
 
-		private ModbusTcpProxy GetProxy()
+		private ModbusTcpProxy GetProxy(IPAddress localAddress = null)
 		{
-			var localAddress = IPAddress.Loopback;
+			localAddress ??= IPAddress.Loopback;
 			int localPort = 502;
 
 			var connection = new Mock<IModbusConnection>();

AMWD.Protocols.Modbus.Tests/Tcp/Snapshots/ModbusTcpClientTest/ShouldPrintCleanString.snap.bin

@@ -0,0 +1,2 @@
+TCP Client 127.0.0.1
+  Port:           502

AMWD.Protocols.Modbus.Tests/Tcp/Snapshots/ModbusTcpProxyTest/ShouldReadDeviceIdentification.snap.bin

@@ -0,0 +1,9 @@
+DeviceIdentification
+  VendorName:                VendorName
+  ProductCode:               ProductCode
+  MajorMinorRevision:        MajorMinorRevision
+  VendorUrl:                 
+  ProductName:               
+  ModelName:                 
+  UserApplicationName:       
+  IsIndividualAccessAllowed: False

CHANGELOG.md

@@ -10,6 +10,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 _nothing changed yet_
 
 
+## [v0.4.2] (2025-02-07)
+
+### Fixed
+
+- Fixing issue with R/W timeouts while processing client requests on the `ModbusTcpProxy`.
+
+
+## [v0.4.1] (2025-02-06)
+
+### Changed
+
+- Async methods do not return on captured context anymore (`Task.ConfigureAwait(false)`).
+
+### Fixed
+
+- Set `Socket.DualMode` on IPv4 network address is not allowed (`ModbusTcpProxy`).
+
+
 ## [v0.4.0] (2025-01-29)
 
 ### Added
@@ -77,7 +95,9 @@ So this tag is only here for documentation purposes of the NuGet Gallery.
 
 
 
-[Unreleased]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.4.2...HEAD
+[v0.4.2]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.4.1...v0.4.2
+[v0.4.1]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.4.0...v0.4.1
 [v0.4.0]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.3.2...v0.4.0
 [v0.3.2]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.3.1...v0.3.2
 [v0.3.1]: https://github.com/AM-WD/AMWD.Protocols.Modbus/compare/v0.3.0...v0.3.1

CliClient/CliClient.csproj

@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <None Remove="$(SolutionDir)/package-icon.png" />
+    <None Remove="$(SolutionDir)/LICENSE.txt" />
   </ItemGroup>
 
   <ItemGroup>

CliClient/Program.cs

@@ -43,7 +43,7 @@ namespace AMWD.Protocols.Modbus.CliClient
 		{
 			if (!ParseArguments(args))
 			{
-				Console.WriteLine("Could not parse arguments.");
+				Console.Error.WriteLine("Could not parse arguments.");
 				return 1;
 			}
 
@@ -55,13 +55,13 @@ namespace AMWD.Protocols.Modbus.CliClient
 
 			if (string.IsNullOrWhiteSpace(_target))
 			{
-				Console.WriteLine("No serial port or tcp host specified.");
+				Console.Error.WriteLine("No serial port or tcp host specified.");
 				return 1;
 			}
 
 			if (!_typeOption.IsSet)
 			{
-				Console.WriteLine("No type specified.");
+				Console.Error.WriteLine("No type specified.");
 				return 1;
 			}
 
@@ -79,7 +79,7 @@ namespace AMWD.Protocols.Modbus.CliClient
 				{
 					try
 					{
-						Console.Write(".");
+						Console.Error.Write(".");
 						await Task.Delay(1000, cts.Token);
 					}
 					catch (OperationCanceledException)
@@ -87,7 +87,7 @@ namespace AMWD.Protocols.Modbus.CliClient
 						return 0;
 					}
 				}
-				Console.WriteLine();
+				Console.Error.WriteLine();
 			}
 
 			using var client = CreateClient();

CliProxy/CliProxy.csproj

@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <None Remove="$(SolutionDir)/package-icon.png" />
+    <None Remove="$(SolutionDir)/LICENSE.txt" />
   </ItemGroup>
 
   <ItemGroup>

CliProxy/Program.cs

@@ -57,7 +57,7 @@ namespace AMWD.Protocols.Modbus.CliProxy
 		{
 			if (!ParseArguments(args))
 			{
-				Console.WriteLine("Could not parse arguments.");
+				Console.Error.WriteLine("Could not parse arguments.");
 				return 1;
 			}
 
@@ -81,7 +81,7 @@ namespace AMWD.Protocols.Modbus.CliProxy
 				{
 					try
 					{
-						Console.Write(".");
+						Console.Error.Write(".");
 						await Task.Delay(1000, cts.Token);
 					}
 					catch (OperationCanceledException)
@@ -89,12 +89,15 @@ namespace AMWD.Protocols.Modbus.CliProxy
 						return 0;
 					}
 				}
-				Console.WriteLine();
+				Console.Error.WriteLine();
 			}
 
 			try
 			{
 				using var client = CreateClient();
+				Console.WriteLine(client);
+				Console.WriteLine();
+
 				if (_clientProtocolOption.IsSet)
 				{
 					switch (_clientProtocolOption.Value.ToLower())
@@ -105,10 +108,13 @@ namespace AMWD.Protocols.Modbus.CliProxy
 					}
 				}
 				using var proxy = CreateProxy(client);
+				Console.WriteLine(proxy);
+				Console.WriteLine();
 
 				await proxy.StartAsync(cts.Token);
 				try
 				{
+					Console.WriteLine("Running proxy. Press Ctrl+C to stop.");
 					await Task.Delay(Timeout.Infinite, cts.Token);
 				}
 				finally

Directory.Build.props

@@ -18,12 +18,12 @@
 
     <PackageIcon>package-icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 
     <Title>Modbus Protocol for .NET</Title>
     <Company>AM.WD</Company>
     <Authors>Andreas Müller</Authors>
     <Copyright>© {copyright:2018-} AM.WD</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)/AMWD.Protocols.Modbus.snk</AssemblyOriginatorKeyFile>
@@ -52,6 +52,7 @@
 
   <ItemGroup>
     <None Include="$(SolutionDir)/package-icon.png" Pack="true" PackagePath="/" />
+    <None Include="$(SolutionDir)/LICENSE.txt" Pack="true" PackagePath="/" />
   </ItemGroup>
 
   <ItemGroup>

README.md

@@ -2,9 +2,12 @@
 
 Here you can find a basic implementation of the Modbus protocol.
 
+![NuGet Version](https://shields.io/nuget/v/AMWD.Protocols.Modbus.Common?style=flat&logo=nuget)
+![Test Coverage](https://git.am-wd.de/am-wd/amwd.protocols.modbus/badges/main/coverage.svg?style=flat)
+
 ## Overview
 
-The project is divided into four parts.
+The project is divided into multiple parts.
 
 To be mentioned at the beginning:    
 Only the clients are build very modular to fit any requirement reached on the first implementation back in 2018 ([see here]).    
@@ -35,7 +38,7 @@ It uses a specific TCP connection implementation and plugs all things from the C
 ---
 
 Published under [MIT License] (see [choose a license])    
-[![Buy me a Coffee](https://shields.am-wd.de/badge/PayPal-Buy_me_a_Coffee-yellow?style=flat&logo=paypal)](https://link.am-wd.de/donate)
+[![Buy me a Coffee](https://shields.io/badge/PayPal-Buy_me_a_Coffee-yellow?style=flat&logo=paypal)](https://link.am-wd.de/donate)
 [![built with Codeium](https://codeium.com/badges/main)](https://link.am-wd.de/codeium)