diff --git a/UICatalog/Scenarios/Clipping.cs b/UICatalog/Scenarios/Clipping.cs
index 57a2b0172..4d8a701d6 100644
--- a/UICatalog/Scenarios/Clipping.cs
+++ b/UICatalog/Scenarios/Clipping.cs
@@ -9,6 +9,7 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Layout")]
 [ScenarioCategory ("Arrangement")]
 [ScenarioCategory ("Tests")]
+[ScenarioCategory ("Drawing")]
 public class Clipping : Scenario
 {
     private int _hotkeyCount;
diff --git a/UnitTests/Application/ApplicationScreenTests.cs b/UnitTests/Application/ApplicationScreenTests.cs
index f53bf8531..0abdeacbc 100644
--- a/UnitTests/Application/ApplicationScreenTests.cs
+++ b/UnitTests/Application/ApplicationScreenTests.cs
@@ -8,6 +8,7 @@ public class ApplicationScreenTests (ITestOutputHelper output)
     public void ClearScreenNextIteration_Resets_To_False_After_LayoutAndDraw ()
     {
         // Arrange
+        Application.ResetState (true);
         Application.Init ();
 
         // Act
@@ -64,6 +65,8 @@ public class ApplicationScreenTests (ITestOutputHelper output)
         Application.Top.Dispose ();
         Application.Top = null;
         Application.Shutdown ();
+        Application.ResetState (true);
+
     }
 
     [Fact]
diff --git a/UnitTests/Configuration/SettingsScopeTests.cs b/UnitTests/Configuration/SettingsScopeTests.cs
index 13e333a0c..805a01fbd 100644
--- a/UnitTests/Configuration/SettingsScopeTests.cs
+++ b/UnitTests/Configuration/SettingsScopeTests.cs
@@ -30,6 +30,7 @@ public class SettingsScopeTests
 
         // clean up
         Locations = ConfigLocations.All;
+        Reset ();
     }
 
     [Fact]
@@ -63,7 +64,7 @@ public class SettingsScopeTests
         Assert.Equal (Key.F, Application.NextTabGroupKey);
         Assert.Equal (Key.B, Application.PrevTabGroupKey);
 
-        Locations = ConfigLocations.Default;
+        Locations = ConfigLocations.All;
         Reset ();
 
     }
@@ -109,6 +110,7 @@ public class SettingsScopeTests
         Assert.True (Settings ["Themes"].PropertyValue is Dictionary<string, ThemeScope>);
         Assert.Single ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue);
 
-        Locations = savedLocations;
+        Locations = ConfigLocations.All;
+        Reset ();
     }
 }
diff --git a/local_packages/Terminal.Gui.2.0.0.nupkg b/local_packages/Terminal.Gui.2.0.0.nupkg
deleted file mode 100644
index 7d6da03ed..000000000
Binary files a/local_packages/Terminal.Gui.2.0.0.nupkg and /dev/null differ
diff --git a/local_packages/Terminal.Gui.2.0.0.snupkg b/local_packages/Terminal.Gui.2.0.0.snupkg
deleted file mode 100644
index 903a7bb99..000000000
Binary files a/local_packages/Terminal.Gui.2.0.0.snupkg and /dev/null differ