From a009be96e76908656686759ee1ab050edcc4338d Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 8 Jan 2026 23:33:26 -0800
Subject: [PATCH 1/6] Refactors UI test setup to use TUnit executor

Centralizes remote app startup and test recorder management in XamlTestExecutor, removing boilerplate from individual tests; marks long-running tests as explicit and enables TUnit parallel limiting.
---
 .../MaterialColorUtilities.Tests/HctTests.cs  |   2 +-
 .../MaterialDesignThemes.UITests/AllStyles.cs |   4 -
 .../MaterialDesignThemes.UITests/TestBase.cs  |  22 ++--
 .../AutoSuggestTextBoxTests.cs                |  35 ------
 .../WPF/Buttons/OutlineButtonTests.cs         |  13 ---
 .../WPF/Buttons/RaisedButtonTests.cs          |   4 -
 .../WPF/Cards/ElevatedCardTests.cs            |   4 -
 .../WPF/Cards/OutlinedCardTests.cs            |   8 --
 .../WPF/ColorPickerTests.cs                   |   4 -
 .../WPF/ColorZones/ColorZoneTests.cs          |   4 -
 .../WPF/ComboBoxes/ComboBoxTests.cs           |  35 ------
 .../ContentControls/ContentControlTests.cs    |   4 -
 .../WPF/DatePickers/DatePickerTests.cs        |  35 ------
 .../WPF/DialogHosts/DialogHostTests.cs        |  52 ---------
 .../WPF/DrawerHosts/DrawerHostTests.cs        |  13 ---
 .../WPF/Flippers/ClassicFlipperTests.cs       |  12 --
 .../WPF/ListBoxes/ListBoxTests.cs             |  19 ----
 .../WPF/PasswordBoxes/PasswordBoxTests.cs     |  39 -------
 .../WPF/PopupBoxes/PopupBoxTests.cs           |   9 --
 .../WPF/SnackBars/SnackBarTests.cs            |   4 -
 .../WPF/SplitButtons/SplitButtonTests.cs      |  26 +----
 .../WPF/TabControls/TabControlTests.cs        |  10 --
 .../WPF/TextBoxes/TextBoxTests.cs             |  81 --------------
 .../WPF/TextFieldDefaultHeightTests.cs        |  16 ---
 .../WPF/Theme/ColorAdjustTests.cs             |   5 -
 .../WPF/Theme/ThemeTests.cs                   |  38 ++++---
 .../WPF/TimePickers/TimePickerTests.cs        |  87 ---------------
 .../WPF/ToolBars/ToolBarTests.cs              |   4 -
 .../WPF/TreeListViews/TreeListViewTests.cs    | 104 ------------------
 .../WPF/TreeViews/TreeViewTests.cs            |  10 --
 .../WPF/UpDownControls/DecimalUpDownTests.cs  |  29 -----
 .../WPF/UpDownControls/NumericUpDownTests.cs  |  33 ------
 .../XamlTestExecutor.cs                       |  32 ++++++
 33 files changed, 69 insertions(+), 728 deletions(-)
 create mode 100644 tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs

diff --git a/tests/MaterialColorUtilities.Tests/HctTests.cs b/tests/MaterialColorUtilities.Tests/HctTests.cs
index 0cd4ed5539..6869be7432 100644
--- a/tests/MaterialColorUtilities.Tests/HctTests.cs
+++ b/tests/MaterialColorUtilities.Tests/HctTests.cs
@@ -3,7 +3,7 @@
 public sealed class HctTests
 {
     [Test]
-    [Skip("Takes a long time to run")]
+    [Explicit] //Takes a long time to run
     [DisplayName("HCT preserves original color for all opaque ARGB values")]
     public async Task Hct_Preserves_Original_Color_For_All_Opaque_ARGB()
     {
diff --git a/tests/MaterialDesignThemes.UITests/AllStyles.cs b/tests/MaterialDesignThemes.UITests/AllStyles.cs
index 5d3c6c0f01..cf78a95deb 100644
--- a/tests/MaterialDesignThemes.UITests/AllStyles.cs
+++ b/tests/MaterialDesignThemes.UITests/AllStyles.cs
@@ -32,8 +32,6 @@ public class AllStyles : TestBase
     [Arguments("TreeView", "MaterialDesignTreeView")]
     public async Task LoadStyleInIsolation_CanBeLoaded(string controlName, string styleName)
     {
-        await using var recorder = new TestRecorder(App);
-
         string applicationResourceXaml = $$"""
 <ResourceDictionary 
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -78,7 +76,5 @@ await App.Initialize(applicationResourceXaml,
             """);
 
         await Assert.That(await window.GetIsVisible()).IsTrue();
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/TestBase.cs b/tests/MaterialDesignThemes.UITests/TestBase.cs
index 4a705022ea..93e6ccae1c 100644
--- a/tests/MaterialDesignThemes.UITests/TestBase.cs
+++ b/tests/MaterialDesignThemes.UITests/TestBase.cs
@@ -2,6 +2,9 @@
 using System.Windows.Media;
 using MaterialDesignThemes.UITests;
 using MaterialDesignThemes.Wpf.Internal;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using TUnit.Core;
 using TUnit.Core.Interfaces;
 
 [assembly: ParallelLimiter<SingleParallelLimit>]
@@ -26,13 +29,16 @@ public record SingleParallelLimit : IParallelLimit
     public int Limit => 1;
 }
 
-public abstract class TestBase()
+public abstract class TestBase
 {
-    protected bool AttachedDebuggerToRemoteProcess { get; set; } = true;
+    public bool AttachedDebuggerToRemoteProcess { get; set; } = true;
     protected static TextWriter Output => TestContext.Current?.OutputWriter ?? throw new InvalidOperationException("Could not find output writer");
 
     [NotNull]
-    protected IApp? App { get; set; }
+    public IApp? App { get; set; }
+
+    [NotNull]
+    public TestRecorder? Recorder { get; set; }
 
     protected async Task<Color> GetThemeColor(string name)
     {
@@ -56,9 +62,9 @@ protected async Task<IVisualElement> LoadUserControl(Type userControlType)
         return await App.CreateWindowWithUserControl(userControlType);
     }
 
-    [Before(Test)]
-    public async ValueTask InitializeAsync() =>
-        App = await XamlTest.App.StartRemote(new AppOptions
+    public Task<IApp> StartApp()
+    {
+        return XamlTest.App.StartRemote(new AppOptions
         {
 #if !DEBUG
             MinimizeOtherWindows = !System.Diagnostics.Debugger.IsAttached,
@@ -66,7 +72,5 @@ public async ValueTask InitializeAsync() =>
             AllowVisualStudioDebuggerAttach = AttachedDebuggerToRemoteProcess,
             LogMessage = Output.WriteLine
         });
-
-    [After(Test)]
-    public async ValueTask DisposeAsync() => await App.DisposeAsync();
+    }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
index bf6945b564..3d7e72ec24 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
@@ -14,8 +14,6 @@ public AutoSuggestBoxTests()
     [Test]
     public async Task CanFilterItems_WithSuggestionsAndDisplayMember_FiltersSuggestions()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -38,15 +36,11 @@ public async Task CanFilterItems_WithSuggestionsAndDisplayMember_FiltersSuggesti
         await AssertExists(suggestionListBox, "Apples", false);
         await AssertExists(suggestionListBox, "Mtn Dew", false);
         await AssertExists(suggestionListBox, "Orange", false);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanChoiceItem_FromTheSuggestions_AssertTheTextUpdated()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -85,15 +79,11 @@ await Wait.For(async () =>
         var suggestBoxText = await suggestBox.GetText();
         //Validate that the current text is the same as the selected item
         await Assert.That(suggestBoxText).IsEqualTo("Bananas");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanFilterItems_WithCollectionView_FiltersSuggestions()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement userControl = await LoadUserControl<AutoSuggestTextBoxWithCollectionView>();
         IVisualElement<AutoSuggestBox> suggestBox = await userControl.GetElement<AutoSuggestBox>();
@@ -117,16 +107,12 @@ public async Task CanFilterItems_WithCollectionView_FiltersSuggestions()
         await AssertExists(suggestionListBox, "Apples", false);
         await AssertExists(suggestionListBox, "Mtn Dew", false);
         await AssertExists(suggestionListBox, "Orange", false);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3761")]
     public async Task AutoSuggestBox_MovesFocusToNextElement_WhenPopupIsClosed()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         string xaml = """
             <StackPanel>
@@ -153,16 +139,12 @@ public async Task AutoSuggestBox_MovesFocusToNextElement_WhenPopupIsClosed()
         // Assert
         await Assert.That(await suggestBox.GetIsFocused()).IsFalse();
         await Assert.That(await nextTextBox.GetIsFocused()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3815")]
     public async Task AutoSuggestBox_KeysUpAndDown_WrapAround()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -196,16 +178,12 @@ public async Task AutoSuggestBox_KeysUpAndDown_WrapAround()
         //Assert that the first item is selected after pressing ArrowDown
         await suggestBox.SendInput(new KeyboardInput(Key.Down));
         await Assert.That(await suggestionListBox.GetSelectedIndex()).IsEqualTo(0);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3845")]
     public async Task AutoSuggestBox_SelectingAnItem_SetsSelectedItem()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement userControl = await LoadUserControl<AutoSuggestTextBoxWithCollectionView>();
         IVisualElement<AutoSuggestBox> suggestBox = await userControl.GetElement<AutoSuggestBox>();
@@ -228,15 +206,11 @@ static async Task AssertViewModelProperty(AutoSuggestBox autoSuggestBox)
             await Assert.That(viewModel.SelectedItem).IsEqualTo("Bananas");
         }
         await suggestBox.RemoteExecute(AssertViewModelProperty);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task AutoSuggestBox_ClickingButtonInInteractiveItemTemplate_DoesNotSelectOrClosePopup()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithInteractiveTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -267,14 +241,11 @@ static async Task AssertViewModelProperty(AutoSuggestBox autoSuggestBox)
             await Assert.That(thirdItem.Count).IsEqualTo(1);
         }
         await suggestBox.RemoteExecute(AssertViewModelProperty);
-        recorder.Success();
     }
 
     [Test]
     public async Task AutoSuggestBox_ClickingButtonForcingNonInteractive_SelectsItemAndClosesPopup()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithInteractiveTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -299,15 +270,11 @@ static void SetNonInteractive(Button button)
 
         // Assert
         await Assert.That(await suggestBox.GetIsSuggestionOpen()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task AutoSuggestBox_ClickingTextblockThatIsInteractive_DoesNotSelectOrClosePopup()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithInteractiveTemplate>()).As<AutoSuggestBox>();
         IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
@@ -336,8 +303,6 @@ static void SetInteractive(TextBlock textBlock)
         // The list box item should selected because the TextBlock does not handle the click
         int selectedIndex = await suggestionListBox.GetSelectedIndex();
         await Assert.That(selectedIndex).IsEqualTo(2); 
-
-        recorder.Success();
     }
 
     private static async Task AssertExists(IVisualElement<ListBox> suggestionListBox, string text, bool existsOrNotCheck = true)
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
index 312ab51d28..9158740a13 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
@@ -7,8 +7,6 @@ public class OutlineButtonTests : TestBase
     [Test]
     public async Task OutlinedButton_UsesThemeColorForBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Button> button = await LoadXaml<Button>(
             @"<Button Content=""Button"" Style=""{StaticResource MaterialDesignOutlinedButton}""/>");
@@ -22,15 +20,11 @@ public async Task OutlinedButton_UsesThemeColorForBorder()
         //Assert
         await Assert.That(borderColor).IsEqualTo(midColor);
         await Assert.That(internalBorderColor).IsEqualTo(midColor);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OutlinedButton_BorderCanBeOverridden()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var button = await LoadXaml<Button>(
             @"<Button Content=""Button""
@@ -38,7 +32,6 @@ public async Task OutlinedButton_BorderCanBeOverridden()
                           BorderThickness=""5""
                           BorderBrush=""Red""
                     />");
-        Color midColor = await GetThemeColor("MaterialDesign.Brush.Primary");
         IVisualElement<Border> internalBorder = await button.GetElement<Border>("border");
 
         //Act
@@ -48,15 +41,11 @@ public async Task OutlinedButton_BorderCanBeOverridden()
         //Assert
         await Assert.That(borderThickness).IsEqualTo(new Thickness(5));
         await Assert.That(borderBrush).IsEqualTo(Colors.Red);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OutlinedButton_OnMouseOver_UsesThemeBrush()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Button> button = await LoadXaml<Button>(
             @"<Button Content=""Button"" Style=""{StaticResource MaterialDesignOutlinedButton}""/>");
@@ -72,7 +61,5 @@ await Wait.For(async () =>
             //Assert
             await Assert.That(internalBorderBackground?.Color).IsEqualTo(midColor);
         });
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
index 39c7b3ea7a..e2596c87f1 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
@@ -7,8 +7,6 @@ public class RaisedButtonTests : TestBase
     [Test]
     public async Task OnLoad_ThemeBrushesSet()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Button> button = await LoadXaml<Button>(@"<Button Content=""Button"" />");
         Color midColor = await GetThemeColor("MaterialDesign.Brush.Primary");
@@ -18,7 +16,5 @@ public async Task OnLoad_ThemeBrushesSet()
 
         //Assert
         await Assert.That(color).IsEqualTo(midColor);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
index 1187395aee..a2f129ce92 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
@@ -8,8 +8,6 @@ public class ElevatedCardTests : TestBase
     [Test]
     public async Task ElevatedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Card> card = await LoadXaml<Card>(
             @"<materialDesign:Card Content=""Hello World"" Style=""{StaticResource MaterialDesignElevatedCard}"" UniformCornerRadius=""5"" />");
@@ -23,7 +21,5 @@ public async Task ElevatedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnB
         await Assert.That(internalBorderCornerRadius.Value.TopRight).IsEqualTo(5);
         await Assert.That(internalBorderCornerRadius.Value.BottomRight).IsEqualTo(5);
         await Assert.That(internalBorderCornerRadius.Value.BottomLeft).IsEqualTo(5);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
index 15da509acc..874790a0d7 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
@@ -7,8 +7,6 @@ public class OutlinedCardTests : TestBase
     [Test]
     public async Task OutlinedCard_UsesThemeColorForBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Card> card = await LoadXaml<Card>(
             @"<materialDesign:Card Content=""Hello World"" Style=""{StaticResource MaterialDesignOutlinedCard}""/>");
@@ -20,15 +18,11 @@ public async Task OutlinedCard_UsesThemeColorForBorder()
 
         //Assert
         await Assert.That(internalBorderColor).IsEqualTo(dividerColor);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OutlinedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Card> card = await LoadXaml<Card>(
             @"<materialDesign:Card Content=""Hello World"" Style=""{StaticResource MaterialDesignOutlinedCard}"" UniformCornerRadius=""5"" />");
@@ -42,7 +36,5 @@ public async Task OutlinedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnB
         await Assert.That(internalBorderCornerRadius.Value.TopRight).IsEqualTo(5);
         await Assert.That(internalBorderCornerRadius.Value.BottomRight).IsEqualTo(5);
         await Assert.That(internalBorderCornerRadius.Value.BottomLeft).IsEqualTo(5);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
index 922a0b5cd8..3a6a95acda 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
@@ -8,8 +8,6 @@ public class ColorPickerTests : TestBase
     [Test]
     public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<ColorPicker> colorPicker = await LoadXaml<ColorPicker>(@"
     <materialDesign:ColorPicker Width=""400"" Height=""100"" Color=""Red""/>");
 
@@ -30,7 +28,5 @@ public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
 
         double currentBrightness = (await colorPicker.GetColor()).ToHsb().Brightness;
         await Assert.That(currentBrightness).IsLessThan(lastBrightness);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
index bc8dca69ca..9e80946bb5 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
@@ -18,8 +18,6 @@ public class ColorZoneTests : TestBase
     [Arguments(ColorZoneMode.Dark, "MaterialDesign.Brush.ColorZone.DarkBackground", "MaterialDesign.Brush.ColorZone.DarkForeground")]
     public async Task Mode_SetsThemeColors(ColorZoneMode mode, string backgroundBrush, string foregroundBrush)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<ColorZone> colorZone = await LoadXaml<ColorZone>(@$"
 <materialDesign:ColorZone Mode=""{mode}""/>
 ");
@@ -28,7 +26,5 @@ public async Task Mode_SetsThemeColors(ColorZoneMode mode, string backgroundBrus
 
         await Assert.That(await colorZone.GetBackgroundColor()).IsEqualTo(background);
         await Assert.That(await colorZone.GetForegroundColor()).IsEqualTo(foreground);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
index 1510cf2b05..8d0c76bd33 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
@@ -9,8 +9,6 @@ public class ComboBoxTests : TestBase
     [Description("Pull Request 2192")]
     public async Task OnComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <ComboBox
@@ -22,15 +20,12 @@ public async Task OnComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     [Description("Pull Request 2192")]
     public async Task OnFilledComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <ComboBox
@@ -43,15 +38,12 @@ public async Task OnFilledComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2495")]
     public async Task OnComboBox_WithClearButton_ClearsSelection()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>($@"
 <StackPanel>
     <ComboBox materialDesign:HintAssist.Hint=""OS""
@@ -81,16 +73,12 @@ await Wait.For(async () =>
             selectedIndex = await comboBox.GetSelectedIndex();
             await Assert.That(selectedIndex >= 0).IsFalse();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2690")]
     public async Task OnEditableComboBox_WithDefaultContextMenu_ShowsCutCopyPaste()
     {
-        await using var recorder = new TestRecorder(App);
-
         var comboBox = await LoadXaml<ComboBox>(@"
 <ComboBox IsEditable=""True"" Width=""200"" Style=""{StaticResource MaterialDesignComboBox}"">
     <ComboBoxItem Content=""Select1"" />
@@ -108,9 +96,6 @@ public async Task OnEditableComboBox_WithDefaultContextMenu_ShowsCutCopyPaste()
         await AssertMenu("Cut");
         await AssertMenu("Copy");
         await AssertMenu("Paste");
-
-        recorder.Success();
-
         async Task AssertMenu(string menuHeader)
         {
             var menuItem = await contextMenu!.GetElement(ElementQuery.PropertyExpression<MenuItem>(x => x.Header, menuHeader));
@@ -122,8 +107,6 @@ async Task AssertMenu(string menuHeader)
     [Description("Issue 2713")]
     public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel Orientation=""Horizontal"">
     <ComboBox x:Name=""EditableComboBox"" IsEditable=""True"" Style=""{StaticResource MaterialDesignComboBox}"">
@@ -159,8 +142,6 @@ public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
         await Assert.That(wasOpenAfterClickOnEditableTextBox).IsFalse().Because("ComboBox should not have opened drop down when clicking the editable ait wTextBox");
         await Assert.That(textBoxHasFocus).IsTrue().Because("Editable TextBox should have focus");
         await Assert.That(textBoxHasKeyboardFocus).IsTrue().Because("Editable TextBox should have keyboard focus");
-
-        recorder.Success();
     }
 
     [Test]
@@ -175,8 +156,6 @@ public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
     [Arguments("MaterialDesignOutlinedComboBox", 20)]
     public async Task ComboBox_WithHintAndHelperText_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -200,8 +179,6 @@ public async Task ComboBox_WithHintAndHelperText_RespectsPadding(string styleNam
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -216,8 +193,6 @@ public async Task ComboBox_WithHintAndHelperText_RespectsPadding(string styleNam
     [Arguments("MaterialDesignOutlinedComboBox", 20)]
     public async Task ComboBox_WithHintAndValidationError_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -249,8 +224,6 @@ public async Task ComboBox_WithHintAndValidationError_RespectsPadding(string sty
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -261,8 +234,6 @@ public async Task ComboBox_WithHintAndValidationError_RespectsPadding(string sty
     [Description("Issue 3433")]
     public async Task ComboBox_WithHorizontalContentAlignment_RespectsAlignment(HorizontalAlignment alignment)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>($"""
             <StackPanel>
               <ComboBox HorizontalContentAlignment="{alignment}">
@@ -274,8 +245,6 @@ public async Task ComboBox_WithHorizontalContentAlignment_RespectsAlignment(Hori
         var selectedItemPresenter = await comboBox.GetElement<ContentPresenter>("contentPresenter");
 
         await Assert.That(await selectedItemPresenter.GetHorizontalAlignment()).IsEqualTo(alignment);
-
-        recorder.Success();
     }
 
     [Test]
@@ -285,8 +254,6 @@ public async Task ComboBox_WithHorizontalContentAlignment_RespectsAlignment(Hori
     [Description("Issue 3623")]
     public async Task ComboBox_BorderShouldDependOnAppliedStyle(string style, double left, double top, double right, double bottom)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>($$"""
              <StackPanel>
                <ComboBox Style="{StaticResource {{style}}}">
@@ -301,7 +268,5 @@ public async Task ComboBox_BorderShouldDependOnAppliedStyle(string style, double
 
         Thickness thickness = await border.GetBorderThickness();
         await Assert.That(thickness).IsEqualTo(new Thickness(left, top, right, bottom));
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ContentControls/ContentControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ContentControls/ContentControlTests.cs
index 5350a69079..de345be9e4 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ContentControls/ContentControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ContentControls/ContentControlTests.cs
@@ -9,8 +9,6 @@ public class ContentControlTests : TestBase
     [Description("Issue 2510")]
     public async Task ClearButton_InsideOfControlTemplate_CanStillClearContent()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var grid = await LoadXaml<ContentControl>(@"
 <ContentControl>
@@ -34,8 +32,6 @@ await Wait.For(async () =>
         {
             await Assert.That(await textBox.GetText()).IsNullOrEmpty();
         });
-
-        recorder.Success();
     }
 
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
index f7428f0489..d0c246dd5f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
@@ -12,8 +12,6 @@ public class DatePickerTests : TestBase
     [Description("Pull Request 2192")]
     public async Task OnDatePickerHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <DatePicker materialDesign:HintAssist.HelperTextFontSize=""20""/>
@@ -25,15 +23,12 @@ public async Task OnDatePickerHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2495")]
     public async Task OnDatePicker_WithClearButton_ClearsSelectedDate()
     {
-        await using var recorder = new TestRecorder(App);
-
         string dateString = DateTime.Today.ToString("d", CultureInfo.GetCultureInfoByIetfLanguageTag("en-US"));
         var stackPanel = await LoadXaml<StackPanel>($@"
 <StackPanel>
@@ -53,16 +48,12 @@ await Wait.For(async () =>
             selectedDate = await datePicker.GetSelectedDate();
             await Assert.That(selectedDate).IsNull();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3369")]
     public async Task OnDatePicker_WithClearButton_ClearsSelectedUncommittedText()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
@@ -84,16 +75,12 @@ await Wait.For(async () => {
             string? text = await datePickerTextBox.GetText();
             await Assert.That(text).IsNull();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2737")]
     public async Task OutlinedDatePicker_RespectsActiveAndInactiveBorderThickness_WhenAttachedPropertiesAreSet()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var expectedInactiveBorderThickness = new Thickness(4, 3, 2, 1);
         var expectedActiveBorderThickness = new Thickness(1, 2, 3, 4);
@@ -139,8 +126,6 @@ public async Task OutlinedDatePicker_RespectsActiveAndInactiveBorderThickness_Wh
         await Assert.That(hoverBorderThickness).IsEqualTo(expectedActiveBorderThickness);
         await Assert.That(focusedBorderThickness).IsEqualTo(expectedActiveBorderThickness);
         await Assert.That(withErrorBorderThickness).IsEqualTo(expectedActiveBorderThickness);
-
-        recorder.Success();
     }
 
     [Test]
@@ -155,8 +140,6 @@ public async Task OutlinedDatePicker_RespectsActiveAndInactiveBorderThickness_Wh
     [Arguments("MaterialDesignOutlinedDatePicker", 20)]
     public async Task DatePicker_WithHintAndHelperText_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -180,8 +163,6 @@ public async Task DatePicker_WithHintAndHelperText_RespectsPadding(string styleN
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -196,8 +177,6 @@ public async Task DatePicker_WithHintAndHelperText_RespectsPadding(string styleN
     [Arguments("MaterialDesignOutlinedDatePicker", 20)]
     public async Task DatePicker_WithHintAndValidationError_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -229,16 +208,12 @@ public async Task DatePicker_WithHintAndValidationError_RespectsPadding(string s
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3365")]
     public async Task DatePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_ShouldApplyDefaultBackgroundWhenFloated()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
@@ -261,8 +236,6 @@ public async Task DatePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_Shoul
 
         // Assert (focused state)
         await Assert.That(await hintBackgroundGrid.GetBackgroundColor()).IsEqualTo(defaultFloatedBackground);
-
-        recorder.Success();
     }
 
     [Test]
@@ -273,8 +246,6 @@ public async Task DatePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_Shoul
     [Arguments("MaterialDesignOutlinedDatePicker")]
     public async Task DatePicker_WithCustomHintBackgroundSet_ShouldApplyHintBackground(string style)
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>($$"""
             <StackPanel>
@@ -296,16 +267,12 @@ public async Task DatePicker_WithCustomHintBackgroundSet_ShouldApplyHintBackgrou
 
         // Assert (focused state)
         await Assert.That(await hintBackgroundBorder.GetBackgroundColor()).IsEqualTo(Colors.Red);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3547")]
     public async Task DatePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringCalendarButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         Thickness expectedThickness = Constants.DefaultOutlinedBorderActiveThickness;
         var stackPanel = await LoadXaml<StackPanel>("""
@@ -330,8 +297,6 @@ public async Task DatePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringCalendar
         // Assert
         await Assert.That(datePickerTextBoxHoverThickness).IsEqualTo(expectedThickness);
         await Assert.That(datePickerCalendarButtonHoverThickness).IsEqualTo(expectedThickness);
-
-        recorder.Success();
     }
 
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index b9b61f3ed2..7bd7881dc3 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -16,8 +16,6 @@ public DialogHostTests()
     [Test]
     public async Task OnOpenDialog_OverlayCoversContent()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement dialogHost = await LoadUserControl<WithCounter>();
         var overlay = await dialogHost.GetElement<Grid>("PART_ContentCoverGrid");
 
@@ -54,16 +52,12 @@ await Wait.For(async () =>
         {
             await Assert.That((await resultTextBlock.GetText())!).IsEqualTo("Clicks: 2");
         }, retry);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2282")]
     public async Task ClosingDialogWithIsOpenProperty_ShouldRaiseDialogClosingEvent()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement dialogHost = await LoadUserControl<ClosingEventCounter>();
         var showButton = await dialogHost.GetElement<Button>("ShowDialogButton");
         var closeButton = await dialogHost.GetElement<Button>("CloseButton");
@@ -78,15 +72,12 @@ await Wait.For(async () =>
         {
             await Assert.That(await resultTextBlock.GetText()).IsEqualTo("1");
         });
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2398")]
     public async Task FontSettingsShouldInheritIntoDialog()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement grid = await LoadXaml<Grid>(@"
 <Grid TextElement.FontSize=""42""
       TextElement.FontFamily=""Times New Roman""
@@ -125,16 +116,12 @@ public async Task FontSettingsShouldInheritIntoDialog()
         await Assert.That(await text2.GetFontSize()).IsEqualTo(42);
         await Assert.That((await text2.GetFontFamily())?.FamilyNames.Values.Contains("Times New Roman")).IsTrue();
         await Assert.That(await text2.GetFontWeight()).IsEqualTo(FontWeights.ExtraBold);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("PR 2236")]
     public async Task ContentBackground_SetsDialogBackground()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement grid = await LoadXaml<Grid>(@"
 <Grid>
   <Grid.ColumnDefinitions>
@@ -171,8 +158,6 @@ await Wait.For(async () =>
             await Assert.That(await card1.GetBackgroundColor()).IsEqualTo(Colors.Red);
             await Assert.That(await card2.GetBackgroundColor()).IsEqualTo(Colors.Red);
         });
-
-        recorder.Success();
     }
 
     [Test]
@@ -181,8 +166,6 @@ await Wait.For(async () =>
     [Arguments(BaseTheme.Light)]
     public async Task DialogBackgroundShouldInheritThemeBackground(BaseTheme dialogTheme)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement grid = await LoadXaml<Grid>($@"
 <Grid>
   <Grid.ColumnDefinitions>
@@ -251,16 +234,12 @@ await AssertContrastRatio(
                 await textBlock2.GetEffectiveBackground(),
                 MinimumContrastSmallText);
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2772")]
     public async Task CornerRadius_AppliedToContentCoverBorder_WhenSetOnDialogHost()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement grid = await LoadXaml<Grid>(@"
 <Grid>
   <materialDesign:DialogHost x:Name=""DialogHost"" CornerRadius=""1,2,3,4"">
@@ -285,16 +264,12 @@ await Wait.For(async () =>
             await Assert.That((await contentCoverBorder.GetCornerRadius()).BottomRight).IsEqualTo(3);
             await Assert.That((await contentCoverBorder.GetCornerRadius()).BottomLeft).IsEqualTo(4);
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2772")]
     public async Task CornerRadius_AppliedToContentCoverBorder_WhenSetOnEmbeddedDialogHost()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement grid = await LoadXaml<Grid>(@"
 <Grid>
   <materialDesign:DialogHost x:Name=""DialogHost"" Style=""{StaticResource MaterialDesignEmbeddedDialogHost}"" CornerRadius=""1,2,3,4"">
@@ -319,16 +294,12 @@ await Wait.For(async () =>
             await Assert.That((await contentCoverBorder.GetCornerRadius()).BottomRight).IsEqualTo(3);
             await Assert.That((await contentCoverBorder.GetCornerRadius()).BottomLeft).IsEqualTo(4);
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3069")]
     public async Task DialogHost_WithOpenDialog_ShowsPopupWhenLoaded()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> rootGrid = (await LoadUserControl<LoadAndUnloadControl>()).As<Grid>();
 
         IVisualElement<Button> loadButton = await rootGrid.GetElement<Button>("LoadDialogHost");
@@ -356,16 +327,12 @@ await Wait.For(async () =>
             await closeButton.LeftClick();
             await Assert.That(await dialogHost.GetIsOpen()).IsFalse();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3094")]
     public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenRestoringFocus()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocus>()).As<Grid>();
         IVisualElement<TabItem> tabItem1 = await rootGrid.GetElement<TabItem>("TabItem1");
         IVisualElement<TabItem> tabItem2 = await rootGrid.GetElement<TabItem>("TabItem2");
@@ -388,16 +355,12 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
 
         await Assert.That(await tabItem1.GetIsSelected()).IsTrue();
         await Assert.That(await tabItem2.GetIsSelected()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3094")]
     public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhenRestoringFocus()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocus>()).As<Grid>();
         IVisualElement<TabItem> railItem1 = await rootGrid.GetElement<TabItem>("RailItem1");
         IVisualElement<TabItem> railItem2 = await rootGrid.GetElement<TabItem>("RailItem2");
@@ -420,16 +383,12 @@ public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhe
 
         await Assert.That(await railItem1.GetIsSelected()).IsTrue();
         await Assert.That(await railItem2.GetIsSelected()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3094")]
     public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenRestoreFocusIsDisabled()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusDisabled>()).As<Grid>();
         IVisualElement<TabItem> tabItem1 = await rootGrid.GetElement<TabItem>("TabItem1");
         IVisualElement<TabItem> tabItem2 = await rootGrid.GetElement<TabItem>("TabItem2");
@@ -452,16 +411,12 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
 
         await Assert.That(await tabItem1.GetIsSelected()).IsTrue();
         await Assert.That(await tabItem2.GetIsSelected()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3094")]
     public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhenRestoreFocusIsDisabled()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusDisabled>()).As<Grid>();
         IVisualElement<TabItem> railItem1 = await rootGrid.GetElement<TabItem>("RailItem1");
         IVisualElement<TabItem> railItem2 = await rootGrid.GetElement<TabItem>("RailItem2");
@@ -484,16 +439,12 @@ public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhe
 
         await Assert.That(await railItem1.GetIsSelected()).IsTrue();
         await Assert.That(await railItem2.GetIsSelected()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3450")]
     public async Task DialogHost_WithComboBox_CanSelectItem()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement dialogHost = await LoadUserControl<WithComboBox>();
 
         var comboBox = await dialogHost.GetElement<ComboBox>("TargetedPlatformComboBox");
@@ -509,9 +460,6 @@ await Wait.For(async () =>
             var index = await comboBox.GetSelectedIndex();
             await Assert.That(index).IsEqualTo(1);
         });
-
-
-        recorder.Success();
     }
 
     [Test]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
index 65b61a7d73..bd2a00dc0b 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
@@ -10,8 +10,6 @@ public class DialogHostTests : TestBase
     [Test]
     public async Task DrawerHost_OpenAndClose_RaisesEvents()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<DrawerHost> drawerHost = await LoadXaml<DrawerHost>(@"
 <materialDesign:DrawerHost>
   <materialDesign:DrawerHost.LeftDrawerContent>
@@ -80,15 +78,11 @@ await Wait.For(async () =>
             var invocations = await closingEvent.GetInvocations();
             await Assert.That(invocations.Count).IsEqualTo(2);
         });
-
-        recorder.Success();
     }
 
     [Test]
     public async Task DrawerHost_CancelingClosingEvent_DrawerStaysOpen()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<DrawerHost> drawerHost = (await LoadUserControl<CancellingDrawerHost>()).As<DrawerHost>();
         var showButton = await drawerHost.GetElement<Button>("ShowButton");
         var closeButton = await drawerHost.GetElement<Button>("CloseButton");
@@ -120,17 +114,12 @@ public async Task DrawerHost_CancelingClosingEvent_DrawerStaysOpen()
         await Task.Delay(100, TestContext.Current.CancellationToken);
         await Wait.For(async () => (await closingEvent.GetInvocations()).Count == 3);
         await Assert.That(await drawerHost.GetIsLeftDrawerOpen()).IsTrue();
-
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3224")]
     public async Task DrawerHost_ShouldInvokeCustomContentTemplateSelector_WhenSetExplicitly()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         IVisualElement<Grid> grid = await LoadXaml<Grid>("""
             <Grid>
@@ -175,8 +164,6 @@ public async Task DrawerHost_ShouldInvokeCustomContentTemplateSelector_WhenSetEx
         await Assert.That(topDrawerContent).IsEqualTo("TopDrawerContent");
         await Assert.That(rightDrawerContent).IsEqualTo("RightDrawerContent");
         await Assert.That(bottomDrawerContent).IsEqualTo("BottomDrawerContent");
-
-        recorder.Success();
     }
 }
 
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
index 27d026ef55..162aa8ea64 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
@@ -7,8 +7,6 @@ public class ClassicFlipperTests : TestBase
     [Test]
     public async Task UniformCornerRadiusAndOutlinedCardStyleAttachedPropertiesApplied_AppliesCornerRadiusOnBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<FlipperClassic> flipper = await LoadXaml<FlipperClassic>(
             """
@@ -22,15 +20,11 @@ public async Task UniformCornerRadiusAndOutlinedCardStyleAttachedPropertiesAppli
 
         //Assert
         await Assert.That(internalBorderCornerRadius).IsEqualTo(new CornerRadius(5));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task UniformCornerRadiusAndElevatedCardStyleAttachedPropertiesApplied_AppliesCornerRadiusOnBorder()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<FlipperClassic> flipper = await LoadXaml<FlipperClassic>(
             """
@@ -46,15 +40,11 @@ public async Task UniformCornerRadiusAndElevatedCardStyleAttachedPropertiesAppli
 
         //Assert
         await Assert.That(internalBorderCornerRadius).IsEqualTo(new CornerRadius(5));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task ElevatedCardStyleApplied_AppliesDefaultElevation()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<FlipperClassic> flipper = await LoadXaml<FlipperClassic>(
             """
@@ -69,7 +59,5 @@ public async Task ElevatedCardStyleApplied_AppliesDefaultElevation()
 
         //Assert
         await Assert.That(defaultElevation).IsEqualTo(Elevation.Dp1);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
index 1df6d67ba8..a4028926f8 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
@@ -8,8 +8,6 @@ public class ListBoxTests : TestBase
     [Test]
     public async Task OnMouseOver_BackgroundIsSet()
     {
-        await using var recorder = new TestRecorder(App);
-
         var listBox = await LoadXaml<ListBox>(@"
 <ListBox MinWidth=""200"">
     <ListBoxItem Content=""Item1"" />
@@ -40,8 +38,6 @@ await Wait.For(async () =>
 
         //float? contrastRatio = foreground?.ContrastRatio(effectiveBackground);
         //await Assert.True(contrastRatio >= MaterialDesignSpec.MinimumContrastSmallText);
-
-        recorder.Success();
     }
 
     [Test]
@@ -60,8 +56,6 @@ await Wait.For(async () =>
     [Arguments("MaterialDesignChoiceChipSecondaryOutlineListBox")]
     public async Task OnClickChoiceChipListBox_ChangesSelectedItem(string listBoxStyle)
     {
-        await using var recorder = new TestRecorder(App);
-
         var listBox = await LoadXaml<ListBox>($@"
 <ListBox x:Name=""ChipsListBox"" Style=""{{StaticResource {listBoxStyle}}}"">
     <ListBoxItem>Mercury</ListBoxItem>
@@ -74,15 +68,11 @@ public async Task OnClickChoiceChipListBox_ChangesSelectedItem(string listBoxSty
         await earth.LeftClick();
 
         await Wait.For(async () => await Assert.That(await listBox.GetSelectedIndex()).IsEqualTo(2));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task ScrollBarAssist_ButtonsVisibility_HidesButtonsOnMinimalistStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         string xaml = @"<ListBox Height=""300"" Width=""300""
 materialDesign:ScrollBarAssist.ButtonsVisibility=""Collapsed"" 
 ScrollViewer.HorizontalScrollBarVisibility=""Visible"" 
@@ -116,14 +106,11 @@ public async Task ScrollBarAssist_ButtonsVisibility_HidesButtonsOnMinimalistStyl
         await Assert.That(await leftButton.GetIsVisible()).IsFalse();
         var rightButton = await horizontalScrollBar.GetElement<RepeatButton>("PART_LineRightButton");
         await Assert.That(await rightButton.GetIsVisible()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OnListBoxAssist_WithShowSelectDisabled_SelectionIsDisabled()
     {
-        await using var recorder = new TestRecorder(App);
         var listBox = await LoadXaml<ListBox>($@"
 <ListBox materialDesign:ListBoxItemAssist.ShowSelection=""False"">
     <ListBoxItem>Mercury</ListBoxItem>
@@ -136,16 +123,12 @@ public async Task OnListBoxAssist_WithShowSelectDisabled_SelectionIsDisabled()
         await earth.LeftClick();
         var selectedBorder = await earth.GetElement<Border>("SelectedBorder");
         await Wait.For(async () => await Assert.That(await selectedBorder.GetIsVisible()).IsFalse() == false);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3188")]
     public async Task OnToggle_ShouldGrabFocus()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel Orientation="Vertical">
                 <ListBox MinWidth="200"
@@ -171,7 +154,5 @@ public async Task OnToggle_ShouldGrabFocus()
 
         // Assert
         await Wait.For(async () => await Assert.That(await listBox.GetIsKeyboardFocusWithin()).IsTrue());
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 2fa20cad0a..8178066795 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -10,8 +10,6 @@ public class PasswordBoxTests : TestBase
     [Test]
     public async Task OnClearButtonShown_LayoutDoesNotChange()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
@@ -27,16 +25,12 @@ public async Task OnClearButtonShown_LayoutDoesNotChange()
         //Assert
         var rect = await passwordBox.GetCoordinates();
         await Assert.That(rect).IsEqualTo(initialRect);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Pull Request 2192")]
     public async Task OnPasswordBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <PasswordBox materialDesign:HintAssist.HelperTextFontSize=""20""/>
@@ -47,15 +41,12 @@ public async Task OnPasswordBoxHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2495")]
     public async Task OnPasswordBox_WithClearButton_ClearsPassword()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <PasswordBox materialDesign:TextFieldAssist.HasClearButton=""True"" />
@@ -76,16 +67,12 @@ await Wait.For(async () =>
             password = await passwordBox.GetPassword();
             await Assert.That(password).IsNull();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("PR 2828 and Issue 2930")]
     public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBinding()
     {
-        await using var recorder = new TestRecorder(App);
-
         await App.InitializeWithMaterialDesign();
         IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
         var userControl = await window.GetElement<BoundPasswordBox>();
@@ -127,16 +114,12 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
         await Assert.That(boundText3).IsEqualTo("3");
         await Assert.That(password3).IsEqualTo("3");
         await Assert.That(clearTextPassword3).IsEqualTo("3");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2930")]
     public async Task PasswordBox_WithBoundPasswordProperty_RespectsBinding()
     {
-        await using var recorder = new TestRecorder(App);
-
         await App.InitializeWithMaterialDesign();
         IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
         var userControl = await window.GetElement<BoundPasswordBox>();
@@ -159,16 +142,12 @@ public async Task PasswordBox_WithBoundPasswordProperty_RespectsBinding()
 
         await Assert.That(boundText2).IsEqualTo("2");
         await Assert.That(password2).IsEqualTo("2");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2998")]
     public async Task PasswordBox_WithRevealStyle_RespectsMaxLength()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <PasswordBox MaxLength=""5"" Style=""{StaticResource MaterialDesignFloatingHintRevealPasswordBox}"" />
@@ -181,8 +160,6 @@ public async Task PasswordBox_WithRevealStyle_RespectsMaxLength()
 
         // Assert
         await Assert.That(maxLength2).IsEqualTo(maxLength1);
-
-        recorder.Success();
     }
 
     [Test]
@@ -206,8 +183,6 @@ public async Task PasswordBox_WithRevealStyle_RespectsMaxLength()
     [Arguments("MaterialDesignOutlinedRevealPasswordBox", 20)]
     public async Task PasswordBox_WithHintAndHelperText_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -233,8 +208,6 @@ await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.V
             .IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordinates.Value.Left))
             .IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -258,8 +231,6 @@ await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordin
     [Arguments("MaterialDesignOutlinedRevealPasswordBox", 20)]
     public async Task PasswordBox_WithHintAndValidationError_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -293,8 +264,6 @@ await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.V
             .IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordinates.Value.Left))
             .IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -302,8 +271,6 @@ await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordi
     [Description("Issue 3095")]
     public async Task PasswordBox_WithRevealedPassword_RespectsKeyboardTabNavigation()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel Orientation=""Vertical"">
   <TextBox x:Name=""TextBox1"" Width=""200"" />
@@ -331,16 +298,12 @@ public async Task PasswordBox_WithRevealedPassword_RespectsKeyboardTabNavigation
         await Assert.That(await revealPasswordTextBox.GetIsKeyboardFocused()).IsTrue();
         await revealPasswordTextBox.SendKeyboardInput($"{Key.Tab}{ModifierKeys.None}");
         await Assert.That(await textBox1.GetIsKeyboardFocused()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3799")]
     public async Task PasswordBox_WithRevealButtonIsTabStopSetToFalse_RespectsKeyboardTabNavigation()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel Orientation="Vertical">
               <PasswordBox x:Name="PasswordBox" Width="200"
@@ -362,7 +325,5 @@ public async Task PasswordBox_WithRevealButtonIsTabStopSetToFalse_RespectsKeyboa
         // Assert Tab backwards
         await textBox.SendKeyboardInput($"{ModifierKeys.Shift}{Key.Tab}{ModifierKeys.None}");
         await Assert.That(await passwordBox.GetIsKeyboardFocused()).IsTrue();
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
index 01e36bf64d..d66152e4cd 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
@@ -13,8 +13,6 @@ public class PopupBoxTests : TestBase
     [Description("Issue 3129")]
     public async Task PopupBox_WithElevation_AppliesElevationToNestedCard(Elevation elevation)
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<PopupBox> popupBox = await LoadXaml<PopupBox>($@"
 <materialDesign:PopupBox VerticalAlignment=""Top""
@@ -29,15 +27,11 @@ public async Task PopupBox_WithElevation_AppliesElevationToNestedCard(Elevation
 
         // Assert
         await Assert.That(await card.GetProperty<Elevation?>(ElevationAssist.ElevationProperty)).IsEqualTo(elevation);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task PopupBox_WithContentTemplateSelector_ChangesContent()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement grid = (await LoadUserControl<PopupBoxWithTemplateSelector>());
 
@@ -56,8 +50,5 @@ await Wait.For(async () =>
             border = await popupBox.GetElement<Border>("ContentBorder");
             await Assert.That(await border.GetBackgroundColor()).IsEqualTo(Colors.Red);
         });
-
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
index dd5e096ad5..4c404fe84f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
@@ -8,8 +8,6 @@ public class SnackBarTests : TestBase
     [Description("Issue 1223")]
     public async Task SnackBar_WithFontSizeAndWeight_AffectsDisplayedMessage()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Snackbar> snackBar = await LoadXaml<Snackbar>("""
             <materialDesign:Snackbar
@@ -24,7 +22,5 @@ public async Task SnackBar_WithFontSizeAndWeight_AffectsDisplayedMessage()
         // Assert
         await Assert.That(await textBlock.GetFontSize()).IsEqualTo(14);
         await Assert.That(await textBlock.GetFontWeight()).IsEqualTo(FontWeights.Bold);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
index 3d77b1ef1f..16cb9445c3 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
@@ -10,8 +10,6 @@ public class SplitButtonTests : TestBase
     [Test]
     public async Task SplitButton_ClickingSplitButton_ShowsPopup()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
             <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -30,15 +28,11 @@ public async Task SplitButton_ClickingSplitButton_ShowsPopup()
         // Assert
         await Wait.For(async () => await popupBox.GetIsPopupOpen());
         await Wait.For(async () => await popupContent.GetIsVisible());
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SplitButton_RegisterForClick_RaisesEvent()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
             <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -65,15 +59,11 @@ public async Task SplitButton_RegisterForClick_RaisesEvent()
         await Assert.That(leftButtonCount).IsEqualTo(1);
         //NB: The popup box button should only show the popup not trigger the click event
         await Assert.That(rightButtonCount).IsEqualTo(1);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SplitButton_WithButtonInPopup_CanBeInvoked()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
             <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -94,7 +84,7 @@ public async Task SplitButton_WithButtonInPopup_CanBeInvoked()
         await Wait.For(async () => await popupContent.GetIsVisible());
         await Wait.For(async () => await popupContent.GetActualHeight() > 10);
 
-        await recorder.SaveScreenshot("PopupOpen");
+        await Recorder.SaveScreenshot("PopupOpen");
 
         await popupContent.LeftClick();
         await Task.Delay(50, TestContext.Current!.CancellationToken);
@@ -102,15 +92,11 @@ public async Task SplitButton_WithButtonInPopup_CanBeInvoked()
         // Assert
         var invocations = await clickEvent.GetInvocations();
         await Assert.That(invocations).HasSingleItem();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SplitButton_RegisterCommandBinding_InvokesCommand()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         await App.InitializeWithMaterialDesign();
         IWindow window = await App.CreateWindow<SplitButtonWithCommandBindingWindow>();
@@ -125,15 +111,11 @@ public async Task SplitButton_RegisterCommandBinding_InvokesCommand()
 
         // Assert
         await Assert.That(await userControl.GetCommandInvoked()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SplitButton_CommandCanExecuteFalse_DisablesButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         await App.InitializeWithMaterialDesign();
         IWindow window = await App.CreateWindow<SplitButtonWithCommandBindingWindow>();
@@ -147,15 +129,11 @@ public async Task SplitButton_CommandCanExecuteFalse_DisablesButton()
 
         // Assert
         await Assert.That(await splitButton.GetIsEnabled()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SplitButton_ClickingPopupContent_DoesNotExecuteSplitButtonClick()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
             <materialDesign:SplitButton VerticalAlignment="Bottom"
@@ -184,7 +162,5 @@ public async Task SplitButton_ClickingPopupContent_DoesNotExecuteSplitButtonClic
         // Assert
         await Assert.That(await splitButtonClickEvent.GetInvocations()).IsEmpty();
         await Assert.That(await popupContentClickEvent.GetInvocations()).HasSingleItem();
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
index 3250ffa597..e898f5a21f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
@@ -11,8 +11,6 @@ public class TabControlTests : TestBase
     [Description("Issue 2602")]
     public async Task OnLoad_ThemeBrushesSet()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(@"
 <TabControl 
@@ -59,8 +57,6 @@ public async Task OnLoad_ThemeBrushesSet()
     [Arguments("", false)]
     public async Task TabItem_ShouldKeepDataContext_WhenContextMenuOpens(string horizontalContentAlignment, bool hasUniformTabWidth)
     {
-        await using var recorder = new TestRecorder(App);
-
         string alignment = string.Empty;
         if (!string.IsNullOrEmpty(horizontalContentAlignment))
         {
@@ -116,16 +112,12 @@ public async Task TabItem_ShouldKeepDataContext_WhenContextMenuOpens(string hori
         tabItem = await tabControl.GetElement<TabItem>();
         dataContext = await tabItem.GetDataContext();
         await Assert.That(dataContext).IsEqualTo("aaaa");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3271")]
     public async Task TabControl_ShouldRespectSelectedContentTemplate_WhenSetDirectlyOnTabItem()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>("""
             <TabControl materialDesign:ColorZoneAssist.Mode="PrimaryMid"
@@ -150,8 +142,6 @@ public async Task TabControl_ShouldRespectSelectedContentTemplate_WhenSetDirectl
         //Assert
         await Assert.That(await customContentBorder.GetBackgroundColor()).IsEqualTo(Colors.Fuchsia);
         await Assert.That(await customContent.GetText()).IsEqualTo("Tab content string");
-
-        recorder.Success();
     }
 
     [Test]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
index 59d12c2c9a..17f024874f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
@@ -11,8 +11,6 @@ public class TextBoxTests : TestBase
     [Description("Issue 1883")]
     public async Task OnClearButtonShown_ControlHeightDoesNotChange()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
@@ -38,16 +36,12 @@ public async Task OnClearButtonShown_ControlHeightDoesNotChange()
 
         double height = await textBox.GetActualHeight();
         await Assert.That(height).IsEqualTo(initialHeight);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 1883")]
     public async Task OnClearButtonWithHintShown_ControlHeightDoesNotChange()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
@@ -77,16 +71,12 @@ public async Task OnClearButtonWithHintShown_ControlHeightDoesNotChange()
         //Assert
         double height = await textBox.GetActualHeight();
         await Assert.That(height).IsEqualTo(initialHeight);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 1979")]
     public async Task OnTextCleared_MultilineTextBox()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var grid = await LoadXaml<Grid>(@"
 <Grid>
@@ -110,15 +100,12 @@ public async Task OnTextCleared_MultilineTextBox()
         await Wait.For(async () => await Assert.That(await textBox.GetActualHeight()).IsEqualTo(initialHeight));
         Rect rect = await textBox.GetCoordinates();
         await Assert.That(rect).IsEqualTo(initialRect);
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2495")]
     public async Task OnTextBox_WithClearButton_ClearsText()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox VerticalAlignment=""Top""
@@ -140,16 +127,12 @@ await Wait.For(async () =>
             text = await textBox.GetText();
             await Assert.That(text).IsNull();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2002")]
     public async Task OnTextBoxDisabled_FloatingHintBackgroundIsOpaque()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Background=""Red"">
     <TextBox
@@ -169,15 +152,12 @@ public async Task OnTextBoxDisabled_FloatingHintBackgroundIsOpaque()
         Color background = await hintBackground.GetEffectiveBackground(contentGrid);
 
         await Assert.That(background.A).IsEqualTo<byte>(255);
-        recorder.Success();
     }
 
     [Test]
     [Description("Pull Request 2192")]
     public async Task OnTextBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox VerticalAlignment=""Top""
@@ -191,14 +171,11 @@ public async Task OnTextBoxHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     public async Task CharacterCount_WithMaxLengthSet_IsDisplayed()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox
@@ -213,15 +190,11 @@ public async Task CharacterCount_WithMaxLengthSet_IsDisplayed()
         await textBox.SetText("12345");
 
         await Assert.That(await characterCounter.GetText()).IsEqualTo("5 / 10");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CharacterCount_WithoutMaxLengthSet_IsCollapsed()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox />
@@ -230,15 +203,11 @@ public async Task CharacterCount_WithoutMaxLengthSet_IsCollapsed()
         var characterCounter = await textBox.GetElement<TextBlock>("CharacterCounterTextBlock");
 
         await Assert.That(await characterCounter.GetIsVisible()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CharacterCount_WithMaxLengthSetAndCharacterCounterVisibilityCollapsed_IsNotDisplayed()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox
@@ -250,16 +219,12 @@ public async Task CharacterCount_WithMaxLengthSetAndCharacterCounterVisibilityCo
         var characterCounter = await textBox.GetElement<TextBlock>("CharacterCounterTextBlock");
 
         await Assert.That(await characterCounter.GetIsVisible()).IsFalse();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2300")]
     public async Task HelperText_CanSetFontColorWithAttachedStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>(@"
 <Grid Margin=""30"">
     <TextBox
@@ -275,16 +240,12 @@ public async Task HelperText_CanSetFontColorWithAttachedStyle()
         var helperText = await textBox.GetElement<TextBlock>("HelperTextTextBlock");
 
         await Assert.That(await helperText.GetForegroundColor()).IsEqualTo(Colors.Red);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2362")]
     public async Task FloatingOffset_ValuesGetAppropriatelyApplied()
     {
-        await using var recorder = new TestRecorder(App);
-
         var textBox = await LoadXaml<TextBox>(@"
 <TextBox Style=""{StaticResource MaterialDesignFloatingHintTextBox}""
          materialDesign:HintAssist.Hint=""Hint with offset""
@@ -297,16 +258,12 @@ public async Task FloatingOffset_ValuesGetAppropriatelyApplied()
 
         await Assert.That(offset.X).IsEqualTo(1);
         await Assert.That(offset.Y).IsEqualTo(-42);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2390")]
     public async Task ContextMenu_FollowsTextBoxFontFamily()
     {
-        await using var recorder = new TestRecorder(App);
-
         var textBox = await LoadXaml<TextBox>(@"<TextBox FontFamily=""Times New Roman""/>");
 
         await textBox.RightClick();
@@ -319,16 +276,12 @@ await Wait.For(async () =>
         {
             await Assert.That(await contextMenu.GetFontFamily()).IsEqualTo(textBoxFont);
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2390")]
     public async Task ContextMenu_UsesInheritedFontFamily()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel TextElement.FontFamily=""Times New Roman"">
     <TextBox />
@@ -348,16 +301,12 @@ await Wait.For(async () =>
 
 
         await Assert.That(await contextMenu.GetFontFamily()).IsEqualTo(textBoxFont);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2430")]
     public async Task VerticalContentAlignment_ProperlyAlignsText()
     {
-        await using var recorder = new TestRecorder(App);
-
         var textBox = await LoadXaml<TextBox>($@"
     <TextBox Height=""100"" Text=""Test""/>
 ");
@@ -373,16 +322,12 @@ public async Task VerticalContentAlignment_ProperlyAlignsText()
             await textBox.SetVerticalContentAlignment(alignment);
             await Assert.That(await scrollViewer.GetVerticalContentAlignment()).IsEqualTo(alignment);
         }
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2596")]
     public async Task OutlinedTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <TextBox Style=""{StaticResource MaterialDesignOutlinedTextBox}""
@@ -410,16 +355,12 @@ public async Task OutlinedTextBox_ValidationErrorMargin_MatchesHelperTextMargin(
         await Assert.That(errorMargin.HasValue).IsTrue();
         await Assert.That(textBoxPadding.HasValue).IsTrue();
         await Assert.That(errorMargin.Value.Left - textBoxPadding.Value.Left).IsZero().Because($"Error text does not respect the padding of the TextBox: Error text Margin.Left ({errorMargin.Value.Left}) == TextBox Padding.Left ({textBoxPadding.Value.Left})");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2596")]
     public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <TextBox Style=""{StaticResource MaterialDesignFilledTextBox}""
@@ -448,8 +389,6 @@ public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
         await Assert.That(textBoxPadding.HasValue).IsTrue();
 
         await Assert.That(errorMargin.Value.Left - textBoxPadding.Value.Left).IsZero().Because($"Error text does not respect the padding of the TextBox: Error text Margin.Left ({errorMargin.Value.Left}) == TextBox Padding.Left ({textBoxPadding.Value.Left})");
-
-        recorder.Success();
     }
 
     [Test]
@@ -464,8 +403,6 @@ public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     [Arguments("MaterialDesignOutlinedTextBox", 20)]
     public async Task TextBox_WithHintAndHelperText_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -489,8 +426,6 @@ public async Task TextBox_WithHintAndHelperText_RespectsPadding(string styleName
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -505,8 +440,6 @@ public async Task TextBox_WithHintAndHelperText_RespectsPadding(string styleName
     [Arguments("MaterialDesignOutlinedTextBox", 20)]
     public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -538,8 +471,6 @@ public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styl
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -550,8 +481,6 @@ public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styl
     [Description("Issue 3161")]
     public async Task TextBox_MultiLineAndFixedHeight_RespectsVerticalContentAlignment(VerticalAlignment alignment, VerticalAlignment expectedFloatingHintAlignment)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>($$"""
             <StackPanel>
               <TextBox Style="{StaticResource MaterialDesignFilledTextBox}"
@@ -566,16 +495,12 @@ public async Task TextBox_MultiLineAndFixedHeight_RespectsVerticalContentAlignme
         IVisualElement<Grid> contentGrid = await textBox.GetElement<Grid>("ContentGrid");
 
         await Assert.That(await contentGrid.GetVerticalAlignment()).IsEqualTo(expectedFloatingHintAlignment);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3176")]
     public async Task ValidationErrorTemplate_WithChangingErrors_UpdatesValidation()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement userControl = await LoadUserControl<ValidationUpdates>();
         var textBox = await userControl.GetElement<TextBox>();
         var button = await userControl.GetElement<Button>();
@@ -588,16 +513,12 @@ await Wait.For(async() =>
 
             await Assert.That(await textBlock.GetText()).IsEqualTo("Some error + more");
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3914")]
     public async Task TextBox_ClearButtonRemainsHidden_WhenInitiallyCollapsedAndMadeVisible()
     {
-        await using var recorder = new TestRecorder(App);
-
         var grid = await LoadXaml<Grid>($"""
             <Grid Margin="30">
                 <TextBox Visibility="Collapsed"
@@ -615,8 +536,6 @@ public async Task TextBox_ClearButtonRemainsHidden_WhenInitiallyCollapsedAndMade
         Visibility clearButtonVisibility = await clearButton.GetVisibility();
 
         await Assert.That(clearButtonVisibility).IsEqualTo(Visibility.Collapsed);
-
-        recorder.Success();
     }
 }
 
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
index d1ba4a41cd..2ea5c684aa 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
@@ -7,8 +7,6 @@ public class TextFieldDefaultHeightTests : TestBase
     [Test]
     public async Task SameHeightWithDefaultStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
                 <TextBox />
@@ -25,15 +23,11 @@ public async Task SameHeightWithDefaultStyle()
         await Assert.That(await GetHeight(stackPanel, "ComboBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "DatePicker")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "TimePicker")).IsCloseTo(height, Precision);
-
-        recorder.Success();
     }
 
  [Test]
     public async Task SameHeightWithFloatingHintStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
                 <TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Hint" />
@@ -51,15 +45,11 @@ public async Task SameHeightWithFloatingHintStyle()
         await Assert.That(await GetHeight(stackPanel, "ComboBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "DatePicker")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "TimePicker")).IsCloseTo(height, Precision);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SameHeightWithFilledStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
                 <TextBox Style="{StaticResource MaterialDesignFilledTextBox}" materialDesign:HintAssist.Hint="Hint" />
@@ -77,15 +67,11 @@ public async Task SameHeightWithFilledStyle()
         await Assert.That(await GetHeight(stackPanel, "ComboBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "DatePicker")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "TimePicker")).IsCloseTo(height, Precision);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task SameHeightWithOutlinedStyle()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
                 <TextBox Style="{StaticResource MaterialDesignOutlinedTextBox}" materialDesign:HintAssist.Hint="Hint" />
@@ -103,8 +89,6 @@ public async Task SameHeightWithOutlinedStyle()
         await Assert.That(await GetHeight(stackPanel, "ComboBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "DatePicker")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "TimePicker")).IsCloseTo(height, Precision);
-
-        recorder.Success();
     }
 
     private static async Task<double> GetHeight(IVisualElement container, string type, string? optionalName = null)
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
index 346fea3dd5..6888ef245b 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
@@ -18,8 +18,6 @@ public static IEnumerable<Func<PrimaryColor>> PrimaryColors()
     [MethodDataSource(nameof(PrimaryColors))]
     public async Task PrimaryColor_AdjustToTheme(PrimaryColor primary)
     {
-        await using var recorder = new TestRecorder(App);
-
         await App.InitializeWithMaterialDesign(BaseTheme.Light, primary, colorAdjustment: new ColorAdjustment());
 
         IWindow window = await App.CreateWindow<ColorAdjustWindow>();
@@ -36,9 +34,6 @@ public async Task PrimaryColor_AdjustToTheme(PrimaryColor primary)
         await Wait.For(async () => await window.GetBackgroundColor() != windowBackground);
 
         await AssertContrastRatio();
-
-        recorder.Success();
-
         async Task AssertContrastRatio()
         {
             const double tolerance = 0.1;
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
index 3090036628..d7d02d200d 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using MaterialDesignColors;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 
 namespace MaterialDesignThemes.UITests.WPF.Theme;
@@ -59,30 +60,29 @@ public async Task WhenUsingCustomColorThemeDictionary_AllBrushesApplied()
     private static SecondaryColor[] SecondaryColors() => Enum.GetValues<SecondaryColor>();
 
     [Test]
-    [Skip("Manual run when theme values change")]
+    [Explicit]
     [MatrixDataSource]
     public async Task BundledTheme_UsesSameColorsAsXamlResources(
         [Matrix("Light", "Dark")] string baseTheme,
         [MatrixMethod<ThemeTests>(nameof(PrimaryColors))] PrimaryColor primaryColor,
         [MatrixMethod<ThemeTests>(nameof(SecondaryColors))] SecondaryColor secondaryColor)
     {
-        IVisualElement<WrapPanel> bundledPanel = await Initialize($"""
+        IVisualElement<WrapPanel> bundledPanel = await Initialize(App, $"""
             <materialDesign:BundledTheme BaseTheme="{baseTheme}"
                 PrimaryColor="{primaryColor}"
                 SecondaryColor="{secondaryColor}" />
             """);
-        Dictionary<string, Color> bundledColorsByNames = await GetColors();
+        Dictionary<string, Color> bundledColorsByNames = await GetColors(App);
 
-        //Re-setup the App
-        await DisposeAsync();
-        await InitializeAsync();
+        //Setup second App instance to compare against
+        await using var app = await StartApp();
 
-        IVisualElement<WrapPanel> xamlPanel = await Initialize($"""
+        IVisualElement<WrapPanel> xamlPanel = await Initialize(app, $"""
             <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.{baseTheme}.xaml" />
             <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.{primaryColor}.xaml" />
             <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Secondary/MaterialDesignColor.{secondaryColor}.xaml" />
             """);
-        Dictionary<string, Color> xamlColorsByNames = await GetColors();
+        Dictionary<string, Color> xamlColorsByNames = await GetColors(app);
 
         await Assert.That(xamlColorsByNames.Count).IsEqualTo(bundledColorsByNames.Count);
 
@@ -91,13 +91,13 @@ public async Task BundledTheme_UsesSameColorsAsXamlResources(
             await Assert.That(bundledColorsByNames[brushName] == xamlColorsByNames[brushName]).IsTrue().Because($"Brush {brushName}, Bundled color {bundledColorsByNames[brushName]} does not match XAML color {xamlColorsByNames[brushName]}");
         }
 
-        async Task<Dictionary<string, Color>> GetColors()
+        async Task<Dictionary<string, Color>> GetColors(IApp app)
         {
-            Dictionary<string, Color> rv = new();
+            Dictionary<string, Color> rv = [];
 
             await Task.WhenAll(GetBrushResourceNames().Select(async x =>
             {
-                Color color = await GetResourceColor(x);
+                Color color = await GetResourceColor(app, x);
                 lock (rv)
                 {
                     rv[x] = color;
@@ -112,15 +112,21 @@ await Task.WhenAll(GetBrushResourceNames().Select(async x =>
     private partial string GetXamlWrapPanel();
     private partial Task AssertAllThemeBrushesSet(IVisualElement<WrapPanel> panel);
 
-    private async Task<Color> GetResourceColor(string name)
+    private Task<Color> GetResourceColor(string name) => GetResourceColor(App, name);
+
+    private static async Task<Color> GetResourceColor(IApp app, string name)
     {
-        IResource resource = await App.GetResource(name);
+        IResource resource = await app.GetResource(name);
         SolidColorBrush? brush = resource.GetAs<SolidColorBrush>();
         await Assert.That(brush).IsNotNull();
         return brush!.Color;
     }
 
-    protected async Task<IVisualElement<WrapPanel>> Initialize(string themeDictionary)
+    protected Task<IVisualElement<WrapPanel>> Initialize(string themeDictionary)
+        => Initialize(App, themeDictionary);
+
+
+    protected async Task<IVisualElement<WrapPanel>> Initialize(IApp app, string themeDictionary)
     {
         string applicationResourceXaml = $"""
             <ResourceDictionary 
@@ -138,10 +144,10 @@ protected async Task<IVisualElement<WrapPanel>> Initialize(string themeDictionar
             </ResourceDictionary>
             """;
 
-        await App.Initialize(applicationResourceXaml,
+        await app.Initialize(applicationResourceXaml,
             Path.GetFullPath("MaterialDesignColors.dll"),
             Path.GetFullPath("MaterialDesignThemes.Wpf.dll"),
             System.Reflection.Assembly.GetExecutingAssembly().Location);
-        return await App.CreateWindowWith<WrapPanel>(GetXamlWrapPanel());
+        return await app.CreateWindowWith<WrapPanel>(GetXamlWrapPanel());
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
index 5abd00740e..1b14fb69c5 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
@@ -13,8 +13,6 @@ public class TimePickerTests : TestBase
     [Arguments(2020, 8, 10)]
     public async Task OnTextChangedIfSelectedTimeIsNonNull_DatePartDoesNotChange(int year, int month, int day)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker Language=""en-US"" />
@@ -28,8 +26,6 @@ public async Task OnTextChangedIfSelectedTimeIsNonNull_DatePartDoesNotChange(int
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(new DateTime(year, month, day, 1, 10, 0));
-
-        recorder.Success();
     }
 
     [Test]
@@ -37,8 +33,6 @@ public async Task OnTextChangedIfSelectedTimeIsNonNull_DatePartDoesNotChange(int
     [Arguments(2020, 8, 10)]
     public async Task OnLostFocusIfSelectedTimeIsNonNull_DatePartDoesNotChange(int year, int month, int day)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker Language=""en-US"" />
@@ -55,8 +49,6 @@ public async Task OnLostFocusIfSelectedTimeIsNonNull_DatePartDoesNotChange(int y
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(new DateTime(year, month, day, 1, 10, 0));
-
-        recorder.Success();
     }
 
     [Test]
@@ -64,8 +56,6 @@ public async Task OnLostFocusIfSelectedTimeIsNonNull_DatePartDoesNotChange(int y
     [Arguments(2020, 8, 2)]
     public async Task OnClockPickedIfSelectedTimeIsNonNull_DatePartDoesNotChange(int year, int month, int day)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -77,15 +67,11 @@ public async Task OnClockPickedIfSelectedTimeIsNonNull_DatePartDoesNotChange(int
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(new DateTime(year, month, day, 1, 10, 0));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OnTextChangedIfSelectedTimeIsNull_DatePartWillBeToday()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker Language=""en-US"" />
@@ -99,15 +85,11 @@ public async Task OnTextChangedIfSelectedTimeIsNull_DatePartWillBeToday()
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(AdjustToday(today, actual).Add(new TimeSpan(1, 23, 0)));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker Language=""en-US"" />
@@ -124,15 +106,11 @@ public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(AdjustToday(today, actual).Add(new TimeSpan(1, 23, 0)));
-
-        recorder.Success();
     }
 
     [Test]
     public async Task OnClockPickedIfSelectedTimeIsNull_DatePartWillBeToday()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -144,8 +122,6 @@ public async Task OnClockPickedIfSelectedTimeIsNull_DatePartWillBeToday()
 
         var actual = await timePicker.GetSelectedTime();
         await Assert.That(actual).IsEqualTo(AdjustToday(today, actual).Add(new TimeSpan(1, 23, 0)));
-
-        recorder.Success();
     }
 
     private static DateTime AdjustToday(DateTime today, DateTime? adjustTo)
@@ -165,8 +141,6 @@ private static DateTime AdjustToday(DateTime today, DateTime? adjustTo)
     [Arguments("1:02 AM")]
     public async Task OnLostFocusIfTimeHasBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -182,8 +156,6 @@ public async Task OnLostFocusIfTimeHasBeenChanged_TextWillBeFormatted(string tex
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:02 AM");
-
-        recorder.Success();
     }
 
     [Test]
@@ -192,8 +164,6 @@ public async Task OnLostFocusIfTimeHasBeenChanged_TextWillBeFormatted(string tex
     [Arguments("1:02 AM")]
     public async Task OnLostFocusIfTimeHasNotBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -210,8 +180,6 @@ public async Task OnLostFocusIfTimeHasNotBeenChanged_TextWillBeFormatted(string
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:02 AM");
-
-        recorder.Success();
     }
 
     [Test]
@@ -220,8 +188,6 @@ public async Task OnLostFocusIfTimeHasNotBeenChanged_TextWillBeFormatted(string
     [Arguments("1:02 AM")]
     public async Task OnEnterKeyDownIfTimeHasNotBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -235,8 +201,6 @@ public async Task OnEnterKeyDownIfTimeHasNotBeenChanged_TextWillBeFormatted(stri
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:02 AM");
-
-        recorder.Success();
     }
 
     [Test]
@@ -245,8 +209,6 @@ public async Task OnEnterKeyDownIfTimeHasNotBeenChanged_TextWillBeFormatted(stri
     [Arguments("1:02 AM")]
     public async Task OnEnterKeyDownIfTimeHasBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -260,8 +222,6 @@ public async Task OnEnterKeyDownIfTimeHasBeenChanged_TextWillBeFormatted(string
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:02 AM");
-
-        recorder.Success();
     }
 
     [Test]
@@ -270,8 +230,6 @@ public async Task OnEnterKeyDownIfTimeHasBeenChanged_TextWillBeFormatted(string
     [Arguments("1:02 AM")]
     public async Task OnTimePickedIfTimeHasBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -286,8 +244,6 @@ public async Task OnTimePickedIfTimeHasBeenChanged_TextWillBeFormatted(string te
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:03 AM");
-
-        recorder.Success();
     }
 
     [Test]
@@ -296,8 +252,6 @@ public async Task OnTimePickedIfTimeHasBeenChanged_TextWillBeFormatted(string te
     [Arguments("1:02 AM")]
     public async Task OnTimePickedIfTimeHasNotBeenChanged_TextWillBeFormatted(string text)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker/>
@@ -312,16 +266,12 @@ public async Task OnTimePickedIfTimeHasNotBeenChanged_TextWillBeFormatted(string
 
         var actual = await timePickerTextBox.GetText();
         await Assert.That(actual).IsEqualTo("1:02 AM");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Pull Request 2192")]
     public async Task OnTimePickerHelperTextFontSize_ChangesHelperTextFontSize()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>(@"
 <StackPanel>
     <materialDesign:TimePicker
@@ -333,15 +283,12 @@ public async Task OnTimePickerHelperTextFontSize_ChangesHelperTextFontSize()
         double fontSize = await helpTextBlock.GetFontSize();
 
         await Assert.That(fontSize).IsEqualTo(20);
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 2737")]
     public async Task OutlinedTimePicker_RespectsActiveAndInactiveBorderThickness_WhenAttachedPropertiesAreSet()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var expectedInactiveBorderThickness = new Thickness(4, 3, 2, 1);
         var expectedActiveBorderThickness = new Thickness(1, 2, 3, 4);
@@ -387,8 +334,6 @@ public async Task OutlinedTimePicker_RespectsActiveAndInactiveBorderThickness_Wh
         await Assert.That(hoverBorderThickness).IsEqualTo(expectedActiveBorderThickness);
         await Assert.That(focusedBorderThickness).IsEqualTo(expectedActiveBorderThickness);
         await Assert.That(withErrorBorderThickness).IsEqualTo(expectedActiveBorderThickness);
-
-        recorder.Success();
     }
 
     [Test]
@@ -403,8 +348,6 @@ public async Task OutlinedTimePicker_RespectsActiveAndInactiveBorderThickness_Wh
     [Arguments("MaterialDesignOutlinedTimePicker", 20)]
     public async Task TimePicker_WithHintAndHelperText_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -428,8 +371,6 @@ public async Task TimePicker_WithHintAndHelperText_RespectsPadding(string styleN
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - helperTextCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
@@ -444,8 +385,6 @@ public async Task TimePicker_WithHintAndHelperText_RespectsPadding(string styleN
     [Arguments("MaterialDesignOutlinedTimePicker", 20)]
     public async Task TimePicker_WithHintAndValidationError_RespectsPadding(string styleName, int? padding)
     {
-        await using var recorder = new TestRecorder(App);
-
         // FIXME: Tolerance needed because TextFieldAssist.TextBoxViewMargin is in play and slightly modifies the hint text placement in certain cases.
         const double tolerance = 1.5;
 
@@ -477,16 +416,12 @@ public async Task TimePicker_WithHintAndValidationError_RespectsPadding(string s
 
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - hintCoordinates.Value.Left)).IsCloseTo(0, tolerance);
         await Assert.That(Math.Abs(contentHostCoordinates.Value.Left - errorViewerCoordinates.Value.Left)).IsCloseTo(0, tolerance);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3119")]
     public async Task TimePicker_WithClearButton_ClearButtonClearsSelectedTime()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>($@"
 <StackPanel>
@@ -504,16 +439,12 @@ public async Task TimePicker_WithClearButton_ClearButtonClearsSelectedTime()
 
         // Assert
         await Assert.That(await timePicker.GetSelectedTime()).IsNull();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3369")]
     public async Task TimePicker_WithClearButton_ClearButtonClearsUncommittedText()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>($"""
         <StackPanel>
@@ -537,16 +468,12 @@ await Wait.For(async () =>
             // Assert
             await Assert.That(await timePickerTextBox.GetText()).IsNull();
         });
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3365")]
     public async Task TimePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_ShouldApplyDefaultBackgroundWhenFloated()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
@@ -569,8 +496,6 @@ public async Task TimePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_Shoul
 
         // Assert (focused state)
         await Assert.That(await hintBackgroundGrid.GetBackgroundColor()).IsEqualTo(defaultFloatedBackground);
-
-        recorder.Success();
     }
 
     [Test]
@@ -581,8 +506,6 @@ public async Task TimePicker_WithOutlinedStyleAndNoCustomHintBackgroundSet_Shoul
     [Arguments("MaterialDesignOutlinedTimePicker")]
     public async Task TimePicker_WithCustomHintBackgroundSet_ShouldApplyHintBackground(string style)
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>($$"""
             <StackPanel>
@@ -604,16 +527,12 @@ public async Task TimePicker_WithCustomHintBackgroundSet_ShouldApplyHintBackgrou
 
         // Assert (focused state)
         await Assert.That(await hintBackgroundBorder.GetBackgroundColor()).IsEqualTo(Colors.Red);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3547")]
     public async Task TimePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringTimeButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         Thickness expectedThickness = Constants.DefaultOutlinedBorderActiveThickness;
         var stackPanel = await LoadXaml<StackPanel>("""
@@ -638,16 +557,12 @@ public async Task TimePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringTimeButt
         // Assert
         await Assert.That(timePickerTextBoxHoverThickness).IsEqualTo(expectedThickness);
         await Assert.That(timePickerTimeButtonHoverThickness).IsEqualTo(expectedThickness);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3650")]
     public async Task TimePicker_MovesFocusToPrevious_WhenShiftAndTabIsPressed()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
             <StackPanel>
@@ -668,8 +583,6 @@ public async Task TimePicker_MovesFocusToPrevious_WhenShiftAndTabIsPressed()
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsTrue();
         await Assert.That(await timePickerTextBox.GetIsFocused()).IsFalse();
-
-        recorder.Success();
     }
 }
 
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
index 9cd9eb89d0..6b53d69d45 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
@@ -12,8 +12,6 @@ public class ToolBarTests : TestBase
     [Arguments(Orientation.Vertical, Dock.Bottom)]
     public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientation, Dock expectedOverflowGridDock)
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var toolBarTray = await LoadXaml<ToolBarTray>($@"
 <ToolBarTray Orientation=""{orientation}"" DockPanel.Dock=""Top"">
@@ -28,8 +26,6 @@ public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientati
 
         //Assert
         await Assert.That(dock).IsEqualTo(expectedOverflowGridDock);
-
-        recorder.Success();
     }
 
     [Description("Issue 3694")]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
index 308009fa56..9ea28e4b4d 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
@@ -15,8 +15,6 @@ public static IEnumerable<Func<Type>> GetTestControls()
     [MethodDataSource(nameof(GetTestControls))]
     public async Task CanResetNestedElements(Type userControlType)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl(userControlType)).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -41,15 +39,11 @@ public async Task CanResetNestedElements(Type userControlType)
         await AssertTreeItemContent(treeListView, 3, "1_1_x");
         await AssertTreeItemContent(treeListView, 4, "1_2_x");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveNestedElementDown()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -84,15 +78,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_2");
         await AssertTreeItemContent(treeListView, 4, "1_1");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveNestedElementUp()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -127,15 +117,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_0");
         await AssertTreeItemContent(treeListView, 4, "1_2");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveNestedElementWithExpandedChildrenDown()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -169,15 +155,11 @@ public async Task CanMoveNestedElementWithExpandedChildrenDown()
         await AssertTreeItemContent(treeListView, 6, "1_1_1");
         await AssertTreeItemContent(treeListView, 7, "1_1_2");
         await AssertTreeItemContent(treeListView, 8, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveNestedElementWithExpandedChildrenUp()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -216,15 +198,11 @@ public async Task CanMoveNestedElementWithExpandedChildrenUp()
         await AssertTreeItemContent(treeListView, 6, "1_0");
         await AssertTreeItemContent(treeListView, 7, "1_2");
         await AssertTreeItemContent(treeListView, 8, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveTopLevelElementDown()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> moveDownButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Down"));
@@ -242,15 +220,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 0, "0");
         await AssertTreeItemContent(treeListView, 1, "2");
         await AssertTreeItemContent(treeListView, 2, "1");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveTopLevelElementUp()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> moveUpButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Up"));
@@ -268,15 +242,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 0, "1");
         await AssertTreeItemContent(treeListView, 1, "0");
         await AssertTreeItemContent(treeListView, 2, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveTopLevelElementWithExpandedChildrenDown()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -304,15 +274,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_0");    // NOTE: If expansion state is lost when moving, these 3 children should not be present.
         await AssertTreeItemContent(treeListView, 4, "1_1");
         await AssertTreeItemContent(treeListView, 5, "1_2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanMoveTopLevelElementWithExpandedChildrenUp()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -340,15 +306,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_2");
         await AssertTreeItemContent(treeListView, 4, "0");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanReplaceTopLevelElement()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> replaceButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Replace"));
@@ -366,15 +328,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 0, "0");
         await AssertTreeItemContent(treeListView, 1, "1_r");
         await AssertTreeItemContent(treeListView, 2, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanReplaceTopLevelElementWithExpandedChildren()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> replaceButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Replace"));
@@ -394,15 +352,11 @@ public async Task CanReplaceTopLevelElementWithExpandedChildren()
         await AssertTreeItemContent(treeListView, 0, "0");
         await AssertTreeItemContent(treeListView, 1, "1_r"); // NOTE: The three children should have been dropped by the replace call.
         await AssertTreeItemContent(treeListView, 2, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanReplaceNestedChildElement()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -432,15 +386,11 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_1_r");
         await AssertTreeItemContent(treeListView, 4, "1_2");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task CanReplaceNestedChildElementWithExpandedChildren()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -486,16 +436,12 @@ await Wait.For(async () =>
         await AssertTreeItemContent(treeListView, 3, "1_1_r");
         await AssertTreeItemContent(treeListView, 4, "1_2");
         await AssertTreeItemContent(treeListView, 5, "2");
-
-        recorder.Success();
     }
 
     [Test]
     [MethodDataSource(nameof(GetTestControls))]
     public async Task WithHierarchicalDataTemplate_CanRemoveTopLevelElement(Type userControlType)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl(userControlType)).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -514,16 +460,12 @@ public async Task WithHierarchicalDataTemplate_CanRemoveTopLevelElement(Type use
 
         await AssertTreeItemContent(treeListView, 0, "0");
         await AssertTreeItemContent(treeListView, 1, "2");
-        
-        recorder.Success();
     }
 
     [Test]
     [MethodDataSource(nameof(GetTestControls))]
     public async Task WithHierarchicalDataTemplate_CanRemoveNestedElement(Type userControlType)
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         IVisualElement<Grid> root = (await LoadUserControl(userControlType)).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
@@ -561,15 +503,11 @@ public async Task WithHierarchicalDataTemplate_CanRemoveNestedElement(Type userC
         await AssertTreeItemContent(treeListView, 4, "1_1_1");
         await AssertTreeItemContent(treeListView, 5, "1_2");
         await AssertTreeItemContent(treeListView, 6, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task DoubleClickOnTreeListViewItem_TogglesExpansion()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -597,15 +535,11 @@ public async Task DoubleClickOnTreeListViewItem_TogglesExpansion()
         await secondItem.LeftClick();
 
         await Wait.For(async () => await secondItem.GetIsExpanded() == false);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task LeftAndRightArrowKeys_CollapseAndExpand()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -642,16 +576,12 @@ public async Task LeftAndRightArrowKeys_CollapseAndExpand()
         //Left arrow to jump to parent
         await nestedItem.SendKeyboardInput($"{Key.Left}");
         await Wait.For(() => secondItem.GetIsSelected(), message: "Parent item is not selected");
-
-        recorder.Success();
     }
 
     [Test]
     [MethodDataSource(nameof(GetTestControls))]
     public async Task AddingChildrenToItemWithAlreadyExpandedChildren_InsertsNewChildAtCorrectIndex(Type userControlType)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl(userControlType)).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -678,16 +608,12 @@ public async Task AddingChildrenToItemWithAlreadyExpandedChildren_InsertsNewChil
 
         //Assert the child added last is below the child added first (and its children)
         await AssertTreeItemContent(treeListView, 4, "1_1");
-
-        recorder.Success();
     }
 
     [Test]
     [MethodDataSource(nameof(GetTestControls))]
     public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDeleteSelectedChild(Type userControlType)
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl(userControlType)).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -730,15 +656,11 @@ public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDele
 
         //Assert the 2 children were successfully removed
         await AssertTreeItemContent(treeListView, 4, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task MovingChildItemAfterHavingMovedRootLevelParentItem_ShouldMoveChild()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -778,15 +700,11 @@ public async Task MovingChildItemAfterHavingMovedRootLevelParentItem_ShouldMoveC
         await AssertTreeItemContent(treeListView, 3, "1_0");
         await AssertTreeItemContent(treeListView, 4, "1_2");
         await AssertTreeItemContent(treeListView, 5, "1_1");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task MovingChildItemOfNestedItemAfterHavingMovedNestedItem_ShouldMoveChild()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -835,15 +753,11 @@ public async Task MovingChildItemOfNestedItemAfterHavingMovedNestedItem_ShouldMo
         await AssertTreeItemContent(treeListView, 6, "1_1_2");
         await AssertTreeItemContent(treeListView, 7, "1_1_1");
         await AssertTreeItemContent(treeListView, 8, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingExpansion()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -886,15 +800,11 @@ public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingEx
         await AssertTreeItemContent(treeListView, 6, "1_1_2");
         await AssertTreeItemContent(treeListView, 7, "1_2");
         await AssertTreeItemContent(treeListView, 8, "2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task TopLevelItemWhichHasBeenExpandedAndCollapsed_MovesAndMaintainsCollapsedState()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add"));
@@ -936,15 +846,11 @@ public async Task TopLevelItemWhichHasBeenExpandedAndCollapsed_MovesAndMaintains
         await AssertTreeItemContent(treeListView, 3, "1_0");
         await AssertTreeItemContent(treeListView, 4, "1_1");
         await AssertTreeItemContent(treeListView, 5, "1_2");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task TreeListView_WithTemplateSelector_UsesSelectorTemplates()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<TreeListView> treeListView = (await LoadUserControl<TreeListViewTemplateSelector>()).As<TreeListView>();
 
         IVisualElement<TreeListViewItem> item3 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[2]");
@@ -965,15 +871,11 @@ public async Task TreeListView_WithTemplateSelector_UsesSelectorTemplates()
         await AssertTreeItemContent(treeListView, 7, "1", Colors.Red);
         await AssertTreeItemContent(treeListView, 8, "2", Colors.Red);
         await AssertTreeItemContent(treeListView, 9, "3", Colors.Red);
-
-        recorder.Success();
     }
 
     [Test]
     public async Task TreeListView_WithCollectionView_RendersItems()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<TreeListView> treeListView = (await LoadUserControl<TreeListViewWithCollectionView>()).As<TreeListView>();
 
         IVisualElement<TreeListViewItem> item3 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[2]");
@@ -994,15 +896,11 @@ public async Task TreeListView_WithCollectionView_RendersItems()
         await AssertTreeItemContent(treeListView, 7, "1");
         await AssertTreeItemContent(treeListView, 8, "2");
         await AssertTreeItemContent(treeListView, 9, "3");
-
-        recorder.Success();
     }
 
     [Test]
     public async Task TreeListView_AddingExpandedItemWithChildren_ShowsExpandedItem()
     {
-        await using var recorder = new TestRecorder(App);
-
         IVisualElement<Grid> root = (await LoadUserControl<TreeListViewDataBinding>()).As<Grid>();
         IVisualElement<TreeListView> treeListView = await root.GetElement<TreeListView>();
         IVisualElement<Button> addWithChildrenButton = await root.GetElement(ElementQuery.PropertyExpression<Button>(x => x.Content, "Add with Children"));
@@ -1016,8 +914,6 @@ public async Task TreeListView_AddingExpandedItemWithChildren_ShowsExpandedItem(
         await AssertTreeItemContent(treeListView, 4, "3_0");
         await AssertTreeItemContent(treeListView, 5, "3_1");
         await AssertTreeItemContent(treeListView, 6, "3_2");
-
-        recorder.Success();
     }
 
     private static async Task AssertTreeItemContent(IVisualElement<TreeListView> treeListView, int index, string content, bool isExpanded = false)
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
index a235d56404..409e3a0a91 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
@@ -9,8 +9,6 @@ public class TreeViewTests : TestBase
     [Description("Issue 2618")]
     public async Task HasNoItemsExpanderVisibility_ChangesVisibilityOnExpander()
     {
-        await using var recorder = new TestRecorder(App);
-
         var treeView = await LoadXaml<TreeView>(@"
 <TreeView>
     <TreeViewItem Header=""Item1"" />
@@ -55,9 +53,6 @@ public async Task HasNoItemsExpanderVisibility_ChangesVisibilityOnExpander()
 
         expander = await GetExpanderForHeader("Item8");
         await Assert.That(await expander.GetVisibility()).IsEqualTo(Visibility.Visible);
-
-        recorder.Success();
-
         async Task<IVisualElement<ToggleButton>> GetExpanderForHeader(string header)
         {
             var item = await treeView!.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
@@ -72,8 +67,6 @@ async Task<IVisualElement<ToggleButton>> GetExpanderForHeader(string header)
     [Arguments(Visibility.Visible)]
     public async Task HasNoItemsExpanderVisibility_SetOnTreeView_ChangesVisibilityOnExpanders(Visibility visibility)
     {
-        await using var recorder = new TestRecorder(App);
-
         var treeView = await LoadXaml<TreeView>($@"
 <TreeView materialDesign:TreeViewAssist.HasNoItemsExpanderVisibility=""{visibility}"">
     <TreeViewItem Header=""NoChild"" />
@@ -88,9 +81,6 @@ public async Task HasNoItemsExpanderVisibility_SetOnTreeView_ChangesVisibilityOn
 
         expander = await GetExpanderForHeader("HasChild");
         await Assert.That(await expander.GetVisibility()).IsEqualTo(Visibility.Visible);
-
-        recorder.Success();
-
         async Task<IVisualElement<ToggleButton>> GetExpanderForHeader(string header)
         {
             var item = await treeView!.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
index 9556e4f85e..64af5dc995 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
@@ -15,8 +15,6 @@ public class DecimalUpDownTests: TestBase
     [Arguments("zh-CN")]
     public async Task NumericButtons_IncreaseAndDecreaseValue(string culture)
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<DecimalUpDown>("""
         <materialDesign:DecimalUpDown Value="1" ValueStep="0.1" />
         """);
@@ -42,9 +40,6 @@ await Wait.For(async () =>
             await Assert.That(await textBox.GetText()).IsEqualTo("1");
             await Assert.That(await numericUpDown.GetValue()).IsEqualTo(1);
         });
-
-        recorder.Success();
-
         static void SetCulture(Application _, string culture)
         {
             Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo(culture);
@@ -54,8 +49,6 @@ static void SetCulture(Application _, string culture)
     [Test]
     public async Task NumericButtons_WithMaximum_DisablesPlusButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<DecimalUpDown>("""
         <materialDesign:DecimalUpDown Value="1" Maximum="2" />
         """);
@@ -80,15 +73,11 @@ await Wait.For(async () =>
         });
 
         await Assert.That(await plusButton.GetIsEnabled()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task NumericButtons_WithMinimum_DisablesMinusButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<DecimalUpDown>("""
         <materialDesign:DecimalUpDown Value="2" Minimum="1" />
         """);
@@ -113,15 +102,11 @@ await Wait.For(async () =>
         });
 
         await Assert.That(await minusButton.GetIsEnabled()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<DecimalUpDown>("""
         <materialDesign:DecimalUpDown Value="2" />
         """);
@@ -137,16 +122,12 @@ public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
         await Assert.That(await numericUpDown.GetValue()).IsEqualTo(3);
         await Assert.That(await numericUpDown.GetMinimum()).IsEqualTo(3);
         await Assert.That(await numericUpDown.GetMaximum()).IsEqualTo(3);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3654")]
     public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
         <StackPanel>
@@ -167,16 +148,12 @@ public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsFalse();
         await Assert.That(await part_textBox.GetIsFocused()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3781")]
     public async Task IncreaseButtonClickWhenTextIsAboveMaximum_DoesNotIncreaseValue()
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
         <StackPanel>
           <materialDesign:DecimalUpDown Minimum="-2.5" Maximum="2.5" Value="2.5" />
@@ -196,8 +173,6 @@ public async Task IncreaseButtonClickWhenTextIsAboveMaximum_DoesNotIncreaseValue
         //NB: Because the focus has not left the up down control, we don't expect the text to change
         await Assert.That(await textBox.GetText()).IsEqualTo("30");
         await Assert.That(await decimalUpDown.GetValue()).IsEqualTo(2.5m);
-
-        recorder.Success();
     }
 
     [Test]
@@ -207,8 +182,6 @@ public async Task IncreaseButtonClickWhenTextIsAboveMaximum_DoesNotIncreaseValue
     [Arguments("2a", 2)]
     public async Task LostFocusWhenTextIsInvalid_RevertsToOriginalValue(string inputText, decimal expectedValue)
     {
-        await using var recorder = new TestRecorder(App);
-
         var stackPanel = await LoadXaml<StackPanel>("""
         <StackPanel>
           <materialDesign:DecimalUpDown Minimum="-2.5" Maximum="2.5" Value="2.5" />
@@ -226,7 +199,5 @@ public async Task LostFocusWhenTextIsInvalid_RevertsToOriginalValue(string input
 
         await Assert.That(await textBox.GetText()).IsEqualTo(expectedValue.ToString());
         await Assert.That(await decimalUpDown.GetValue()).IsEqualTo(expectedValue);
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
index b20a2cd4e2..7b49f0e2eb 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
@@ -11,8 +11,6 @@ public class NumericUpDownTests : TestBase
     [Test]
     public async Task NumericButtons_IncreaseAndDecreaseValue()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<NumericUpDown>("""
         <materialDesign:NumericUpDown Value="1" />
         """);
@@ -36,15 +34,11 @@ await Wait.For(async () =>
             await Assert.That(await textBox.GetText()).IsEqualTo("1");
             await Assert.That(await numericUpDown.GetValue()).IsEqualTo(1);
         });
-
-        recorder.Success();
     }
 
     [Test]
     public async Task NumericButtons_WithMaximum_DisablesPlusButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<NumericUpDown>("""
         <materialDesign:NumericUpDown Value="1" Maximum="2" />
         """);
@@ -69,15 +63,11 @@ await Wait.For(async () =>
         });
 
         await Assert.That(await plusButton.GetIsEnabled()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task NumericButtons_WithMinimum_DisablesMinusButton()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<NumericUpDown>("""
         <materialDesign:NumericUpDown Value="2" Minimum="1" />
         """);
@@ -102,15 +92,11 @@ await Wait.For(async () =>
         });
 
         await Assert.That(await minusButton.GetIsEnabled()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
     {
-        await using var recorder = new TestRecorder(App);
-
         var numericUpDown = await LoadXaml<NumericUpDown>("""
         <materialDesign:NumericUpDown Value="2" />
         """);
@@ -126,16 +112,12 @@ public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
         await Assert.That(await numericUpDown.GetValue()).IsEqualTo(3);
         await Assert.That(await numericUpDown.GetMinimum()).IsEqualTo(3);
         await Assert.That(await numericUpDown.GetMaximum()).IsEqualTo(3);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3654")]
     public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
     {
-        await using var recorder = new TestRecorder(App);
-
         // Arrange
         var stackPanel = await LoadXaml<StackPanel>("""
         <StackPanel>
@@ -156,16 +138,12 @@ public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsFalse();
         await Assert.That(await part_textBox.GetIsFocused()).IsTrue();
-
-        recorder.Success();
     }
 
     [Test]
     [Skip("Needs XAMLTest 1.2.3 or later")]
     public async Task NumericUpDown_ValueSetGreaterThanMaximum_CoercesToMaximum()
     {
-        await using var recorder = new TestRecorder(App);
-
         //Arrange
         var userControl = await LoadUserControl<BoundNumericUpDown>();
         var numericUpDown = await userControl.GetElement<NumericUpDown>();
@@ -187,8 +165,6 @@ public async Task NumericUpDown_ValueSetGreaterThanMaximum_CoercesToMaximum()
         await Assert.That(await numericUpDown.GetValue()).IsEqualTo(10);
         var viewModel = await userControl.GetProperty<BoundNumericUpDownViewModel>(nameof(BoundNumericUpDown.ViewModel));
         await Assert.That(viewModel?.Value).IsEqualTo(10);
-
-        recorder.Success();
     }
 
     [Test]
@@ -199,7 +175,6 @@ public async Task NumericUpDown_ValueSetGreaterThanMaximum_CoercesToMaximum()
     public async Task NumericUpDown_WhenValueEqualsMinimum_DisableButtons(int value,
         bool decreaseEnabled, bool increaseEnabled)
     {
-        await using var recorder = new TestRecorder(App);
         //Arrange
         var numericUpDown = await LoadXaml<NumericUpDown>($"""
         <materialDesign:NumericUpDown Value="{value}" Maximum="10" Minimum="1" />
@@ -215,15 +190,12 @@ public async Task NumericUpDown_WhenValueEqualsMinimum_DisableButtons(int value,
         //Assert
         await Assert.That(increaseButtonEnabled).IsEqualTo(increaseEnabled);
         await Assert.That(decreaseButtonEnabled).IsEqualTo(decreaseEnabled);
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3827")]
     public async Task NumericUpDown_WhenBindingUpdateTriggerIsPropertyChanged_ItUpdatesBeforeLoosingFocus()
     {
-        await using var recorder = new TestRecorder(App);
         //Arrange
         var numericUpDown = await LoadXaml<NumericUpDown>("""
         <materialDesign:NumericUpDown Tag="{Binding Value, RelativeSource={RelativeSource Self}, UpdateSourceTrigger=PropertyChanged}" Maximum="10" Minimum="1" />
@@ -239,15 +211,12 @@ public async Task NumericUpDown_WhenBindingUpdateTriggerIsPropertyChanged_ItUpda
 
         //Assert
         await Assert.That(tag?.ToString()).IsEqualTo("4");
-
-        recorder.Success();
     }
 
     [Test]
     [Description("Issue 3827")]
     public async Task NumericUpDown_WhenBindingUpdateTriggerIsLostFocus_ItDoesNotUpdateUntilItLoosesFocus()
     {
-        await using var recorder = new TestRecorder(App);
         //Arrange
         var userControl = await LoadUserControl<BoundNumericUpDown>();
         var numericUpDown = await userControl.GetElement<NumericUpDown>();
@@ -285,7 +254,5 @@ static int GetViewModelValue(NumericUpDown numericUpDown)
         //Assert
         await Assert.That(valueBeforeLostFocus.ToString()).IsEqualTo("2");
         await Assert.That(valueAfterLostFocus.ToString()).IsEqualTo("4");
-
-        recorder.Success();
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs b/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs
new file mode 100644
index 0000000000..ce0e6aff46
--- /dev/null
+++ b/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs
@@ -0,0 +1,32 @@
+using MaterialDesignThemes.UITests;
+using TUnit.Core.Executors;
+using TUnit.Core.Interfaces;
+
+[assembly: TestExecutor<XamlTestExecutor>]
+
+namespace MaterialDesignThemes.UITests;
+
+public class XamlTestExecutor : ITestExecutor
+{
+    public async ValueTask ExecuteTest(TestContext context, Func<ValueTask> action)
+    {
+        if (context.TestDetails.ClassInstance is TestBase testBase)
+        {
+            await using var app = await testBase.StartApp();
+
+            await using var recorder = new TestRecorder(app,
+                callerFilePath: context.TestDetails.TestFilePath,
+                unitTestMethod: context.TestDetails.TestMethod.Name);
+            testBase.App = app;
+            testBase.Recorder = recorder;
+
+            await action();
+
+            recorder.Success();
+        }
+        else
+        {
+            await action();
+        }
+    }
+}

From a391d2aa5fdd85fc6ece16936a01460cac33b65a Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Mon, 12 Jan 2026 00:09:53 -0800
Subject: [PATCH 2/6] Updates dependencies and refactors test utilities

Upgrades core packages including TUnit, System.CommandLine, and XAMLTest. Refactors `CommandLineOptions` for `System.CommandLine` API updates. Adapts TUnit assertion extensions and test execution context usage. Adds `ModuleInitializerAttribute` for NET472 support.
---
 Directory.packages.props                      | 15 ++--
 .../MaterialColorUtilities.Tests.csproj       |  5 --
 .../MaterialDesignColors.Wpf.Tests.csproj     |  7 +-
 .../ModuleInitializerAttribute.cs             |  8 ++
 .../MaterialDesignThemes.UITests.csproj       |  6 +-
 .../TUnit/IsCloseToExtensions.cs              | 83 ++++++++++++-------
 .../AutoSuggestTextBoxTests.cs                | 30 +++----
 .../WPF/ColorPickerTests.cs                   |  2 +-
 .../WPF/ComboBoxes/ComboBoxTests.cs           |  4 +-
 .../WPF/DatePickers/DatePickerTests.cs        | 14 ++--
 .../WPF/DialogHosts/DialogHostTests.cs        | 32 +++----
 .../WPF/DrawerHosts/DrawerHostTests.cs        | 14 ++--
 .../WPF/PasswordBoxes/PasswordBoxTests.cs     |  4 +-
 .../WPF/SplitButtons/SplitButtonTests.cs      | 10 +--
 .../WPF/TabControls/TabControlTests.cs        |  2 +-
 .../WPF/TextBoxes/TextBoxTests.cs             |  6 +-
 .../TimePickers/MaterialDesignTimePicker.cs   |  6 +-
 .../WPF/TimePickers/TimePickerTests.cs        | 20 ++---
 .../WPF/TreeListViews/TreeListViewTests.cs    | 78 ++++++++---------
 .../WPF/UpDownControls/DecimalUpDownTests.cs  |  4 +-
 .../WPF/UpDownControls/NumericUpDownTests.cs  |  4 +-
 .../XamlTestExecutor.cs                       |  6 +-
 .../XamlTestExtensions.cs                     |  3 +-
 .../ButtonProgressAssistTests.cs              | 14 ++--
 .../ClockTests.cs                             |  2 +-
 .../ColorPickerTests.cs                       |  2 +-
 .../DataGridAssistTests.cs                    | 10 +--
 .../MaterialDesignThemes.Wpf.Tests.csproj     |  7 +-
 28 files changed, 207 insertions(+), 191 deletions(-)
 create mode 100644 tests/MaterialDesignColors.Wpf.Tests/ModuleInitializerAttribute.cs

diff --git a/Directory.packages.props b/Directory.packages.props
index 35cec88399..1f40187859 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -4,12 +4,11 @@
     <!-- https://learn.microsoft.com/nuget/consume-packages/Central-Package-Management?WT.mc_id=DT-MVP-5003472#transitive-pinning -->
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-  
   <ItemGroup>
     <PackageVersion Include="BluwolfIcons" Version="1.0.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Dragablz" Version="0.0.3.234" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="MahApps.Metro" Version="2.4.11" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
@@ -21,7 +20,7 @@
     <PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -32,10 +31,16 @@
     <PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.2" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
-    <PackageVersion Include="TUnit" Version="0.25.21" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="TUnit" Version="1.9.45" />
     <PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
     <PackageVersion Include="XAMLTest" Version="1.3.1-ci662" />
+    <PackageVersion Include="System.Memory" Version="4.6.3" />
+    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
+    <PackageVersion Include="Polyfill" Version="8.8.1" />
+    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
index 0c99ed5703..a403cab054 100644
--- a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
+++ b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
@@ -18,16 +18,11 @@
     <ProjectReference Include="..\..\src\MaterialDesign3.MaterialColorUtilities\MaterialColorUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="TUnit" />
     <PackageReference Include="Shouldly" />
   </ItemGroup>
   <ItemGroup>
-    <Using Include="TUnit.Assertions.AssertConditions.Throws" />
     <Using Include="TUnit.Core.Executors" />
     <Using Include="TUnit.Assertions" />
     <Using Include="Shouldly" />
diff --git a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index 0dd149338f..dd3670977c 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0-windows;net10.0-windows</TargetFrameworks>
@@ -25,10 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="TUnit" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/MaterialDesignColors.Wpf.Tests/ModuleInitializerAttribute.cs b/tests/MaterialDesignColors.Wpf.Tests/ModuleInitializerAttribute.cs
new file mode 100644
index 0000000000..543c7dfe54
--- /dev/null
+++ b/tests/MaterialDesignColors.Wpf.Tests/ModuleInitializerAttribute.cs
@@ -0,0 +1,8 @@
+#if NET472
+namespace System.Runtime.CompilerServices;
+
+[AttributeUsage(AttributeTargets.Method, Inherited = false)]
+internal sealed class ModuleInitializerAttribute : Attribute
+{
+}
+#endif
diff --git a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
index 5129a4d107..8df04e54fe 100644
--- a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
+++ b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -14,10 +14,6 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="GitHubActionsTestLogger">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="XAMLTest" />
     <PackageReference Include="TUnit" />
@@ -32,4 +28,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/MaterialDesignThemes.UITests/TUnit/IsCloseToExtensions.cs b/tests/MaterialDesignThemes.UITests/TUnit/IsCloseToExtensions.cs
index 1ae6934500..e70a7fc67a 100644
--- a/tests/MaterialDesignThemes.UITests/TUnit/IsCloseToExtensions.cs
+++ b/tests/MaterialDesignThemes.UITests/TUnit/IsCloseToExtensions.cs
@@ -1,51 +1,72 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using TUnit.Assertions.AssertConditions;
-using TUnit.Assertions.AssertConditions.Interfaces;
-using TUnit.Assertions.AssertionBuilders;
+using TUnit.Assertions.Core;
 
 namespace MaterialDesignThemes.Tests.TUnit;
 
 public static class IsCloseToExtensions
 {
-    public static IsCloseToWrapper<double> IsCloseTo(this IValueSource<double> valueSource, double expected, double precision, [CallerArgumentExpression(nameof(expected))] string? doNotPopulateThisValue1 = null, [CallerArgumentExpression(nameof(precision))] string? doNotPopulateThisValue2 = null)
+    public static IsCloseToAssertion<double> IsCloseTo(
+        this IAssertionSource<double> source, double expected, double precision,
+        [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null,
+        [CallerArgumentExpression(nameof(precision))] string? precisionExpression = null)
     {
-        var assertionBuilder = valueSource.RegisterAssertion(new IsCloseToCondition<double>(expected, precision)
-            , [doNotPopulateThisValue1, doNotPopulateThisValue2]);
-
-        return new IsCloseToWrapper<double>(assertionBuilder);
+        source.Context.ExpressionBuilder.Append(".IsCloseTo(");
+        source.Context.ExpressionBuilder.Append(expectedExpression);
+        source.Context.ExpressionBuilder.Append(", ");
+        source.Context.ExpressionBuilder.Append(precisionExpression);
+        source.Context.ExpressionBuilder.Append(')');
+        return new IsCloseToAssertion<double>(source.Context, expected, precision);
     }
 
-    public static IsCloseToWrapper<float> IsCloseTo(this IValueSource<float> valueSource, float expected, float precision, [CallerArgumentExpression(nameof(expected))] string? doNotPopulateThisValue1 = null, [CallerArgumentExpression(nameof(precision))] string? doNotPopulateThisValue2 = null)
+    public static IsCloseToAssertion<float> IsCloseTo(
+        this IAssertionSource<float> source, float expected, float precision,
+        [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null,
+        [CallerArgumentExpression(nameof(precision))] string? precisionExpression = null)
     {
-        var assertionBuilder = valueSource.RegisterAssertion(new IsCloseToCondition<float>(expected, precision)
-            , [doNotPopulateThisValue1, doNotPopulateThisValue2]);
-
-        return new IsCloseToWrapper<float>(assertionBuilder);
+        source.Context.ExpressionBuilder.Append(".IsCloseTo(");
+        source.Context.ExpressionBuilder.Append(expectedExpression);
+        source.Context.ExpressionBuilder.Append(", ");
+        source.Context.ExpressionBuilder.Append(precisionExpression);
+        source.Context.ExpressionBuilder.Append(')');
+        return new IsCloseToAssertion<float>(source.Context, expected, precision);
     }
 }
 
-public class IsCloseToWrapper<TActual>(InvokableAssertionBuilder<TActual> invokableAssertionBuilder)
-    : InvokableValueAssertionBuilder<TActual>(invokableAssertionBuilder);
-
-file class IsCloseToCondition<TActual>(TActual expected, TActual tolerance) : BaseAssertCondition<TActual>
-    where TActual :
-    IFloatingPoint<TActual>,
-    INumberBase<TActual>
+public class IsCloseToAssertion<TValue>(AssertionContext<TValue> context, TValue expected, TValue precision) : Assertion<TValue>(context)
+    where TValue : IFloatingPoint<TValue>, INumberBase<TValue>
 {
-    protected override string GetExpectation() => $"to be within {tolerance} of {expected}";
+    protected override string GetExpectation()
+    {
+        DefaultInterpolatedStringHandler defaultInterpolatedStringHandler = new(15, 1);
+        defaultInterpolatedStringHandler.AppendLiteral("to be within ");
+        defaultInterpolatedStringHandler.AppendFormatted($"\"{precision}\"");
+        defaultInterpolatedStringHandler.AppendLiteral(" of ");
+        defaultInterpolatedStringHandler.AppendFormatted($"\"{expected}\"");
+        return defaultInterpolatedStringHandler.ToStringAndClear();
+    }
 
-    protected override ValueTask<AssertionResult> GetResult(
-        TActual? actualValue, Exception? exception,
-        AssertionMetadata assertionMetadata
-    )
+    protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> metadata)
     {
-        if(actualValue is null)
-            return AssertionResult.Fail("received null");
+        TValue? actualValue = metadata.Value;
+        Exception? exception = metadata.Exception;
+        if (exception != null)
+        {
+            return Task.FromResult(AssertionResult.Failed("threw " + exception.GetType().FullName));
+        }
+        if (actualValue is null)
+        {
+            return Task.FromResult(AssertionResult.Failed($"found <null>"));
+        }
+
+        TValue difference = actualValue - expected;
+        TValue absoluteDifference = TValue.Abs(difference);
+        bool isInRange = absoluteDifference <= precision;
 
-        TActual difference = actualValue - expected;
-        TActual absoluteDifference = TActual.Abs(difference);
-        bool isInRange = absoluteDifference <= tolerance;
-        return AssertionResult.FailIf(!isInRange, $"received {actualValue}");
+        if (isInRange)
+        {
+            return Task.FromResult(AssertionResult.Passed);
+        }
+        return Task.FromResult(AssertionResult.Failed($"found {actualValue}"));
     }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
index 3d7e72ec24..faac37b3eb 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
@@ -63,7 +63,7 @@ await Wait.For(async () =>
             lastHeight = currentHeight;
             if (!rv)
             {
-                await Task.Delay(100, TestContext.Current!.CancellationToken);
+                await Task.Delay(100, TestContext.Current!.Execution.CancellationToken);
             }
             return rv;
         });
@@ -74,7 +74,7 @@ await Wait.For(async () =>
         await bananas.LeftClick();
 
         // Wait for the text to be updated
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
         var suggestBoxText = await suggestBox.GetText();
         //Validate that the current text is the same as the selected item
@@ -128,13 +128,13 @@ public async Task AutoSuggestBox_MovesFocusToNextElement_WhenPopupIsClosed()
 
         // Act
         await suggestBox.MoveKeyboardFocus();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         await suggestBox.SendInput(new KeyboardInput("B")); // Open the popup
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
         await suggestBox.SendInput(new KeyboardInput(Key.Escape)); // Close the popup
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
         await suggestBox.SendInput(new KeyboardInput(Key.Tab)); // Press TAB to focus the next element
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await suggestBox.GetIsFocused()).IsFalse();
@@ -155,7 +155,7 @@ public async Task AutoSuggestBox_KeysUpAndDown_WrapAround()
         //Act & Assert
         await suggestBox.MoveKeyboardFocus();
         await suggestBox.SendInput(new KeyboardInput("e"));
-        await Task.Delay(delay, TestContext.Current!.CancellationToken);
+        await Task.Delay(delay, TestContext.Current!.Execution.CancellationToken);
 
         static int? GetSuggestionCount(AutoSuggestBox autoSuggestBox)
         {
@@ -168,12 +168,12 @@ public async Task AutoSuggestBox_KeysUpAndDown_WrapAround()
         //Assert that initially the first item is selected
         int selectedIndex = await suggestionListBox.GetSelectedIndex();
         await Assert.That(selectedIndex).IsEqualTo(0);
-        await Task.Delay(delay, TestContext.Current.CancellationToken);
+        await Task.Delay(delay, TestContext.Current.Execution.CancellationToken);
 
         //Assert that the last item is selected after pressing ArrowUp
         await suggestBox.SendInput(new KeyboardInput(Key.Up));
         await Assert.That(await suggestionListBox.GetSelectedIndex()).IsEqualTo(itemCount - 1);
-        await Task.Delay(delay, TestContext.Current.CancellationToken);
+        await Task.Delay(delay, TestContext.Current.Execution.CancellationToken);
 
         //Assert that the first item is selected after pressing ArrowDown
         await suggestBox.SendInput(new KeyboardInput(Key.Down));
@@ -219,7 +219,7 @@ public async Task AutoSuggestBox_ClickingButtonInInteractiveItemTemplate_DoesNot
         // Act
         await suggestBox.MoveKeyboardFocus();
         await suggestBox.SendInput(new KeyboardInput("a"));
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Find the button in the first suggestion item
         var thirdListBoxItem = await suggestionListBox.GetElement<ListBoxItem>("/ListBoxItem[2]");
@@ -227,7 +227,7 @@ public async Task AutoSuggestBox_ClickingButtonInInteractiveItemTemplate_DoesNot
 
         // Click the button
         await button.LeftClick();
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await suggestBox.GetIsSuggestionOpen()).IsTrue();
@@ -254,7 +254,7 @@ public async Task AutoSuggestBox_ClickingButtonForcingNonInteractive_SelectsItem
         // Act
         await suggestBox.MoveKeyboardFocus();
         await suggestBox.SendInput(new KeyboardInput("a"));
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Find the button in the first suggestion item
         var thirdListBoxItem = await suggestionListBox.GetElement<ListBoxItem>("/ListBoxItem[2]");
@@ -266,7 +266,7 @@ static void SetNonInteractive(Button button)
 
         // Click the button
         await button.LeftClick();
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await suggestBox.GetIsSuggestionOpen()).IsFalse();
@@ -283,7 +283,7 @@ public async Task AutoSuggestBox_ClickingTextblockThatIsInteractive_DoesNotSelec
         // Act
         await suggestBox.MoveKeyboardFocus();
         await suggestBox.SendInput(new KeyboardInput("a"));
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Find the button in the first suggestion item
         var thirdListBoxItem = await suggestionListBox.GetElement<ListBoxItem>("/ListBoxItem[2]");
@@ -295,7 +295,7 @@ static void SetInteractive(TextBlock textBlock)
 
         // Click the button
         await textBlock.LeftClick();
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await suggestBox.GetIsSuggestionOpen()).IsTrue();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
index 3a6a95acda..af87dd23f7 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs
@@ -22,7 +22,7 @@ public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
         await thumb.SendInput(MouseInput.MoveRelative(xOffset: -5, yOffset: -10));
         await thumb.SendInput(MouseInput.LeftDown());
         await thumb.SendInput(MouseInput.MoveRelative(yOffset: 25));
-        await Task.Delay(100, TestContext.Current!.CancellationToken);
+        await Task.Delay(100, TestContext.Current!.Execution.CancellationToken);
         await thumb.SendInput(MouseInput.LeftUp());
 
 
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
index 8d0c76bd33..e8e423c231 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
@@ -125,7 +125,7 @@ public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
 
         // Open the ComboBox initially
         await comboBox.LeftClick(Position.RightCenter);
-        await Task.Delay(50, TestContext.Current!.CancellationToken);   // Allow a little time for the drop-down to open (and property to change)
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);   // Allow a little time for the drop-down to open (and property to change)
         bool wasOpenAfterClickOnToggleButton = await comboBox.GetIsDropDownOpen();
 
         // Focus (i.e. click) another element
@@ -133,7 +133,7 @@ public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
 
         // Click the editable TextBox of the ComboBox
         await editableTextBox.LeftClick();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Allow a little time for the drop-down to open (and property to change)
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Allow a little time for the drop-down to open (and property to change)
         bool wasOpenAfterClickOnEditableTextBox = await comboBox.GetIsDropDownOpen();
         bool textBoxHasFocus = await editableTextBox.GetIsFocused();
         bool textBoxHasKeyboardFocus = await editableTextBox.GetIsKeyboardFocused();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
index d0c246dd5f..32b0e8d6ae 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
@@ -70,7 +70,7 @@ public async Task OnDatePicker_WithClearButton_ClearsSelectedUncommittedText()
         // Act & Assert
         await Wait.For(async () => {
             await clearButton.LeftClick();
-            await Task.Delay(50, TestContext.Current!.CancellationToken);
+            await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
             string? text = await datePickerTextBox.GetText();
             await Assert.That(text).IsNull();
@@ -107,18 +107,18 @@ public async Task OutlinedDatePicker_RespectsActiveAndInactiveBorderThickness_Wh
 
         // Act
         await button.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);   // Wait for the visual change
         var inactiveBorderThickness = await textBoxOuterBorder.GetBorderThickness();
         await datePickerTextBox.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var hoverBorderThickness = await textBoxOuterBorder.GetBorderThickness();
         await datePickerTextBox.LeftClick();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var focusedBorderThickness = await textBoxOuterBorder.GetBorderThickness();
 
         // TODO: It would be cool if a validation error could be set via XAMLTest without the need for the Binding and ValidationRules elements in the XAML above.
         await datePicker.SetProperty(DatePicker.SelectedDateProperty, DateTime.Now);
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var withErrorBorderThickness = await textBoxOuterBorder.GetBorderThickness();
 
         // Assert
@@ -288,10 +288,10 @@ public async Task DatePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringCalendar
 
         // Act
         await datePickerTextBoxBorder.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         var datePickerTextBoxHoverThickness = await datePickerTextBoxBorder.GetBorderThickness();
         await datePickerTimeButton.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
         var datePickerCalendarButtonHoverThickness = await datePickerTextBoxBorder.GetBorderThickness();
 
         // Assert
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index 7bd7881dc3..2efd5da30f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -34,7 +34,7 @@ public async Task OnOpenDialog_OverlayCoversContent()
 
         await testOverlayButton.LeftClick();
         await Wait.For(async () => await resultTextBlock.GetText() == "Clicks: 1");
-        await Task.Delay(200, TestContext.Current!.CancellationToken);
+        await Task.Delay(200, TestContext.Current!.Execution.CancellationToken);
         await closeDialogButton.LeftClick();
 
         var retry = new Retry(5, TimeSpan.FromSeconds(5));
@@ -65,7 +65,7 @@ public async Task ClosingDialogWithIsOpenProperty_ShouldRaiseDialogClosingEvent(
 
         await showButton.LeftClick();
         await Wait.For(async () => await closeButton.GetIsVisible());
-        await Task.Delay(300, TestContext.Current!.CancellationToken);
+        await Task.Delay(300, TestContext.Current!.Execution.CancellationToken);
         await closeButton.LeftClick();
 
         await Wait.For(async () =>
@@ -104,7 +104,7 @@ public async Task FontSettingsShouldInheritIntoDialog()
 
         await showButton1.LeftClick();
         await showButton2.LeftClick();
-        await Task.Delay(300, TestContext.Current!.CancellationToken);
+        await Task.Delay(300, TestContext.Current!.Execution.CancellationToken);
 
         var text1 = await grid.GetElement<TextBlock>("TextBlock1");
         var text2 = await grid.GetElement<TextBlock>("TextBlock2");
@@ -344,14 +344,14 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
         // Open menu
         IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
         await menuItem1.LeftClick();
-        await Task.Delay(1000, TestContext.Current!.CancellationToken); // Wait for menu to open
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken); // Wait for menu to open
         IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
         await menuItem2.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to show
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to show
 
         // Click navigate button
         await navigateHomeButton.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to close
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to close
 
         await Assert.That(await tabItem1.GetIsSelected()).IsTrue();
         await Assert.That(await tabItem2.GetIsSelected()).IsFalse();
@@ -372,14 +372,14 @@ public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhe
         // Open menu
         IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
         await menuItem1.LeftClick();
-        await Task.Delay(1000, TestContext.Current!.CancellationToken); // Wait for menu to open
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken); // Wait for menu to open
         IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
         await menuItem2.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to show
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to show
 
         // Click navigate button
         await navigateHomeButton.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to close
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to close
 
         await Assert.That(await railItem1.GetIsSelected()).IsTrue();
         await Assert.That(await railItem2.GetIsSelected()).IsFalse();
@@ -400,14 +400,14 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
         // Open menu
         IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
         await menuItem1.LeftClick();
-        await Task.Delay(1000, TestContext.Current!.CancellationToken); // Wait for menu to open
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken); // Wait for menu to open
         IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
         await menuItem2.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to show
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to show
 
         // Click navigate button
         await navigateHomeButton.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to close
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to close
 
         await Assert.That(await tabItem1.GetIsSelected()).IsTrue();
         await Assert.That(await tabItem2.GetIsSelected()).IsFalse();
@@ -428,14 +428,14 @@ public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhe
         // Open menu
         IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
         await menuItem1.LeftClick();
-        await Task.Delay(1000, TestContext.Current!.CancellationToken); // Wait for menu to open
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken); // Wait for menu to open
         IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
         await menuItem2.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to show
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to show
 
         // Click navigate button
         await navigateHomeButton.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken); // Wait for dialog content to close
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken); // Wait for dialog content to close
 
         await Assert.That(await railItem1.GetIsSelected()).IsTrue();
         await Assert.That(await railItem2.GetIsSelected()).IsFalse();
@@ -448,7 +448,7 @@ public async Task DialogHost_WithComboBox_CanSelectItem()
         IVisualElement dialogHost = await LoadUserControl<WithComboBox>();
 
         var comboBox = await dialogHost.GetElement<ComboBox>("TargetedPlatformComboBox");
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
         await comboBox.LeftClick();
         
         var item = await Wait.For(() => comboBox.GetElement<ComboBoxItem>("TargetItem"));
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
index bd2a00dc0b..7aab8cc2ca 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
@@ -33,7 +33,7 @@ public async Task DrawerHost_OpenAndClose_RaisesEvents()
 
         await toggleButton.LeftClick();
         //Allow for animations to start
-        await Task.Delay(10, TestContext.Current!.CancellationToken);
+        await Task.Delay(10, TestContext.Current!.Execution.CancellationToken);
 
         await Wait.For(async () =>
         {
@@ -48,7 +48,7 @@ await Wait.For(async () =>
         });
 
         //Wait before clicking so the animations have time to finish
-        await Task.Delay(100, TestContext.Current.CancellationToken);
+        await Task.Delay(100, TestContext.Current.Execution.CancellationToken);
 
         await drawerHost.LeftClick();
 
@@ -61,7 +61,7 @@ await Wait.For(async () =>
 
         await showButton.LeftClick();
         //Allow for animations to start
-        await Task.Delay(10, TestContext.Current.CancellationToken);
+        await Task.Delay(10, TestContext.Current.Execution.CancellationToken);
 
         await Wait.For(async () =>
         {
@@ -92,26 +92,26 @@ public async Task DrawerHost_CancelingClosingEvent_DrawerStaysOpen()
 
         await showButton.LeftClick();
         //Allow open animation to finish
-        await Task.Delay(300, TestContext.Current!.CancellationToken);
+        await Task.Delay(300, TestContext.Current!.Execution.CancellationToken);
         await Wait.For(async () => (await openedEvent.GetInvocations()).Count == 1);
 
         var closingEvent = await drawerHost.RegisterForEvent(nameof(DrawerHost.DrawerClosing));
 
         //Attempt closing with routed command
         await closeButton.LeftClick();
-        await Task.Delay(100, TestContext.Current.CancellationToken);
+        await Task.Delay(100, TestContext.Current.Execution.CancellationToken);
         await Wait.For(async () => (await closingEvent.GetInvocations()).Count == 1);
         await Assert.That(await drawerHost.GetIsLeftDrawerOpen()).IsTrue();
 
         //Attempt closing with click away
         await drawerHost.LeftClick();
-        await Task.Delay(100, TestContext.Current.CancellationToken);
+        await Task.Delay(100, TestContext.Current.Execution.CancellationToken);
         await Wait.For(async () => (await closingEvent.GetInvocations()).Count == 2);
         await Assert.That(await drawerHost.GetIsLeftDrawerOpen()).IsTrue();
 
         //Attempt closing with DP property toggle
         await closeButtonDp.LeftClick();
-        await Task.Delay(100, TestContext.Current.CancellationToken);
+        await Task.Delay(100, TestContext.Current.Execution.CancellationToken);
         await Wait.For(async () => (await closingEvent.GetInvocations()).Count == 3);
         await Assert.That(await drawerHost.GetIsLeftDrawerOpen()).IsTrue();
     }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 8178066795..0f5340d9f2 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -88,9 +88,9 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
         string? clearTextPassword1 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
 
         // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         await revealPasswordButton.LeftClick();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the "clear text TextBox" to become visible
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the "clear text TextBox" to become visible
         await clearTextPasswordTextBox.SendKeyboardInput($"2");
         string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
         string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
diff --git a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
index 16cb9445c3..2aeab12433 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
@@ -49,10 +49,10 @@ public async Task SplitButton_RegisterForClick_RaisesEvent()
 
         //Act
         await leftButton.LeftClick();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         int leftButtonCount = (await clickEvent.GetInvocations()).Count;
         await popupBox.LeftClick();
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
         int rightButtonCount = (await clickEvent.GetInvocations()).Count;
 
         // Assert
@@ -87,7 +87,7 @@ public async Task SplitButton_WithButtonInPopup_CanBeInvoked()
         await Recorder.SaveScreenshot("PopupOpen");
 
         await popupContent.LeftClick();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         var invocations = await clickEvent.GetInvocations();
@@ -107,7 +107,7 @@ public async Task SplitButton_RegisterCommandBinding_InvokesCommand()
 
         //Act
         await splitButton.LeftClick();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await userControl.GetCommandInvoked()).IsTrue();
@@ -157,7 +157,7 @@ public async Task SplitButton_ClickingPopupContent_DoesNotExecuteSplitButtonClic
         await Wait.For(async () => await popupContent.GetIsVisible());
         await Wait.For(async () => await popupContent.GetActualHeight() > 10);
         await popupContent.LeftClick();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await splitButtonClickEvent.GetInvocations()).IsEmpty();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
index e898f5a21f..305e178278 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
@@ -106,7 +106,7 @@ public async Task TabItem_ShouldKeepDataContext_WhenContextMenuOpens(string hori
         await button.RightClick();
         await tabControl.MoveCursorTo();
         await tabControl.LeftClick(Position.TopLeft);
-        await Task.Delay(50, TestContext.Current!.CancellationToken); // allow a little time for the disconnect to occur
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken); // allow a little time for the disconnect to occur
         
         // Assert data context still present
         tabItem = await tabControl.GetElement<TabItem>();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
index 17f024874f..7a248ca4ef 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
@@ -24,7 +24,7 @@ public async Task OnClearButtonShown_ControlHeightDoesNotChange()
 
         await textBox.MoveKeyboardFocus();
         //Delay needed to account for transition storyboard
-        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current!.CancellationToken);
+        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current!.Execution.CancellationToken);
 
         double initialHeight = await textBox.GetActualHeight();
 
@@ -32,7 +32,7 @@ public async Task OnClearButtonShown_ControlHeightDoesNotChange()
         await clearButton.LeftClick();
 
         //Assert
-        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current.CancellationToken);
+        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current.Execution.CancellationToken);
 
         double height = await textBox.GetActualHeight();
         await Assert.That(height).IsEqualTo(initialHeight);
@@ -66,7 +66,7 @@ public async Task OnClearButtonWithHintShown_ControlHeightDoesNotChange()
         //Act
         await textBox.MoveKeyboardFocus();
         //Delay needed to account for transition storyboard
-        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current!.CancellationToken);
+        await Task.Delay(MaterialDesignTextBox.FocusedAnimationTime, TestContext.Current!.Execution.CancellationToken);
 
         //Assert
         double height = await textBox.GetActualHeight();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/MaterialDesignTimePicker.cs b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/MaterialDesignTimePicker.cs
index e32ff21c1b..8b2a9ac9b0 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/MaterialDesignTimePicker.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/MaterialDesignTimePicker.cs
@@ -22,14 +22,14 @@ private static async Task ClickButton(this IVisualElement<Popup> popup, string p
     {
         const int delay = 250;
 
-        await Task.Delay(delay, TestContext.Current!.CancellationToken);
+        await Task.Delay(delay, TestContext.Current!.Execution.CancellationToken);
         var canvas = await Wait.For(async () => await popup.GetElement(partName));
         var button = await canvas.GetElement<ClockItemButton>($"/ClockItemButton[{index}]");
-        await Task.Delay(delay, TestContext.Current.CancellationToken);
+        await Task.Delay(delay, TestContext.Current.Execution.CancellationToken);
         await Wait.For(async () =>
         {
             await button.LeftClick();
-            await Task.Delay(delay, TestContext.Current.CancellationToken);
+            await Task.Delay(delay, TestContext.Current.Execution.CancellationToken);
             return await button.GetIsChecked() == true;
         });
     }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
index 1b14fb69c5..b95b6a466f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
@@ -315,18 +315,18 @@ public async Task OutlinedTimePicker_RespectsActiveAndInactiveBorderThickness_Wh
 
         // Act
         await button.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);   // Wait for the visual change
         var inactiveBorderThickness = await textBoxOuterBorder.GetBorderThickness();
         await timePickerTextBox.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var hoverBorderThickness = await textBoxOuterBorder.GetBorderThickness(); ;
         await timePickerTextBox.LeftClick();
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var focusedBorderThickness = await textBoxOuterBorder.GetBorderThickness(); ;
 
         // TODO: It would be cool if a validation error could be set via XAMLTest without the need for the Binding and ValidationRules elements in the XAML above.
         await timePicker.SetProperty(TimePicker.TextProperty, "11:00");
-        await Task.Delay(50, TestContext.Current.CancellationToken);   // Wait for the visual change
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);   // Wait for the visual change
         var withErrorBorderThickness = await textBoxOuterBorder.GetBorderThickness(); ;
 
         // Assert
@@ -435,7 +435,7 @@ public async Task TimePicker_WithClearButton_ClearButtonClearsSelectedTime()
 
         // Act
         await clearButton.LeftClick();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await timePicker.GetSelectedTime()).IsNull();
@@ -463,7 +463,7 @@ await Wait.For(async () =>
         {
             // Act
             await clearButton.LeftClick();
-            await Task.Delay(50, TestContext.Current!.CancellationToken);
+            await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
 
             // Assert
             await Assert.That(await timePickerTextBox.GetText()).IsNull();
@@ -548,10 +548,10 @@ public async Task TimePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringTimeButt
 
         // Act
         await timePickerTextBoxBorder.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         var timePickerTextBoxHoverThickness = await timePickerTextBoxBorder.GetBorderThickness();
         await timePickerTimeButton.MoveCursorTo();
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
         var timePickerTimeButtonHoverThickness = await timePickerTextBoxBorder.GetBorderThickness();
 
         // Assert
@@ -576,9 +576,9 @@ public async Task TimePicker_MovesFocusToPrevious_WhenShiftAndTabIsPressed()
 
         // Act
         await timePickerTextBox.MoveKeyboardFocus();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         await timePickerTextBox.SendInput(new KeyboardInput(Key.LeftShift, Key.Tab));
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsTrue();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
index 9ea28e4b4d..aa887b4e7d 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
@@ -66,7 +66,7 @@ await Wait.For(async () =>
             bool isSelected = await childElement.GetIsSelected();
             if (!isSelected)
             {
-                await Task.Delay(MouseInput.GetDoubleClickTime, TestContext.Current!.CancellationToken);
+                await Task.Delay(MouseInput.GetDoubleClickTime, TestContext.Current!.Execution.CancellationToken);
             }
             return isSelected;
         });
@@ -105,7 +105,7 @@ await Wait.For(async () =>
             bool isSelected = await childElement.GetIsSelected();
             if (!isSelected)
             {
-                await Task.Delay(MouseInput.GetDoubleClickTime, TestContext.Current!.CancellationToken);
+                await Task.Delay(MouseInput.GetDoubleClickTime, TestContext.Current!.Execution.CancellationToken);
             }
             return isSelected;
         });
@@ -140,7 +140,7 @@ public async Task CanMoveNestedElementWithExpandedChildrenDown()
         await AddChildren(childElement!, 3, addButton);
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current!.CancellationToken);
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken);
         await childElement!.LeftClickExpander();
 
         //Move child item
@@ -174,17 +174,17 @@ public async Task CanMoveNestedElementWithExpandedChildrenUp()
         await secondItem.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         // Select child item and add three children and expand it
         IVisualElement<TreeListViewItem>? childElement = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[3]");
         await AddChildren(childElement!, 3, addButton);
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
         await childElement!.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         //Move child item
         await moveUpButton.LeftClick();
@@ -413,17 +413,17 @@ await Wait.For(async () =>
             return await childElement.GetIsSelected();
         });
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
         await AddChildren(childElement!, 3, addButton);
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
         await Wait.For(async () =>
         {
             await childElement!.LeftClickExpander();
             bool rv = await childElement!.GetIsExpanded();
             if (!rv)
             {
-                await Task.Delay(500, TestContext.Current.CancellationToken);
+                await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
             }
         });
 
@@ -519,7 +519,7 @@ public async Task DoubleClickOnTreeListViewItem_TogglesExpansion()
         await AddChildren(secondItem, 3, addButton);
 
         //NB: Needs to be long enough delay so the first click below does not register as a double click (and the third click as another which effectively collapses the item again)
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         //Double click to expand
         await secondItem.LeftClick();
@@ -528,7 +528,7 @@ public async Task DoubleClickOnTreeListViewItem_TogglesExpansion()
         await Wait.For(() => secondItem.GetIsExpanded());
 
         //NB: Needs to be long enough delay so the next clicks register as a new double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         //Double click to collapse
         await secondItem.LeftClick();
@@ -554,7 +554,7 @@ public async Task LeftAndRightArrowKeys_CollapseAndExpand()
         await secondItem.LeftClick();
         await Wait.For(() => secondItem.GetIsSelected());
 
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
         await secondItem.SendKeyboardInput($"{Key.Right}");
 
         await Wait.For(() => secondItem.GetIsExpanded());
@@ -571,7 +571,7 @@ public async Task LeftAndRightArrowKeys_CollapseAndExpand()
         await Wait.For(async () => await nestedItem.GetIsExpanded() == false);
 
         //Allow for collapsed animation to complete
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         //Left arrow to jump to parent
         await nestedItem.SendKeyboardInput($"{Key.Left}");
@@ -593,7 +593,7 @@ public async Task AddingChildrenToItemWithAlreadyExpandedChildren_InsertsNewChil
         await secondItem.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         //Add child to newly added child and expand
         IVisualElement<TreeListViewItem> newChild1 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[2]");
@@ -601,7 +601,7 @@ public async Task AddingChildrenToItemWithAlreadyExpandedChildren_InsertsNewChil
         await newChild1.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         //Select secondItem again, and add another child
         await AddChildren(secondItem, 1, addButton);
@@ -626,7 +626,7 @@ public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDele
         await secondItem.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         //Add child to newly added child and expand
         IVisualElement<TreeListViewItem> newChild1 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[2]");
@@ -634,7 +634,7 @@ public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDele
         await newChild1.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         // Remove item "1_2"
         IVisualElement<TreeListViewItem> item1_2 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[5]");
@@ -643,7 +643,7 @@ public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDele
         await removeButton.LeftClick();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         // Remove item "1_1" (this fails)
         IVisualElement<TreeListViewItem> item1_1 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[4]");
@@ -652,7 +652,7 @@ public async Task RemovingChildrenFromItemWithAlreadyExpandedChildren_ShouldDele
         await removeButton.LeftClick();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         //Assert the 2 children were successfully removed
         await AssertTreeItemContent(treeListView, 4, "2");
@@ -673,25 +673,25 @@ public async Task MovingChildItemAfterHavingMovedRootLevelParentItem_ShouldMoveC
         await secondItem.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
 
         //Move parent item down
         await downButton.LeftClick();
 
         //NB: Wait for the move to take effect
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Move child item
         IVisualElement<TreeListViewItem> secondChild = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[4]");
         await secondChild.LeftClick();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         await downButton.LeftClick();
 
         //NB: Wait for the move to take effect
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Assert the child was successfully moved
         await AssertTreeItemContent(treeListView, 0, "0");
@@ -717,7 +717,7 @@ public async Task MovingChildItemOfNestedItemAfterHavingMovedNestedItem_ShouldMo
         await item1.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current!.CancellationToken);
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken);
 
         // Add children to item "1_1" and expand
         IVisualElement<TreeListViewItem> item11 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[3]");
@@ -725,23 +725,23 @@ public async Task MovingChildItemOfNestedItemAfterHavingMovedNestedItem_ShouldMo
         await item11.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Move parent item down
         await downButton.LeftClick();
 
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
         //Move child item
         IVisualElement<TreeListViewItem> item111 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[6]");
         await item111.LeftClick();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         await downButton.LeftClick();
 
         //NB: Wait for the move to take effect
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Assert the child was successfully moved
         await AssertTreeItemContent(treeListView, 0, "0");
@@ -771,7 +771,7 @@ public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingEx
         await item1.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current!.CancellationToken);
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken);
 
         // Add children to item "1_1" and expand
         IVisualElement<TreeListViewItem> item11 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[3]");
@@ -779,16 +779,16 @@ public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingEx
         await item11.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Move parent item down
         await item1.LeftClick();
         await upButton.LeftClick();
 
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         await downButton.LeftClick();
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         //Assert the child was successfully moved
         await AssertTreeItemContent(treeListView, 0, "0");
@@ -817,19 +817,19 @@ public async Task TopLevelItemWhichHasBeenExpandedAndCollapsed_MovesAndMaintains
         await item1.LeftClickExpander();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current!.CancellationToken);
+        await Task.Delay(1000, TestContext.Current!.Execution.CancellationToken);
 
         // Collapse item "1" again
         await item1.LeftClickExpander(false);
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         // Move down
         await downButton.LeftClick();
 
         //NB: Needs to be long enough delay so the next click does not register as a double click
-        await Task.Delay(1000, TestContext.Current.CancellationToken);
+        await Task.Delay(1000, TestContext.Current.Execution.CancellationToken);
 
         // FIXME: At this point, the expansion state is wrong. The chevron indicates expanded, but in fact it is collapsed. Expanding it then crashes with an ArgumentOutOfRangeException
 
@@ -857,9 +857,9 @@ public async Task TreeListView_WithTemplateSelector_UsesSelectorTemplates()
         IVisualElement<TreeListViewItem> item4 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[3]");
 
         await item3.LeftClickExpander();
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
         await item4.LeftClickExpander();
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         await AssertTreeItemContent(treeListView, 0, "Foo", Colors.Blue);
         await AssertTreeItemContent(treeListView, 1, "42", Colors.Red);
@@ -882,9 +882,9 @@ public async Task TreeListView_WithCollectionView_RendersItems()
         IVisualElement<TreeListViewItem> item4 = await treeListView.GetElement<TreeListViewItem>("/TreeListViewItem[3]");
 
         await item3.LeftClickExpander();
-        await Task.Delay(500, TestContext.Current!.CancellationToken);
+        await Task.Delay(500, TestContext.Current!.Execution.CancellationToken);
         await item4.LeftClickExpander();
-        await Task.Delay(500, TestContext.Current.CancellationToken);
+        await Task.Delay(500, TestContext.Current.Execution.CancellationToken);
 
         await AssertTreeItemContent(treeListView, 0, "Foo");
         await AssertTreeItemContent(treeListView, 1, "42");
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
index 64af5dc995..300c23bd50 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
@@ -141,9 +141,9 @@ public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
 
         // Act
         await textBox.MoveKeyboardFocus();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         await textBox.SendInput(new KeyboardInput(Key.Tab));
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsFalse();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
index 7b49f0e2eb..c0f2d8f317 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
@@ -131,9 +131,9 @@ public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
 
         // Act
         await textBox.MoveKeyboardFocus();
-        await Task.Delay(50, TestContext.Current!.CancellationToken);
+        await Task.Delay(50, TestContext.Current!.Execution.CancellationToken);
         await textBox.SendInput(new KeyboardInput(Key.Tab));
-        await Task.Delay(50, TestContext.Current.CancellationToken);
+        await Task.Delay(50, TestContext.Current.Execution.CancellationToken);
 
         // Assert
         await Assert.That(await textBox.GetIsFocused()).IsFalse();
diff --git a/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs b/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs
index ce0e6aff46..af511e35ec 100644
--- a/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs
+++ b/tests/MaterialDesignThemes.UITests/XamlTestExecutor.cs
@@ -10,13 +10,13 @@ public class XamlTestExecutor : ITestExecutor
 {
     public async ValueTask ExecuteTest(TestContext context, Func<ValueTask> action)
     {
-        if (context.TestDetails.ClassInstance is TestBase testBase)
+        if (context is ITestMetadata { TestDetails.ClassInstance: TestBase testBase } testMetadata)
         {
             await using var app = await testBase.StartApp();
 
             await using var recorder = new TestRecorder(app,
-                callerFilePath: context.TestDetails.TestFilePath,
-                unitTestMethod: context.TestDetails.TestMethod.Name);
+                callerFilePath: testMetadata.TestDetails.TestFilePath,
+                unitTestMethod: testMetadata.TestDetails.TestName);
             testBase.App = app;
             testBase.Recorder = recorder;
 
diff --git a/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs b/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
index 7a0b6b149b..096d9145f8 100644
--- a/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
+++ b/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using MaterialDesignColors;
+using MaterialDesignColors;
 
 namespace MaterialDesignThemes.UITests;
 
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ButtonProgressAssistTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ButtonProgressAssistTests.cs
index 48063661f9..d7b1e72aa8 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ButtonProgressAssistTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ButtonProgressAssistTests.cs
@@ -13,7 +13,7 @@ public async Task TestMinimumProperty()
 
         // Assert defaults
         await Assert.That(ButtonProgressAssist.MinimumProperty.Name).IsEqualTo("Minimum");
-        await Assert.That(ButtonProgressAssist.GetMinimum(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetMinimum(testElement)).IsEqualTo(default(double));
 
         // Assert setting works
         ButtonProgressAssist.SetMinimum(testElement, 133.14);
@@ -39,7 +39,7 @@ public async Task TestValueProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.ValueProperty.Name).IsEqualTo("Value");
-        await Assert.That(ButtonProgressAssist.GetValue(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetValue(testElement)).IsEqualTo(default(double));
 
         // Assert setting works
         ButtonProgressAssist.SetValue(testElement, 99.1);
@@ -52,7 +52,7 @@ public async Task TestIsIndeterminateProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.IsIndeterminateProperty.Name).IsEqualTo("IsIndeterminate");
-        await Assert.That(ButtonProgressAssist.GetIsIndeterminate(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetIsIndeterminate(testElement)).IsEqualTo(default(bool));
 
         // Assert setting works
         ButtonProgressAssist.SetIsIndeterminate(testElement, false);
@@ -65,7 +65,7 @@ public async Task TestIndicatorForegroundProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.IndicatorForegroundProperty.Name).IsEqualTo("IndicatorForeground");
-        await Assert.That(ButtonProgressAssist.GetIndicatorForeground(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetIndicatorForeground(testElement)).IsEqualTo(default(Brush));
 
         // Assert setting works
         ButtonProgressAssist.SetIndicatorForeground(testElement, Brushes.LightBlue);
@@ -78,7 +78,7 @@ public async Task TestIndicatorBackgroundProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.IndicatorBackgroundProperty.Name).IsEqualTo("IndicatorBackground");
-        await Assert.That(ButtonProgressAssist.GetIndicatorBackground(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetIndicatorBackground(testElement)).IsEqualTo(default(Brush));
 
         // Assert setting works
         ButtonProgressAssist.SetIndicatorBackground(testElement, Brushes.DarkGoldenrod);
@@ -91,7 +91,7 @@ public async Task TestIsIndicatorVisibleProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.IsIndicatorVisibleProperty.Name).IsEqualTo("IsIndicatorVisible");
-        await Assert.That(ButtonProgressAssist.GetIsIndicatorVisible(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetIsIndicatorVisible(testElement)).IsEqualTo(default(bool));
 
         // Assert setting works
         ButtonProgressAssist.SetIsIndicatorVisible(testElement, true);
@@ -104,7 +104,7 @@ public async Task TestOpacityProperty()
         Button testElement = new();
         // Assert defaults
         await Assert.That(ButtonProgressAssist.OpacityProperty.Name).IsEqualTo("Opacity");
-        await Assert.That(ButtonProgressAssist.GetOpacity(testElement)).IsEqualTo(default);
+        await Assert.That(ButtonProgressAssist.GetOpacity(testElement)).IsEqualTo(default(double));
 
         // Assert setting works
         ButtonProgressAssist.SetOpacity(testElement, 311);
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
index 88ca80992d..b73dc9b2c8 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
@@ -76,7 +76,7 @@ void OnTimeChanged(object? sender, TimeChangedEventArgs e)
 
         await Assert.That(invocations.Count).IsEqualTo(2);
 
-        await Assert.That(invocations[0].OldTime).IsEqualTo(default);
+        await Assert.That(invocations[0].OldTime).IsEqualTo(default(DateTime));
         await Assert.That(invocations[0].NewTime).IsEqualTo(now);
 
         await Assert.That(invocations[1].OldTime).IsEqualTo(now);
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ColorPickerTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ColorPickerTests.cs
index d1952a46f6..0a7285eacd 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ColorPickerTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ColorPickerTests.cs
@@ -29,7 +29,7 @@ public async Task ColorPickerDefaultsToDefaultColor()
     {
         ColorPicker colorPicker = CreateElement();
         Slider slider = GetHueSlider(colorPicker);
-        await Assert.That(colorPicker.Color).IsEqualTo(default);
+        await Assert.That(colorPicker.Color).IsEqualTo(default(Color));
         await Assert.That(slider.Value).IsEqualTo(0);
 
         //Thumb should be in the bottom left corner
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/DataGridAssistTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/DataGridAssistTests.cs
index c0443de288..4160426dc8 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/DataGridAssistTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/DataGridAssistTests.cs
@@ -10,7 +10,7 @@ public async Task TestAutoGeneratedCheckBoxStyleProperty()
         DataGrid testElement = new();
         // Assert defaults
         await Assert.That(DataGridAssist.AutoGeneratedCheckBoxStyleProperty.Name).IsEqualTo("AutoGeneratedCheckBoxStyle");
-        await Assert.That(DataGridAssist.GetAutoGeneratedCheckBoxStyle(testElement)).IsEqualTo(default);
+        await Assert.That(DataGridAssist.GetAutoGeneratedCheckBoxStyle(testElement)).IsEqualTo(default(Style));
 
         // Assert setting works
         var style = new Style();
@@ -24,7 +24,7 @@ public async Task TestAutoGeneratedEditingCheckBoxStyleProperty()
         DataGrid testElement = new();
         // Assert defaults
         await Assert.That(DataGridAssist.AutoGeneratedEditingCheckBoxStyleProperty.Name).IsEqualTo("AutoGeneratedEditingCheckBoxStyle");
-        await Assert.That(DataGridAssist.GetAutoGeneratedEditingCheckBoxStyle(testElement)).IsEqualTo(default);
+        await Assert.That(DataGridAssist.GetAutoGeneratedEditingCheckBoxStyle(testElement)).IsEqualTo(default(Style));
 
         // Assert setting works
         var style = new Style();
@@ -38,7 +38,7 @@ public async Task TestAutoGeneratedTextStyleProperty()
         DataGrid testElement = new();
         // Assert defaults
         await Assert.That(DataGridAssist.AutoGeneratedTextStyleProperty.Name).IsEqualTo("AutoGeneratedTextStyle");
-        await Assert.That(DataGridAssist.GetAutoGeneratedTextStyle(testElement)).IsEqualTo(default);
+        await Assert.That(DataGridAssist.GetAutoGeneratedTextStyle(testElement)).IsEqualTo(default(Style));
 
         // Assert setting works
         var style = new Style();
@@ -52,7 +52,7 @@ public async Task TestAutoGeneratedEditingTextStyleProperty()
         DataGrid testElement = new();
         // Assert defaults
         await Assert.That(DataGridAssist.AutoGeneratedEditingTextStyleProperty.Name).IsEqualTo("AutoGeneratedEditingTextStyle");
-        await Assert.That(DataGridAssist.GetAutoGeneratedEditingTextStyle(testElement)).IsEqualTo(default);
+        await Assert.That(DataGridAssist.GetAutoGeneratedEditingTextStyle(testElement)).IsEqualTo(default(Style));
 
         // Assert setting works
         var style = new Style();
@@ -96,7 +96,7 @@ public async Task TestEnableEditBoxAssistProperty()
         DataGrid testElement = new();
         // Assert defaults
         await Assert.That(DataGridAssist.EnableEditBoxAssistProperty.Name).IsEqualTo("EnableEditBoxAssist");
-        await Assert.That(DataGridAssist.GetEnableEditBoxAssist(testElement)).IsEqualTo(default);
+        await Assert.That(DataGridAssist.GetEnableEditBoxAssist(testElement)).IsEqualTo(default(bool));
 
         // Assert setting works
         DataGridAssist.SetEnableEditBoxAssist(testElement, true);
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
index d7326ce603..e895ee7435 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
+++ b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
@@ -17,21 +17,16 @@
     <ProjectReference Include="..\..\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="TUnit" />
   </ItemGroup>
 
   <ItemGroup>
     <Using Include="MaterialDesignThemes.Tests.TUnit"/>
-    <Using Include="TUnit.Assertions.AssertConditions.Throws" />
     <Using Include="TUnit.Core.Executors" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="TUnit\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 29a077b8319cccb8868afd0fad7d418970ec4bca Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 28 May 2026 22:09:05 -0700
Subject: [PATCH 3/6] Refine test infrastructure and code quality

Removes explicit `recorder.Success()` calls from UI tests, completing the centralization of test recorder management introduced by the `XamlTestExecutor` refactor. Cleans up unused package versions and test dependencies. Addresses nullable warnings and removes Byte Order Mark (BOM) for improved code hygiene.
---
 Directory.packages.props                               |  6 +-----
 .../MaterialDesignColors.Wpf.Tests.csproj              |  1 -
 .../WPF/TabControls/TabControlTests.cs                 |  2 --
 tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs     | 10 +++++-----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Directory.packages.props b/Directory.packages.props
index 1f40187859..3dc3a40120 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -38,9 +38,5 @@
     <PackageVersion Include="TUnit" Version="1.9.45" />
     <PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
     <PackageVersion Include="XAMLTest" Version="1.3.1-ci662" />
-    <PackageVersion Include="System.Memory" Version="4.6.3" />
-    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
-    <PackageVersion Include="Polyfill" Version="8.8.1" />
-    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index dd3670977c..f5a681d276 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -24,7 +24,6 @@
     <ProjectReference Include="..\..\src\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger">
     <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="TUnit" />
   </ItemGroup>
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
index 305e178278..bfd6e48b78 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
@@ -39,8 +39,6 @@ public async Task OnLoad_ThemeBrushesSet()
         await MaterialDesignSpec.AssertContrastRatio(foregroundValue, backgroundValue, MaterialDesignSpec.MinimumContrastSmallText);
 
         await Assert.That(selectedTabUnderline).IsEqualTo(foregroundValue);
-
-        recorder.Success();
     }
 
     [Description("Issue 2983")]
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
index b73dc9b2c8..0ada638948 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
@@ -1,4 +1,4 @@
-namespace MaterialDesignThemes.Wpf.Tests;
+namespace MaterialDesignThemes.Wpf.Tests;
 
 [TestExecutor<STAThreadExecutor>]
 public class ClockTests
@@ -10,7 +10,7 @@ public async Task CanGenerateHoursButtons()
         clock.ApplyDefaultStyle();
 
         Canvas hoursCanvas = clock.FindVisualChild<Canvas>(Clock.HoursCanvasPartName);
-        var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+        var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString()!);
 
         var expected = Enumerable.Range(1, 12).Select(x => $"{x:0}");
         await Assert.That(buttonContents.OrderBy(x => x))
@@ -24,7 +24,7 @@ public async Task CanGenerateHoursButtonsWith24Hours()
         clock.ApplyDefaultStyle();
 
         Canvas hoursCanvas = clock.FindVisualChild<Canvas>(Clock.HoursCanvasPartName);
-        var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+        var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString()!);
 
         var expected = Enumerable.Range(13, 11).Select(x => $"{x:00}")
             .Concat(["00"])
@@ -39,7 +39,7 @@ public async Task CanGenerateMinuteButtons()
         clock.ApplyDefaultStyle();
 
         Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
-        var buttonContents = minutesCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+        var buttonContents = minutesCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString()!);
 
         var expected = Enumerable.Range(0, 60).Select(x => $"{x:0}");
         await Assert.That(buttonContents.OrderBy(x => x)).IsEquivalentTo(expected.OrderBy(x => x));
@@ -52,7 +52,7 @@ public async Task CanGenerateSecondsButtons()
         clock.ApplyDefaultStyle();
 
         Canvas secondsCanvas = clock.FindVisualChild<Canvas>(Clock.SecondsCanvasPartName);
-        var buttonContents = secondsCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+        var buttonContents = secondsCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString()!);
 
         var expected = Enumerable.Range(0, 60).Select(x => $"{x:0}");
         await Assert.That(buttonContents.OrderBy(x => x)).IsEquivalentTo(expected.OrderBy(x => x));

From 850bfb698109a55426b44556cde3f29281c02b3f Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 28 May 2026 22:30:50 -0700
Subject: [PATCH 4/6] Streamline test project configurations

Removes redundant ``, ``, and Microsoft Testing Platform-specific properties from test `.csproj` files. This cleans up project definitions, aligning them with current SDK-style project practices and the existing TUnit test infrastructure.
---
 .../MaterialDesignColors.Wpf.Tests.csproj                     | 4 ----
 .../MaterialDesignThemes.UITests.csproj                       | 2 --
 .../MaterialDesignThemes.Wpf.Tests.csproj                     | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index f5a681d276..feabcc869b 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -2,11 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0-windows;net10.0-windows</TargetFrameworks>
-    <AssemblyTitle>MaterialDesignColors.Wpf.Tests</AssemblyTitle>
-    <Product>MaterialDesignColors.Wpf.Tests</Product>
-    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     <OutputType>Exe</OutputType>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net472'">
     <Reference Include="PresentationCore" />
diff --git a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
index 8df04e54fe..7e8746ae2c 100644
--- a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
+++ b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -6,9 +6,7 @@
     <UseWPF>true</UseWPF>
     <NoWarn>$(NoWarn);CA1707</NoWarn>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     <OutputType>Exe</OutputType>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>-->
   </PropertyGroup>
 
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
index e895ee7435..d16a480ca6 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
+++ b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
@@ -2,11 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net10.0-windows</TargetFrameworks>
-    <AssemblyTitle>MaterialDesignThemes.Wpf.Tests</AssemblyTitle>
-    <Product>MaterialDesignThemes.Wpf.Tests</Product>
     <OutputType>Exe</OutputType>
-    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>

From e62c6e65e2df2b410bf8d65a9e5b641705e27c7b Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 28 May 2026 23:17:38 -0700
Subject: [PATCH 5/6] Streamline test configuration by centralizing runner
 definition

Defines `Microsoft.Testing.Platform` as the solution-wide test runner in `global.json`. This enables the removal of specific runner properties from individual test `.csproj` files, reducing redundancy and simplifying project configurations.
---
 global.json                                           | 11 +++++++----
 .../MaterialColorUtilities.Tests.csproj               |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/global.json b/global.json
index bb62055921..c461cbf6c0 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,9 @@
 {
-  "sdk": {
-    "version": "10.0.102",
-    "rollForward": "latestMinor"
-  }
+    "sdk": {
+        "version": "10.0.102",
+        "rollForward": "latestMinor"
+    },
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
 }
diff --git a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
index a403cab054..04f252e323 100644
--- a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
+++ b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
@@ -2,11 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0-windows;net10.0-windows</TargetFrameworks>
-    <AssemblyTitle>MaterialColorUtilities.Tests</AssemblyTitle>
-    <Product>MaterialColorUtilities.Tests</Product>
     <OutputType>Exe</OutputType>
-    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

From 487b3ab8bf748ef7cca1c0df7b0491baaf579ca4 Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 28 May 2026 23:22:54 -0700
Subject: [PATCH 6/6] Streamline CI workflow test command

Removes redundant `--blame-crash` and `--logger GitHubActions` arguments from the `dotnet test` command. These concerns are now implicitly handled by the centralized test runner configuration, further simplifying the build artifact workflow.
---
 .github/workflows/build_artifacts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 09e1baf9ce..cd6148a7a9 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Test
         timeout-minutes: 20
-        run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions
+        run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build
 
       - name: Upload Screenshots
         if: ${{ always() }}