diff --git a/FFMpegCore.Test/Assembly.cs b/FFMpegCore.Test/Assembly.cs
index 83cae2e..ceea514 100644
--- a/FFMpegCore.Test/Assembly.cs
+++ b/FFMpegCore.Test/Assembly.cs
@@ -1 +1 @@
-[assembly: Parallelize]
+[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
diff --git a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs
index f9442df..0e95f2e 100644
--- a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs
+++ b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs
@@ -1,6 +1,4 @@
-using FFMpegCore.Arguments;
-
-namespace FFMpegCore.Test;
+namespace FFMpegCore.Test;
 
 [TestClass]
 public class FFMpegArgumentProcessorTest
diff --git a/FFMpegCore.Test/FFMpegOptionsTests.cs b/FFMpegCore.Test/FFMpegOptionsTests.cs
index 3212cf6..ceaabf2 100644
--- a/FFMpegCore.Test/FFMpegOptionsTests.cs
+++ b/FFMpegCore.Test/FFMpegOptionsTests.cs
@@ -29,7 +29,6 @@ public class FFMpegOptionsTest
     [TestMethod]
     public void Options_Set_Programmatically()
     {
-        var original = GlobalFFOptions.Current;
         try
         {
             GlobalFFOptions.Configure(new FFOptions { BinaryFolder = "Whatever" });
@@ -40,7 +39,7 @@ public class FFMpegOptionsTest
         }
         finally
         {
-            GlobalFFOptions.Configure(original);
+            GlobalFFOptions.Configure(new FFOptions());
         }
     }
 }