From c1377f7e24157de05ce4da8135eb38df0768b6c0 Mon Sep 17 00:00:00 2001
From: Krzysztof Nozderko <krzysztof.nozderko@snowflake.com>
Date: Tue, 11 Jun 2024 14:35:14 +0000
Subject: [PATCH] Revert "SNOW-1473274 bump nunit to 4.1.0 (#971)"

This reverts commit 0e7a4adaea8b0f9d3e72bd1e8e65bfaa9d89b40e.
---
 Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs      | 1 -
 Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs     | 1 -
 .../IntegrationTests/FileUploadDownloadLargeFilesIT.cs     | 1 -
 Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs      | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs      | 3 +--
 Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs    | 4 +---
 .../IntegrationTests/SFConnectionPoolAsyncIT.cs            | 2 +-
 .../IntegrationTests/SFConnectionPoolIT.cs                 | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs     | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs     | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFDbDataReaderIT.cs  | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs     | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs | 1 -
 .../IntegrationTests/SFMultiStatementsIT.cs                | 1 -
 Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs      | 1 -
 .../IntegrationTests/SFReusableChunkTest.cs                | 3 +--
 .../IntegrationTests/SFStatementTypeTest.cs                | 1 -
 Snowflake.Data.Tests/SFBaseTest.cs                         | 7 +++----
 Snowflake.Data.Tests/Snowflake.Data.Tests.csproj           | 2 +-
 Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs     | 1 -
 Snowflake.Data.Tests/UnitTests/ArrowResultChunkTest.cs     | 1 -
 Snowflake.Data.Tests/UnitTests/ArrowResultSetTest.cs       | 1 -
 .../UnitTests/ChunkDownloaderFactoryTest.cs                | 1 -
 Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs   | 1 -
 Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs   | 1 -
 .../UnitTests/Configuration/EasyLoggingConfigFinderTest.cs | 1 -
 .../UnitTests/Configuration/EasyLoggingConfigParserTest.cs | 1 -
 .../Configuration/EasyLoggingConfigProviderTest.cs         | 1 -
 .../UnitTests/Configuration/EasyLoggingLogLevelTest.cs     | 1 -
 Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs     | 1 -
 Snowflake.Data.Tests/UnitTests/FastParserTest.cs           | 1 -
 .../UnitTests/FileBackedOutputStreamTest.cs                | 1 -
 Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs             | 1 -
 .../UnitTests/Logger/EasyLoggerManagerTest.cs              | 3 +--
 Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs      | 3 +--
 .../UnitTests/Logger/UnixFilePermissionsConverterTest.cs   | 1 -
 Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs    | 1 -
 .../UnitTests/SFAuthenticatorFactoryTest.cs                | 1 -
 Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs        | 1 -
 Snowflake.Data.Tests/UnitTests/SFBindUploaderTest.cs       | 1 -
 Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs      | 1 -
 Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs   | 1 -
 Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs          | 1 -
 .../UnitTests/SFDbParameterCollectionTest.cs               | 1 -
 Snowflake.Data.Tests/UnitTests/SFDbParameterTest.cs        | 1 -
 Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs | 1 -
 Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs          | 1 -
 Snowflake.Data.Tests/UnitTests/SFOktaTest.cs               | 5 ++---
 .../UnitTests/SFRemoteStorageClientTest.cs                 | 1 -
 Snowflake.Data.Tests/UnitTests/SFReusableChunkTest.cs      | 1 -
 Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs           | 1 -
 Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs    | 2 --
 Snowflake.Data.Tests/UnitTests/SFSessionTest.cs            | 1 -
 Snowflake.Data.Tests/UnitTests/SFStatementTest.cs          | 1 -
 Snowflake.Data.Tests/UnitTests/SFUriUpdaterTest.cs         | 1 -
 Snowflake.Data.Tests/UnitTests/SecretDetectorTest.cs       | 1 -
 .../UnitTests/Session/EasyLoggingStarterTest.cs            | 1 -
 .../UnitTests/Session/SFHttpClientPropertiesTest.cs        | 1 -
 .../UnitTests/Session/SFHttpClientProxyPropertiesTest.cs   | 1 -
 Snowflake.Data.Tests/UnitTests/Tools/UnixOperationsTest.cs | 1 -
 .../Util/DedicatedThreadSynchronisationContext.cs          | 2 +-
 Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs    | 2 +-
 Snowflake.Data.Tests/Util/TableTypeExtensions.cs           | 3 +--
 63 files changed, 15 insertions(+), 76 deletions(-)

diff --git a/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs b/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs
index fa344cf96..44e4e6229 100644
--- a/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs
+++ b/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs
@@ -8,7 +8,6 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.Util.TestData;
 
 namespace Snowflake.Data.Tests.IcebergTests
diff --git a/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs b/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs
index f3b28c790..595fbb65d 100644
--- a/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs
@@ -7,7 +7,6 @@
 using Snowflake.Data.Configuration;
 using Snowflake.Data.Core;
 using Snowflake.Data.Log;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.UnitTests.Configuration.EasyLoggingConfigGenerator;
 
 namespace Snowflake.Data.Tests.IntegrationTests
diff --git a/Snowflake.Data.Tests/IntegrationTests/FileUploadDownloadLargeFilesIT.cs b/Snowflake.Data.Tests/IntegrationTests/FileUploadDownloadLargeFilesIT.cs
index 262e58374..7712a13c9 100644
--- a/Snowflake.Data.Tests/IntegrationTests/FileUploadDownloadLargeFilesIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/FileUploadDownloadLargeFilesIT.cs
@@ -8,7 +8,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Client;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests
 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs b/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs
index d8bbfedc3..6a8bcce51 100644
--- a/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs
@@ -11,7 +11,6 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs
index 4479a6b69..00a1857a2 100755
--- a/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs
@@ -15,12 +15,11 @@
 using System.Globalization;
 using System.Collections.Generic;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
 
-    [TestFixture]
+    [TestFixture]    
     class SFBindTestIT : SFBaseTest
     {
         private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFBindTestIT>();
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs
index fba13051c..cc4fea738 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs
@@ -20,8 +20,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Tests.Mock;
     using System.Runtime.InteropServices;
     using System.Net.Http;
-    using NUnit.Framework.Legacy;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFConnectionIT : SFBaseTest
@@ -801,7 +799,7 @@ public void TestUnknownAuthenticator()
                     IDbConnection conn = new SnowflakeDbConnection();
                     conn.ConnectionString = "scheme=http;host=test;port=8080;user=test;password=test;account=test;authenticator=" + wrongAuthenticator;
                     conn.Open();
-                    Assert.Fail($"Authentication of {wrongAuthenticator} should fail");
+                    Assert.Fail("Authentication of {0} should fail", wrongAuthenticator);
                 }
                 catch (SnowflakeDbException e)
                 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs
index df0a4a7fe..05f7ed17f 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs
@@ -10,10 +10,10 @@
 using System.Threading.Tasks;
 using Snowflake.Data.Client;
 using Snowflake.Data.Core;
+using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Mock;
 using Moq;
 using NUnit.Framework;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs
index 51121b199..4f5020538 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs
@@ -13,7 +13,6 @@
 using Snowflake.Data.Log;
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs
index 74fcfde49..4f71b9b1e 100755
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using System.Data;
     using System.Runtime.InteropServices;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbAdaptorIT : SFBaseTest
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
index ee17bb7b7..8891e2e2a 100755
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
@@ -18,7 +18,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using System.Globalization;
     using Snowflake.Data.Tests.Mock;
     using Snowflake.Data.Core;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandITAsync : SFBaseTestAsync
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbDataReaderIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbDataReaderIT.cs
index c93d25d67..b0e555185 100755
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbDataReaderIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbDataReaderIT.cs
@@ -12,7 +12,6 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs
index 39794f5d5..580f16f7f 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using NUnit.Framework;
     using System.Data;
     using System.Data.Common;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbFactoryIT : SFBaseTest
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs
index 55168b7e7..2786d8226 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs
@@ -11,7 +11,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbTransactionIT : SFBaseTest
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs
index e672699c9..f34b6d915 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs
@@ -12,7 +12,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using NUnit.Framework;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFMultiStatementsIT : SFBaseTest
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs
index d152202c6..975d041e0 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs
@@ -18,7 +18,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using Snowflake.Data.Core.FileTransfer;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [Parallelizable(ParallelScope.Children)]
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs
index f7f2a77d0..1dcc4ddc2 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs
@@ -9,8 +9,7 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Core;
     using Client;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
-
+    
     [TestFixture, NonParallelizable]
     class SFReusableChunkTest : SFBaseTest
     {
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs
index 4ae6d01b7..a6d79f261 100644
--- a/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using System.Data;
     using Snowflake.Data.Client;
     using System.Data.Common;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFStatementTypeTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/SFBaseTest.cs b/Snowflake.Data.Tests/SFBaseTest.cs
index 04d121543..6aacb94f9 100755
--- a/Snowflake.Data.Tests/SFBaseTest.cs
+++ b/Snowflake.Data.Tests/SFBaseTest.cs
@@ -23,12 +23,11 @@ namespace Snowflake.Data.Tests
     using NUnit.Framework.Interfaces;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Serialization;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     /*
-     * This is the base class for all tests that call blocking methods in the library - it uses MockSynchronizationContext to verify that
+     * This is the base class for all tests that call blocking methods in the library - it uses MockSynchronizationContext to verify that 
      * there are no async deadlocks in the library
-     *
+     * 
      */
     [TestFixture]
     public class SFBaseTest : SFBaseTestAsync
@@ -434,7 +433,7 @@ public void BeforeTest(ITest test)
             {
                 if (Environment.GetEnvironmentVariable(_key) == value)
                 {
-                    Assert.Ignore($"Test is ignored when environment variable {_key} is {value} ");
+                    Assert.Ignore("Test is ignored when environment variable {0} is {1} ", _key, value);
                 }
             }
         }
diff --git a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
index 2fc91d4d4..aad9b2e84 100644
--- a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
+++ b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
diff --git a/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs b/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs
index a10b5f46c..c6da4a27d 100644
--- a/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs
@@ -16,7 +16,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.IO;
     using System.Text;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ArrowChunkParserTest
diff --git a/Snowflake.Data.Tests/UnitTests/ArrowResultChunkTest.cs b/Snowflake.Data.Tests/UnitTests/ArrowResultChunkTest.cs
index d09764a47..8197409be 100755
--- a/Snowflake.Data.Tests/UnitTests/ArrowResultChunkTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ArrowResultChunkTest.cs
@@ -11,7 +11,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
diff --git a/Snowflake.Data.Tests/UnitTests/ArrowResultSetTest.cs b/Snowflake.Data.Tests/UnitTests/ArrowResultSetTest.cs
index 308e2d74a..cf8746b75 100755
--- a/Snowflake.Data.Tests/UnitTests/ArrowResultSetTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ArrowResultSetTest.cs
@@ -14,7 +14,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
diff --git a/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs
index 2cd98d274..828e3badb 100644
--- a/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs
@@ -10,7 +10,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.Collections.Generic;
     using System.Threading;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ChunkDownloaderFactoryTest
diff --git a/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs
index 3ec51b44d..d8081e187 100644
--- a/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs
@@ -13,7 +13,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Security;
     using System.Text;
     using System.Threading;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ChunkParserFactoryTest
diff --git a/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs b/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs
index b7e8fa2ed..db06693c7 100644
--- a/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.IO;
     using System.Text;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class ConcatenatedStreamTest
diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigFinderTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigFinderTest.cs
index 6c35b3a7b..b23fbbf0e 100644
--- a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigFinderTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigFinderTest.cs
@@ -10,7 +10,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
 using Snowflake.Data.Core.Tools;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
 {
diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs
index 1e6576b09..847d57c51 100644
--- a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs
@@ -7,7 +7,6 @@
 using System.IO;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.UnitTests.Configuration.EasyLoggingConfigGenerator;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs
index 3be6abfe3..f61d51503 100644
--- a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs
@@ -5,7 +5,6 @@
 using Moq;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
 {
diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs
index d7bbb8db6..d61cfaeec 100644
--- a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs
@@ -5,7 +5,6 @@
 using System;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
 {
diff --git a/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs b/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs
index f1911a4d4..e755a4604 100644
--- a/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using NUnit.Framework;
     using Snowflake.Data.Core;
     using System.Linq;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class FastMemoryStreamTest
diff --git a/Snowflake.Data.Tests/UnitTests/FastParserTest.cs b/Snowflake.Data.Tests/UnitTests/FastParserTest.cs
index 8b17b0b54..cf7d88aab 100644
--- a/Snowflake.Data.Tests/UnitTests/FastParserTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/FastParserTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using System;
     using System.Text;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [SetCulture("en-US")]
diff --git a/Snowflake.Data.Tests/UnitTests/FileBackedOutputStreamTest.cs b/Snowflake.Data.Tests/UnitTests/FileBackedOutputStreamTest.cs
index 161d68ce5..8e5a2da27 100644
--- a/Snowflake.Data.Tests/UnitTests/FileBackedOutputStreamTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/FileBackedOutputStreamTest.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using NUnit.Framework;
 using Snowflake.Data.Core.FileTransfer;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests
 {
diff --git a/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs b/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs
index a36be9e2b..668db5f91 100644
--- a/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs
@@ -12,7 +12,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Threading.Tasks;
     using System.Net;
     using System;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class HttpUtilTest
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs
index 44555f191..4dfba8c83 100644
--- a/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs
@@ -10,14 +10,13 @@
 using Snowflake.Data.Configuration;
 using Snowflake.Data.Core;
 using Snowflake.Data.Log;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Logger
 {
     [TestFixture, NonParallelizable]
     public class EasyLoggerManagerTest
     {
-
+        
         private const string InfoMessage = "Easy logging Info message";
         private const string DebugMessage = "Easy logging Debug message";
         private const string WarnMessage = "Easy logging Warn message";
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
index 3de3046bc..710a8d645 100644
--- a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
@@ -8,8 +8,7 @@ namespace Snowflake.Data.Tests.UnitTests
 {
     using NUnit.Framework;
     using Snowflake.Data.Log;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
-
+    
     [TestFixture, NonParallelizable]
     class SFLoggerTest
     {
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/UnixFilePermissionsConverterTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/UnixFilePermissionsConverterTest.cs
index 65df6af69..12f4ec756 100644
--- a/Snowflake.Data.Tests/UnitTests/Logger/UnixFilePermissionsConverterTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Logger/UnixFilePermissionsConverterTest.cs
@@ -6,7 +6,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Log;
 using System.Collections.Generic;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Logger
 {
diff --git a/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs b/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs
index ad4197601..a83293335 100644
--- a/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using System;
     using System.Collections.Generic;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class QueryContextCacheTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs
index f537cc905..3157619ae 100644
--- a/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using Snowflake.Data.Core.Authenticator;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFAuthenticatorFactoryTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs b/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs
index ef48796a5..f83351f99 100644
--- a/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs
@@ -20,7 +20,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Moq;
     using Azure;
     using Azure.Storage.Blobs.Models;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFAzureClientTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFBindUploaderTest.cs b/Snowflake.Data.Tests/UnitTests/SFBindUploaderTest.cs
index 2da4f2b6b..ac5172086 100644
--- a/Snowflake.Data.Tests/UnitTests/SFBindUploaderTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFBindUploaderTest.cs
@@ -5,7 +5,6 @@
 using System;
 using NUnit.Framework;
 using Snowflake.Data.Core;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
diff --git a/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs b/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs
index 5ffab2b04..65160ac97 100755
--- a/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs
@@ -11,7 +11,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using NUnit.Framework;
     using System.Threading;
     using System.Globalization;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [SetCulture("en-US")]
diff --git a/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs
index 309406d39..69f67d06f 100644
--- a/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs
@@ -6,7 +6,6 @@ namespace Snowflake.Data.Tests.UnitTests
 {
     using NUnit.Framework;
     using Snowflake.Data.Client;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandBuilderTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs
index 6276cff6d..714d237d2 100644
--- a/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFDbParameterCollectionTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbParameterCollectionTest.cs
index af3bb0a71..c3f798f97 100644
--- a/Snowflake.Data.Tests/UnitTests/SFDbParameterCollectionTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFDbParameterCollectionTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests
     using Snowflake.Data.Core;
     using System;
     using System.Collections;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbParameterCollectionTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFDbParameterTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbParameterTest.cs
index a5632a287..f9b83cdf1 100644
--- a/Snowflake.Data.Tests/UnitTests/SFDbParameterTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFDbParameterTest.cs
@@ -10,7 +10,6 @@ namespace Snowflake.Data.Tests
     using System;
     using System.Data;
     using System.Text;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbParameterTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs b/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
index d0a1f55e9..4e7c2041e 100644
--- a/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
@@ -16,7 +16,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.IO;
     using System.Text;
     using System;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFFileTransferAgentTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs b/Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs
index e93ca078b..da7c0cdf4 100644
--- a/Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs
@@ -17,7 +17,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Threading;
     using Snowflake.Data.Tests.Mock;
     using Moq;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFGCSClientTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFOktaTest.cs b/Snowflake.Data.Tests/UnitTests/SFOktaTest.cs
index 8df3d1fdc..75c73824d 100644
--- a/Snowflake.Data.Tests/UnitTests/SFOktaTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFOktaTest.cs
@@ -4,7 +4,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
@@ -100,7 +99,7 @@ public void TestCorrectPostbackUrl()
                 sfSession.Open();
             } catch (SnowflakeDbException e)
             {
-                Assert.Fail($"Should pass without exception {e}");
+                Assert.Fail("Should pass without exception", e);
             }
         }
 
@@ -122,7 +121,7 @@ public void TestCorrectPostbackUrlAsync()
                 connectTask.Wait();
             } catch (SnowflakeDbException e)
             {
-                Assert.Fail($"Should pass without exception {e}");
+                Assert.Fail("Should pass without exception", e);
             }
         }
 
diff --git a/Snowflake.Data.Tests/UnitTests/SFRemoteStorageClientTest.cs b/Snowflake.Data.Tests/UnitTests/SFRemoteStorageClientTest.cs
index dea826808..fa7df6250 100644
--- a/Snowflake.Data.Tests/UnitTests/SFRemoteStorageClientTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFRemoteStorageClientTest.cs
@@ -17,7 +17,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Text;
     using System.Net;
     using Moq;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFRemoteStorageClientTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFReusableChunkTest.cs b/Snowflake.Data.Tests/UnitTests/SFReusableChunkTest.cs
index 5c95f602b..4ca4eec79 100755
--- a/Snowflake.Data.Tests/UnitTests/SFReusableChunkTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFReusableChunkTest.cs
@@ -13,7 +13,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using Snowflake.Data.Client;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFReusableChunkTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs b/Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs
index 0dcf8ad53..da3baf531 100644
--- a/Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs
@@ -20,7 +20,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.IO;
     using Moq;
     using Amazon.S3.Model;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFS3ClientTest : SFBaseTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs b/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs
index 2c3739fcf..53b130f25 100644
--- a/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs
@@ -8,8 +8,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Client;
 using Snowflake.Data.Core.Authenticator;
-using NUnit.Framework.Legacy;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
diff --git a/Snowflake.Data.Tests/UnitTests/SFSessionTest.cs b/Snowflake.Data.Tests/UnitTests/SFSessionTest.cs
index c9dd31956..b9530b83b 100644
--- a/Snowflake.Data.Tests/UnitTests/SFSessionTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFSessionTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
 {
     using Snowflake.Data.Core;
     using NUnit.Framework;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFSessionTest
diff --git a/Snowflake.Data.Tests/UnitTests/SFStatementTest.cs b/Snowflake.Data.Tests/UnitTests/SFStatementTest.cs
index 6bc8589b1..3f131e924 100755
--- a/Snowflake.Data.Tests/UnitTests/SFStatementTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFStatementTest.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using NUnit.Framework;
     using System;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     /**
      * Mock rest request test
diff --git a/Snowflake.Data.Tests/UnitTests/SFUriUpdaterTest.cs b/Snowflake.Data.Tests/UnitTests/SFUriUpdaterTest.cs
index 09aa96d00..cd2dd23a4 100644
--- a/Snowflake.Data.Tests/UnitTests/SFUriUpdaterTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFUriUpdaterTest.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using NUnit.Framework;
     using System;
     using Snowflake.Data.Core;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFUriUpdaterTest
diff --git a/Snowflake.Data.Tests/UnitTests/SecretDetectorTest.cs b/Snowflake.Data.Tests/UnitTests/SecretDetectorTest.cs
index ce0fb176f..862a7c248 100644
--- a/Snowflake.Data.Tests/UnitTests/SecretDetectorTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SecretDetectorTest.cs
@@ -11,7 +11,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Tests.Mock;
     using System;
     using System.Collections.Generic;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SecretDetectorTest
diff --git a/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs
index aeacf4b78..8b1c6ebfe 100644
--- a/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs
@@ -13,7 +13,6 @@
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Tools;
 using Snowflake.Data.Log;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
diff --git a/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientPropertiesTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientPropertiesTest.cs
index 18215f15a..617e3d429 100644
--- a/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientPropertiesTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientPropertiesTest.cs
@@ -7,7 +7,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
diff --git a/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientProxyPropertiesTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientProxyPropertiesTest.cs
index 853d85926..53941cc27 100644
--- a/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientProxyPropertiesTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Session/SFHttpClientProxyPropertiesTest.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using Snowflake.Data.Core;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
diff --git a/Snowflake.Data.Tests/UnitTests/Tools/UnixOperationsTest.cs b/Snowflake.Data.Tests/UnitTests/Tools/UnixOperationsTest.cs
index c817f0ee8..fde51602c 100644
--- a/Snowflake.Data.Tests/UnitTests/Tools/UnixOperationsTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/Tools/UnixOperationsTest.cs
@@ -5,7 +5,6 @@
 using Mono.Unix.Native;
 using NUnit.Framework;
 using Snowflake.Data.Core.Tools;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.UnitTests.Configuration.EasyLoggingConfigGenerator;
 
 namespace Snowflake.Data.Tests.Tools
diff --git a/Snowflake.Data.Tests/Util/DedicatedThreadSynchronisationContext.cs b/Snowflake.Data.Tests/Util/DedicatedThreadSynchronisationContext.cs
index 264f1fa83..7501f9dee 100644
--- a/Snowflake.Data.Tests/Util/DedicatedThreadSynchronisationContext.cs
+++ b/Snowflake.Data.Tests/Util/DedicatedThreadSynchronisationContext.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using NUnit.Framework;
 
 namespace Snowflake.Data.Tests.Util
 {
diff --git a/Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs b/Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs
index a68f36d97..63432da31 100644
--- a/Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs
+++ b/Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs
@@ -5,7 +5,7 @@
 using System.Net.Http;
 using Snowflake.Data.Core;
 using Snowflake.Data.Client;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using NUnit.Framework;
 
 namespace Snowflake.Data.Tests.Util
 {
diff --git a/Snowflake.Data.Tests/Util/TableTypeExtensions.cs b/Snowflake.Data.Tests/Util/TableTypeExtensions.cs
index b631493cb..4c00f3a1d 100644
--- a/Snowflake.Data.Tests/Util/TableTypeExtensions.cs
+++ b/Snowflake.Data.Tests/Util/TableTypeExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using NUnit.Framework;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.Util
 {
-    public enum SFTableType
+    public enum SFTableType 
     {
         Standard,
         Hybrid,