diff --git a/UnitTests/PInvoke/NTDSApi/NTDSApiTests.cs b/UnitTests/PInvoke/NTDSApi/NTDSApiTests.cs
index cd41befa..4083f1b1 100644
--- a/UnitTests/PInvoke/NTDSApi/NTDSApiTests.cs
+++ b/UnitTests/PInvoke/NTDSApi/NTDSApiTests.cs
@@ -66,8 +66,9 @@ namespace Vanara.PInvoke.Tests
 		[Test]
 		public void DsGetDCInfoTest()
 		{
-			DsBind(null, null, out var dsb).ThrowIfFailed();
-			var ret = DsGetDomainControllerInfo(dsb, "americas", 1, out var u1, out var i1);
+			var dn = System.Environment.UserDomainName; // System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().DomainName;
+			DsBind(null, dn, out var dsb).ThrowIfFailed();
+			var ret = DsGetDomainControllerInfo(dsb, dn, 1, out var u1, out var i1);
 			ret.ThrowIfFailed();
 			var s1 = i1.ToIEnum<DS_DOMAIN_CONTROLLER_INFO_1>(u1).ToArray();
 			Assert.That(s1[0].fDsEnabled);
diff --git a/UnitTests/PInvoke/Shared/OverlappedAsyncTests.cs b/UnitTests/PInvoke/Shared/OverlappedAsyncTests.cs
index 161704f3..c7581df6 100644
--- a/UnitTests/PInvoke/Shared/OverlappedAsyncTests.cs
+++ b/UnitTests/PInvoke/Shared/OverlappedAsyncTests.cs
@@ -11,11 +11,11 @@ namespace Vanara.PInvoke.Tests
 		public void SetupOverlappedFunctionTest()
 		{
 			var fn = Path.GetTempFileName();
-			using (var hFile = Kernel32.CreateFile(fn, Kernel32.FileAccess.GENERIC_ALL, FileShare.ReadWrite, null, FileMode.OpenOrCreate, FileFlagsAndAttributes.FILE_ATTRIBUTE_NORMAL))
+			using (var hFile = Kernel32.CreateFile(fn, Kernel32.FileAccess.GENERIC_ALL, FileShare.ReadWrite, null, FileMode.OpenOrCreate, FileFlagsAndAttributes.FILE_ATTRIBUTE_NORMAL | FileFlagsAndAttributes.FILE_FLAG_OVERLAPPED))
 			{
 				var oar = SetupOverlappedFunction(hFile, ar => { }, 10);
 				Assert.That(oar.AsyncState, Is.EqualTo(10));
-				Assert.That(oar.Handle, Is.EqualTo(hFile));
+				Assert.That(oar.Handle, Is.EqualTo((HFILE)hFile));
 
 				EvaluateOverlappedFunction(oar, true);
 				Assert.That(oar.IsCompleted, Is.True);
diff --git a/UnitTests/PInvoke/Shared/WinError/Win32ErrorTests.cs b/UnitTests/PInvoke/Shared/WinError/Win32ErrorTests.cs
index 4ac5c6fd..15d1e876 100644
--- a/UnitTests/PInvoke/Shared/WinError/Win32ErrorTests.cs
+++ b/UnitTests/PInvoke/Shared/WinError/Win32ErrorTests.cs
@@ -148,7 +148,7 @@ namespace Vanara.PInvoke.Tests
 			Assert.That(conv.ConvertTo(hr, typeof(string)), Is.TypeOf<string>());
 			Assert.That(conv.ConvertTo(hr, typeof(bool)), Is.EqualTo(false));
 			Assert.That(conv.ConvertTo(hr, typeof(uint)), Is.EqualTo(Win32Error.ERROR_ACCESS_DENIED));
-			Assert.That(() => conv.ConvertTo("s", typeof(int)), Throws.TypeOf<InvalidCastException>());
+			Assert.That(() => conv.ConvertTo("s", typeof(int)), Throws.TypeOf<NotSupportedException>());
 			Assert.That(() => conv.ConvertTo(hr, typeof(char)), Throws.TypeOf<NotSupportedException>());
 			Assert.That(() => conv.ConvertTo(hr, typeof(DateTime)), Throws.TypeOf<NotSupportedException>());
 		}
diff --git a/UnitTests/Shell/ShellItemTests.cs b/UnitTests/Shell/ShellItemTests.cs
index f82e4878..aefb0b03 100644
--- a/UnitTests/Shell/ShellItemTests.cs
+++ b/UnitTests/Shell/ShellItemTests.cs
@@ -136,8 +136,8 @@ namespace Vanara.Windows.Shell.Tests
 				Assert.That(i.Properties[PROPERTYKEY.System.Author], Has.Member("TestAuthor"));
 				Assert.That(i.Properties[PROPERTYKEY.System.ItemTypeText], Does.StartWith("Microsoft Word"));
 				Assert.That(i.Properties[PROPERTYKEY.System.DateAccessed], Is.TypeOf<FILETIME>());
-				Assert.That(() => i.Properties[new PROPERTYKEY()], Throws.Exception);
-				Assert.That(() => i.Properties[new PROPERTYKEY(Guid.NewGuid(), 2)], Throws.Exception);
+				Assert.That(i.Properties[new PROPERTYKEY()], Is.Null);
+				Assert.That(i.Properties[new PROPERTYKEY(Guid.NewGuid(), 2)], Is.Null);
 
 				Assert.That(i.Properties["System.Author"], Has.Member("TestAuthor"));
 				Assert.That(i.Properties["DocAuthor"], Has.Member("TestAuthor"));
diff --git a/UnitTests/UI/Dialogs/NetworkConnectionDialogTests.cs b/UnitTests/UI/Dialogs/NetworkConnectionDialogTests.cs
index 0b99e0c4..72fae8cd 100644
--- a/UnitTests/UI/Dialogs/NetworkConnectionDialogTests.cs
+++ b/UnitTests/UI/Dialogs/NetworkConnectionDialogTests.cs
@@ -6,38 +6,47 @@ namespace Vanara.Windows.Forms.Tests
 	[TestFixture()]
 	public class NetworkConnectionDialogTests
 	{
+		private const string remoteName = @"\\HALLAN-SVR\share";
+
 		[Test()]
 		public void NetworkConnectionDialogTest()
 		{
 			var ncd = new NetworkConnectionDialog { UseMostRecentPath = true };
-			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK));
-			Assert.That(ncd.ConnectedDeviceCount, Is.GreaterThanOrEqualTo(0));
-			Assert.That(MessageBox.Show("Confirm MRU path shown", "NetworkConnectionDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
+			ncd.HideRestoreConnectionCheckBox = true;
+			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK).Or.EqualTo(DialogResult.Cancel));
+			//Assert.That(ncd.ConnectedDeviceCount, Is.GreaterThanOrEqualTo(0));
+			Assert.That(MessageBox.Show("Confirm MRU path shown and checkbox hidden", "NetworkConnectionDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
 
 			ncd.Reset();
 			Assert.That(ncd.UseMostRecentPath, Is.False);
 
-			ncd.RemoteNetworkName = @"\\HALLAN-SVR\share";
+			ncd.RemoteNetworkName = remoteName;
+			ncd.ReadOnlyPath = true;
 			Assert.That(() => ncd.UseMostRecentPath = true, Throws.InvalidOperationException);
-			ncd.HideRestoreConnectionCheckBox = true;
-			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK));
-			Assert.That(MessageBox.Show("Confirm remote path shown and checkbox hidden.", "NetworkConnectionDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
+			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK).Or.EqualTo(DialogResult.Cancel));
+			Assert.That(MessageBox.Show("Confirm remote path shown.", "NetworkConnectionDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
 		}
 
 		[Test()]
 		public void NetworkDisconnectDialogTest()
 		{
-			var ncd = new NetworkDisconnectDialog { LocalDeviceName = "S:", ForceDisconnect = true, UpdateProfile = true };
-			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK));
+			const string drive = "S:";
+
+			Vanara.PInvoke.Mpr.WNetAddConnection2(new PInvoke.Mpr.NETRESOURCE(remoteName, drive), null, null, PInvoke.Mpr.CONNECT.CONNECT_TEMPORARY | PInvoke.Mpr.CONNECT.CONNECT_UPDATE_RECENT);
+
+			var ncd = new NetworkDisconnectDialog { LocalDeviceName = drive, RemoteNetworkName = remoteName, ForceDisconnect = false, UpdateProfile = true };
+			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK).Or.EqualTo(DialogResult.Cancel));
 			Assert.That(MessageBox.Show("Confirm local, force and update", "NetworkDisconnectDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
 
 			ncd.Reset();
-			Assert.That(ncd.ForceDisconnect, Is.False);
+			Assert.That(ncd.ForceDisconnect, Is.True);
 			Assert.That(ncd.LocalDeviceName, Is.Null);
 
-			ncd.RemoteNetworkName = @"\\HALLAN-SVR\share";
+			Vanara.PInvoke.Mpr.WNetAddConnection2(new PInvoke.Mpr.NETRESOURCE(remoteName, drive), null, null, PInvoke.Mpr.CONNECT.CONNECT_TEMPORARY | PInvoke.Mpr.CONNECT.CONNECT_UPDATE_RECENT);
+
 			Assert.That(() => ncd.UpdateProfile = true, Throws.InvalidOperationException);
-			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK));
+			ncd.LocalDeviceName = drive;
+			Assert.That(ncd.ShowDialog(), Is.EqualTo(DialogResult.OK).Or.EqualTo(DialogResult.Cancel));
 			Assert.That(MessageBox.Show("Confirm remote.", "NetworkDisconnectDialog Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes);
 		}
 	}
diff --git a/UnitTests/UI/Dialogs/TaskDialogTests.cs b/UnitTests/UI/Dialogs/TaskDialogTests.cs
index bd63692c..3b1f707b 100644
--- a/UnitTests/UI/Dialogs/TaskDialogTests.cs
+++ b/UnitTests/UI/Dialogs/TaskDialogTests.cs
@@ -6,6 +6,9 @@ namespace Vanara.Windows.Forms.Tests
 	[TestFixture()]
 	public class TaskDialogTests
 	{
+		[OneTimeSetUp]
+		public void SetupFixture() => Application.EnableVisualStyles();
+
 		[Test()]
 		public void TaskDialogTest()
 		{