diff --git a/.claude/rules/testing-patterns.md b/.claude/rules/testing-patterns.md
index d46e7c228f..990cb695fa 100644
--- a/.claude/rules/testing-patterns.md
+++ b/.claude/rules/testing-patterns.md
@@ -7,11 +7,8 @@
 - **Never decrease code coverage** - PRs must maintain or increase coverage
 - Target: **70%+ coverage** for new code
 - Coverage collection:
-  - Centralized in `TestResults/` directory at repository root
-  - Collected only on Linux (ubuntu-latest) runners in CI for performance
-  - Windows and macOS runners skip coverage collection to reduce execution time
-  - Coverage reports uploaded to Codecov automatically from Linux runner
-  - CI monitors coverage on each PR
+  - Temporarily disabled in CI during xUnit v3 / MTP migration
+  - Will be re-enabled once an MTP-compatible coverage solution is integrated
 
 ## Test Patterns
 
@@ -47,11 +44,11 @@
 - ~10 min timeout
 - Uses `Application.Init` and static state
 - Cannot run in parallel
-- Includes `--blame` flags for crash diagnostics
+- Includes `--diagnostic` flag for logging
 
 **Command:**
 ```bash
-dotnet test Tests/UnitTests --no-build --verbosity normal
+dotnet test --project Tests/UnitTests --no-build --verbosity normal
 ```
 
 ### 2. Parallel Tests (`Tests/UnitTestsParallelizable/`) - **PREFERRED**
@@ -67,7 +64,7 @@ dotnet test Tests/UnitTests --no-build --verbosity normal
 
 **Command:**
 ```bash
-dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
+dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
 ```
 
 ### 3. Integration Tests (`Tests/IntegrationTests/`)
@@ -78,13 +75,13 @@ dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
 
 **Command:**
 ```bash
-dotnet test Tests/IntegrationTests --no-build --verbosity normal
+dotnet test --project Tests/IntegrationTests --no-build --verbosity normal
 ```
 
 ## Test Configuration Files
 
 - `xunit.runner.json` - xUnit configuration
-- `coverlet.runsettings` - Coverage settings (OpenCover format)
+- `coverlet.runsettings` - Coverage settings (currently unused, pending MTP integration)
 
 ## Example Test Pattern
 
diff --git a/.claude/tasks/clean-code-review.md b/.claude/tasks/clean-code-review.md
index 0c814ca006..30ded9e58e 100644
--- a/.claude/tasks/clean-code-review.md
+++ b/.claude/tasks/clean-code-review.md
@@ -50,9 +50,9 @@ Run these for each commit:
 
 ```bash
 dotnet build --no-restore
-dotnet test Tests/IntegrationTests --no-build
-dotnet test Tests/UnitTests --no-build
-dotnet test Tests/UnitTestsParallelizable --no-build
+dotnet test --project Tests/IntegrationTests --no-build
+dotnet test --project Tests/UnitTests --no-build
+dotnet test --project Tests/UnitTestsParallelizable --no-build
 ```
 
 ## Terminal.Gui Specific Requirements
diff --git a/.claude/workflows/build-test-workflow.md b/.claude/workflows/build-test-workflow.md
index e86fa5e516..36b1a0ed2b 100644
--- a/.claude/workflows/build-test-workflow.md
+++ b/.claude/workflows/build-test-workflow.md
@@ -47,19 +47,19 @@ dotnet build --configuration Release --no-restore
 **Time:** ~10 min timeout
 
 ```bash
-dotnet test Tests/UnitTests --no-build --verbosity normal
+dotnet test --project Tests/UnitTests --no-build --verbosity normal
 ```
 
 - Uses `Application.Init` and static state
 - Cannot run in parallel
-- Includes `--blame` flags for crash diagnostics
+- Includes `--diagnostic` flag for logging
 
 ### Run Parallel Tests (Preferred)
 
 **Time:** ~10 min timeout
 
 ```bash
-dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
+dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
 ```
 
 - No dependencies on static state
@@ -69,13 +69,13 @@ dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
 ### Run Integration Tests
 
 ```bash
-dotnet test Tests/IntegrationTests --no-build --verbosity normal
+dotnet test --project Tests/IntegrationTests --no-build --verbosity normal
 ```
 
 ### Run All Tests
 
 ```bash
-dotnet test --no-build --verbosity normal
+dotnet test --project Tests/UnitTests --no-build --verbosity normal && dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
 ```
 
 ## Common Build Issues
@@ -94,7 +94,7 @@ dotnet restore ./Examples/SelfContained/SelfContained.csproj -f
 **For clean builds, always run in this order:**
 
 ```bash
-dotnet restore && dotnet build --no-restore && dotnet test --no-build
+dotnet restore && dotnet build --no-restore && dotnet test --project Tests/UnitTests --no-build && dotnet test --project Tests/UnitTestsParallelizable --no-build
 ```
 
 This ensures:
diff --git a/.claude/workflows/pr-workflow.md b/.claude/workflows/pr-workflow.md
index 56731edfaa..26f5b9b593 100644
--- a/.claude/workflows/pr-workflow.md
+++ b/.claude/workflows/pr-workflow.md
@@ -27,7 +27,7 @@ Before submitting a PR, ensure:
 
 - [ ] **Build passes** locally: `dotnet build --no-restore`
 
-- [ ] **Tests pass** locally: `dotnet test --no-build`
+- [ ] **Tests pass** locally: `dotnet test --project Tests/UnitTests --no-build && dotnet test --project Tests/UnitTestsParallelizable --no-build`
 
 ## PR Description Template
 
@@ -70,16 +70,14 @@ dotnet build --configuration Debug --no-restore
 ### 2. Run Tests
 
 ```bash
-dotnet test --no-build --verbosity normal
+dotnet test --project Tests/UnitTests --no-build --verbosity normal && dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
 ```
 
 **Expected:** All tests pass
 
 ### 3. Check Coverage
 
-Coverage is automatically collected on Linux runners in CI.
-
-**Verify coverage didn't decrease** by checking Codecov report on PR.
+Coverage collection is temporarily disabled in CI during the xUnit v3 / MTP migration.
 
 ### 4. Format Code
 
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 54a83d910c..0fe1570677 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -2,12 +2,16 @@
 
 The repository uses multiple GitHub Actions workflows. What runs and when:
 
-### 1) Build Solution (`.github/workflows/build.yml`)
+> **Note:** Tests use xUnit v3 with Microsoft Testing Platform (MTP). The test runner is
+> configured in `global.json` via `"test": { "runner": "Microsoft.Testing.Platform" }`.
+> MTP runs test projects as standalone executables, so each OS must build its own binaries.
 
-- **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`); supports `workflow_call`
+### 1) Build Validation (`.github/workflows/build-validation.yml`)
+
+- **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`)
 - **Runner/timeout**: `ubuntu-latest`, 10 minutes
 - **Steps**:
-- Checkout and setup .NET 8.x GA
+- Checkout and setup .NET 10.x GA
 - `dotnet restore`
 - Build Debug: `dotnet build --configuration Debug --no-restore -property:NoWarn=0618%3B0612`
 - Build Release (library): `dotnet build Terminal.Gui/Terminal.Gui.csproj --configuration Release --no-incremental --force -property:NoWarn=0618%3B0612`
@@ -15,27 +19,20 @@ The repository uses multiple GitHub Actions workflows. What runs and when:
 - Restore NativeAot/SelfContained examples, then restore solution again
 - Build Release for `Examples/NativeAot` and `Examples/SelfContained`
 - Build Release solution
-- Upload artifacts named `build-artifacts`, retention 1 day
 
 ### 2) Build & Run Unit Tests (`.github/workflows/unit-tests.yml`)
 
 - **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`)
 - **Matrix**: Ubuntu/Windows/macOS
-- **Timeout**: 15 minutes per job
+- **Timeout**: 15 minutes (non-parallel), 60 minutes (parallel)
 - **Process**:
-1. Calls build workflow to build solution once
-2. Downloads build artifacts
-3. Runs `dotnet restore` (required for `--no-build` to work)
-4. **Performance optimizations**:
+1. Each OS checks out code, restores, and builds locally
+2. **Performance optimizations**:
    - Disables Windows Defender on Windows runners (significant speedup)
-   - Collects code coverage **only on Linux** (ubuntu-latest) for performance
-   - Windows and macOS skip coverage collection to reduce test time
-   - Increased blame-hang-timeout to 120s for Windows/macOS (60s for Linux)
-5. Runs two test jobs:
-   - **Non-parallel UnitTests**: `Tests/UnitTests` with blame/diag flags; `xunit.stopOnFail=false`
-   - **Parallel UnitTestsParallelizable**: `Tests/UnitTestsParallelizable` with blame/diag flags; `xunit.stopOnFail=false`
-6. Uploads test logs and diagnostic data from all runners
-7. **Uploads code coverage to Codecov only from Linux runner**
+3. Runs two test jobs:
+   - **Non-parallel UnitTests**: `Tests/UnitTests` with diagnostic output
+   - **Parallel UnitTestsParallelizable**: `Tests/UnitTestsParallelizable` with diagnostic output
+4. Uploads test logs and diagnostic data from all runners
 
 **Test results**: All tests output to unified `TestResults/` directory at repository root
 
@@ -45,16 +42,11 @@ The repository uses multiple GitHub Actions workflows. What runs and when:
 - **Matrix**: Ubuntu/Windows/macOS
 - **Timeout**: 15 minutes
 - **Process**:
-1. Calls build workflow
-2. Downloads build artifacts
-3. Runs `dotnet restore`
-4. **Performance optimizations** (same as unit tests):
+1. Each OS checks out code, restores, and builds locally
+2. **Performance optimizations**:
    - Disables Windows Defender on Windows runners
-   - Collects code coverage **only on Linux**
-   - Increased blame-hang-timeout to 120s for Windows/macOS
-5. Runs IntegrationTests with blame/diag flags; `xunit.stopOnFail=true`
-6. Uploads logs per-OS
-7. **Uploads coverage to Codecov only from Linux runner**
+3. Runs IntegrationTests with diagnostic output
+4. Uploads logs per-OS
 
 ### 4) Create Release (`.github/workflows/release.yml`)
 
@@ -95,7 +87,7 @@ The repository uses multiple GitHub Actions workflows. What runs and when:
 # Full CI sequence:
 dotnet restore
 dotnet build --configuration Debug --no-restore
-dotnet test Tests/UnitTests --no-build --verbosity normal
-dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
+dotnet test --project Tests/UnitTests --no-build --verbosity normal
+dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
 dotnet build --configuration Release --no-restore
 ```
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c1ec99668c..d41181adfe 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -10,15 +10,11 @@ on:
       - '**.md'
 
 jobs:
-  build:
-    uses: ./.github/workflows/quick-build.yml
-
   integration_tests:
     name: Integration Tests
     runs-on: ${{ matrix.os }}
-    needs: build
     strategy:
-      fail-fast: false  # Let all OSes finish even if one fails
+      fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     timeout-minutes: 15
@@ -33,57 +29,27 @@ jobs:
           dotnet-version: 10.x
           dotnet-quality: ga
 
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: test-build-artifacts
-          path: .
-
       - name: Restore NuGet packages
         run: dotnet restore
 
+      - name: Build
+        run: dotnet build --no-restore
+
       - name: Disable Windows Defender (Windows only)
         if: runner.os == 'Windows'
         shell: powershell
         run: |
           Add-MpPreference -ExclusionPath "${{ github.workspace }}"
           Add-MpPreference -ExclusionProcess "dotnet.exe"
-          Add-MpPreference -ExclusionProcess "testhost.exe"
-          Add-MpPreference -ExclusionProcess "VSTest.Console.exe"
-
-      - name: Set VSTEST_DUMP_PATH
-        shell: bash
-        run: echo "VSTEST_DUMP_PATH=logs/IntegrationTests/${{ runner.os }}/" >> $GITHUB_ENV
 
       - name: Run IntegrationTests
         shell: bash
         run: |
-          if [ "${{ runner.os }}" == "Linux" ]; then
-            # Run with coverage on Linux only
-            dotnet test Tests/IntegrationTests \
-              --no-build \
-              --verbosity minimal \
-              --collect:"XPlat Code Coverage" \
-              --settings Tests/IntegrationTests/runsettings.coverage.xml \
-              --diag:logs/IntegrationTests/${{ runner.os }}/logs.txt \
-              --blame \
-              --blame-crash \
-              --blame-hang \
-              --blame-hang-timeout 60s \
-              --blame-crash-collect-always
-          else
-            # Run without coverage on Windows/macOS for speed
-            dotnet test Tests/IntegrationTests \
-              --no-build \
-              --verbosity minimal \
-              --settings Tests/IntegrationTests/runsettings.xml \
-              --diag:logs/IntegrationTests/${{ runner.os }}/logs.txt \
-              --blame \
-              --blame-crash \
-              --blame-hang \
-              --blame-hang-timeout 60s \
-              --blame-crash-collect-always
-          fi
+          dotnet test \
+            --project Tests/IntegrationTests \
+            --no-build \
+            --verbosity minimal \
+            --diagnostic --diagnostic-output-directory logs/IntegrationTests/${{ runner.os }}
 
       - name: Upload Integration Test Logs
         if: always()
@@ -93,14 +59,3 @@ jobs:
           path: |
             logs/IntegrationTests/
             TestResults/
-
-      - name: Upload Integration Tests Coverage to Codecov
-        if: matrix.os == 'ubuntu-latest' && always()
-        uses: codecov/codecov-action@v4
-        with:
-          files: TestResults/**/coverage.cobertura.xml
-          flags: integrationtests
-          name: IntegrationTests-${{ runner.os }}
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
-
diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml
index 2298f60126..ffbb23e566 100644
--- a/.github/workflows/stress-tests.yml
+++ b/.github/workflows/stress-tests.yml
@@ -7,7 +7,7 @@ on:
     branches: [ v2_release, v2_develop ]
     paths-ignore:
       - '**.md'
-      
+
 jobs:
   run_stress_tests:
     runs-on: ${{ matrix.os }}
@@ -37,7 +37,7 @@ jobs:
         run: |
           end=$((SECONDS+900))
           while [ $SECONDS -lt $end ]; do
-            dotnet test Tests/StressTests --no-build --verbosity normal --diag:logs/${{ runner.os }}/logs.txt --blame --blame-crash --blame-hang --blame-hang-timeout 60s --blame-crash-collect-always -- xunit.stopOnFail=true
+            dotnet test --project Tests/StressTests --no-build --verbosity normal --diagnostic --diagnostic-output-directory logs/${{ runner.os }}
           done
 
       - name: Upload Test Logs
@@ -80,62 +80,31 @@ jobs:
         run: |
           Add-MpPreference -ExclusionPath "${{ github.workspace }}"
           Add-MpPreference -ExclusionProcess "dotnet.exe"
-          Add-MpPreference -ExclusionProcess "testhost.exe"
-          Add-MpPreference -ExclusionProcess "VSTest.Console.exe"
-
-      - name: Set VSTEST_DUMP_PATH
-        shell: bash
-        run: echo "VSTEST_DUMP_PATH=logs/UnitTestsParallelizable/${{ runner.os }}/" >> $GITHUB_ENV
 
-      - name: Run UnitTestsParallelizable (3 iterations with varying parallelization)
+      - name: Run UnitTestsParallelizable (3 iterations)
         shell: bash
         run: |
-          # Run tests 3 times with different parallelization settings to expose concurrency issues
-          # Run 1: Default parallelization (2x) - standard test execution
-          # Run 2: Maximum parallelization (unlimited) - stress test with high concurrency
-          # Run 3: Single-threaded execution (1) - deterministic execution to expose ordering issues
+          # Run tests 3 times to expose concurrency issues
           for RUN in {1..3}; do
             echo "============================================"
             echo "Starting test run $RUN of 3"
             echo "============================================"
-            
-            # Use a combination of run number and timestamp to create different execution patterns
-            SEED=$((1000 + $RUN + $(date +%s) % 1000))
-            echo "Using randomization seed: $SEED"
-            
-            # Vary the xUnit parallelization based on run number to expose race conditions
-            if [ $RUN -eq 1 ]; then
-              XUNIT_MAX_PARALLEL_THREADS="2x"
-              echo "Run $RUN: Using default parallelization (2x)"
-            elif [ $RUN -eq 2 ]; then
-              XUNIT_MAX_PARALLEL_THREADS="unlimited"
-              echo "Run $RUN: Using maximum parallelization (unlimited)"
-            else
-              XUNIT_MAX_PARALLEL_THREADS="1"
-              echo "Run $RUN: Using single-threaded execution"
-            fi
-            
-            dotnet test Tests/UnitTestsParallelizable \
+
+            dotnet test \
+              --project Tests/UnitTestsParallelizable \
               --no-build \
               --verbosity normal \
-              --settings Tests/UnitTestsParallelizable/runsettings.xml \
-              --diag:logs/UnitTestsParallelizable/${{ runner.os }}/run${RUN}-logs.txt \
-              --blame \
-              --blame-crash \
-              --blame-hang \
-              --blame-hang-timeout 60s \
-              --blame-crash-collect-always \
-              -- xUnit.MaxParallelThreads=${XUNIT_MAX_PARALLEL_THREADS}
-            
+              --diagnostic --diagnostic-output-directory logs/UnitTestsParallelizable/${{ runner.os }}/run${RUN}
+
             if [ $? -ne 0 ]; then
               echo "ERROR: Test run $RUN failed!"
               exit 1
             fi
-            
+
             echo "Test run $RUN completed successfully"
             echo ""
           done
-          
+
           echo "============================================"
           echo "All 3 test runs completed successfully!"
           echo "============================================"
@@ -148,4 +117,3 @@ jobs:
           path: |
             logs/UnitTestsParallelizable/
             TestResults/
-
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 96b2429ac6..181333709a 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -9,23 +9,17 @@ on:
     branches: [ v2_release, v2_develop ]
     paths-ignore:
       - '**.md'
-      
-jobs:
-  # Call the quick-build workflow to build Debug configuration only
-  build:
-    uses: ./.github/workflows/quick-build.yml
 
+jobs:
   non_parallel_unittests:
-    name: Non-Parallel Unit Tests  
+    name: Non-Parallel Unit Tests
     runs-on: ${{ matrix.os }}
-    needs: build
     strategy:
-      # Turn off fail-fast to let all runners run even if there are errors
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
-    timeout-minutes: 15  # Increased from 10 for Windows
+    timeout-minutes: 15
     steps:
 
     - name: Checkout code
@@ -37,16 +31,12 @@ jobs:
         dotnet-version: 10.x
         dotnet-quality: 'ga'
 
-    - name: Download build artifacts
-      uses: actions/download-artifact@v4
-      with:
-        name: test-build-artifacts
-        path: .
-
-    # KEEP THIS - It's needed for --no-build to work
     - name: Restore NuGet packages
       run: dotnet restore
 
+    - name: Build
+      run: dotnet build --no-restore
+
     # Optimize Windows performance
     - name: Disable Windows Defender (Windows only)
       if: runner.os == 'Windows'
@@ -54,42 +44,15 @@ jobs:
       run: |
         Add-MpPreference -ExclusionPath "${{ github.workspace }}"
         Add-MpPreference -ExclusionProcess "dotnet.exe"
-        Add-MpPreference -ExclusionProcess "testhost.exe"
-        Add-MpPreference -ExclusionProcess "VSTest.Console.exe"
-
-    - name: Set VSTEST_DUMP_PATH
-      shell: bash
-      run: echo "VSTEST_DUMP_PATH=logs/UnitTests/${{ runner.os }}/" >> $GITHUB_ENV
 
     - name: Run UnitTests
       shell: bash
       run: |
-        if [ "${{ runner.os }}" == "Linux" ]; then
-          # Run with coverage on Linux only
-          dotnet test Tests/UnitTests \
-            --no-build \
-            --verbosity normal \
-            --collect:"XPlat Code Coverage" \
-            --settings Tests/UnitTests/runsettings.xml \
-            --diag:logs/UnitTests/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout 60s \
-            --blame-crash-collect-always
-        else
-          # Run without coverage on Windows/macOS for speed
-          dotnet test Tests/UnitTests \
-            --no-build \
-            --verbosity normal \
-            --settings Tests/UnitTests/runsettings.xml \
-            --diag:logs/UnitTests/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout 120s \
-            --blame-crash-collect-always
-        fi
+        dotnet test \
+          --project Tests/UnitTests \
+          --no-build \
+          --verbosity normal \
+          --diagnostic --diagnostic-output-directory logs/UnitTests/${{ runner.os }}
 
     - name: Upload Test Logs
       if: always()
@@ -103,23 +66,11 @@ jobs:
           **/*.dmp
         if-no-files-found: ignore
         retention-days: 7
-  
-    - name: Upload Non-Parallel UnitTests Coverage to Codecov
-      if: matrix.os == 'ubuntu-latest' && always()
-      uses: codecov/codecov-action@v4
-      with:
-        files: TestResults/**/coverage.cobertura.xml
-        flags: unittests-nonparallel
-        name: UnitTests-${{ runner.os }}
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: false
 
   parallel_unittests:
-    name: Parallel Unit Tests  
+    name: Parallel Unit Tests
     runs-on: ${{ matrix.os }}
-    needs: build
     strategy:
-      # Turn off fail-fast to let all runners run even if there are errors
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
@@ -136,87 +87,28 @@ jobs:
         dotnet-version: 10.x
         dotnet-quality: 'ga'
 
-    - name: Download build artifacts
-      uses: actions/download-artifact@v4
-      with:
-        name: test-build-artifacts
-        path: .
-
     - name: Restore NuGet packages
       run: dotnet restore
 
+    - name: Build
+      run: dotnet build --no-restore
+
     - name: Disable Windows Defender (Windows only)
       if: runner.os == 'Windows'
       shell: powershell
       run: |
         Add-MpPreference -ExclusionPath "${{ github.workspace }}"
         Add-MpPreference -ExclusionProcess "dotnet.exe"
-        Add-MpPreference -ExclusionProcess "testhost.exe"
-        Add-MpPreference -ExclusionProcess "VSTest.Console.exe"
-
-    - name: Set VSTEST_DUMP_PATH
-      shell: bash
-      run: echo "VSTEST_DUMP_PATH=logs/UnitTestsParallelizable/${{ runner.os }}/" >> $GITHUB_ENV
 
     - name: Run UnitTestsParallelizable
       shell: bash
       run: |
-        # Detect CPU count and calculate optimal thread count
-        if [ "${{ runner.os }}" == "Linux" ]; then
-          CPU_COUNT=$(nproc)
-        elif [ "${{ runner.os }}" == "macOS" ]; then
-          CPU_COUNT=$(sysctl -n hw.ncpu)
-        else  # Windows
-          CPU_COUNT=$NUMBER_OF_PROCESSORS
-        fi
-        
-        # Use 2x CPU count for I/O-bound tests, capped at reasonable max
-        # macOS uses lower cap (4) to prevent thread pool exhaustion
-        MAX_THREADS=$((CPU_COUNT * 2))
-        if [ "${{ runner.os }}" == "macOS" ]; then
-          if [ $MAX_THREADS -gt 4 ]; then
-            MAX_THREADS=2
-          fi
-          HANG_TIMEOUT="240s"
-        else
-          if [ $MAX_THREADS -gt 16 ]; then
-            MAX_THREADS=16
-          fi
-          HANG_TIMEOUT="60s"
-        fi
-        
-        echo "Detected $CPU_COUNT CPUs, using $MAX_THREADS parallel threads"
-        
-        # Run tests with dynamic thread count
-        if [ "${{ runner.os }}" == "Linux" ]; then
-          dotnet test Tests/UnitTestsParallelizable \
-            --no-build \
-            --verbosity normal \
-            --collect:"XPlat Code Coverage" \
-            --settings Tests/UnitTests/runsettings.coverage.xml \
-            --diag:logs/UnitTestsParallelizable/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout $HANG_TIMEOUT \
-            --blame-crash-collect-always \
-            -- xUnit.MaxParallelThreads=$MAX_THREADS \
-            -- xUnit.StopOnFail=true
-        else
-          dotnet test Tests/UnitTestsParallelizable \
-            --no-build \
-            --verbosity normal \
-            --settings Tests/UnitTestsParallelizable/runsettings.xml \
-            --diag:logs/UnitTestsParallelizable/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout $HANG_TIMEOUT \
-            --blame-crash-collect-always \
-            -- xUnit.MaxParallelThreads=$MAX_THREADS \
-            -- xUnit.StopOnFail=true
-        fi
-        
+        dotnet test \
+          --project Tests/UnitTestsParallelizable \
+          --no-build \
+          --verbosity normal \
+          --diagnostic --diagnostic-output-directory logs/UnitTestsParallelizable/${{ runner.os }}
+
         echo "============================================"
         echo "Parallel unit tests completed successfully!"
         echo "============================================"
@@ -233,13 +125,3 @@ jobs:
           **/*.dmp
         if-no-files-found: ignore
         retention-days: 7
-  
-    - name: Upload Parallelizable UnitTests Coverage to Codecov
-      if: matrix.os == 'ubuntu-latest' && always()
-      uses: codecov/codecov-action@v4
-      with:
-        files: TestResults/**/coverage.cobertura.xml
-        flags: unittests-parallel
-        name: UnitTestsParallelizable-${{ runner.os }}
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: false
diff --git a/AGENTS.md b/AGENTS.md
index 0275642d2b..37238ac059 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -56,7 +56,7 @@ dotnet run
 **Terminal.Gui** - Cross-platform console UI toolkit for .NET (C# 12, net8.0)
 
 **Build:** `dotnet restore && dotnet build --no-restore`
-**Test:** `dotnet test --no-build`
+**Test:** `dotnet test --project Tests/UnitTests --no-build && dotnet test --project Tests/UnitTestsParallelizable --no-build`
 **Details:** [Build & Test Workflow](.claude/workflows/build-test-workflow.md)
 
 ## Quick Rules
diff --git a/CLAUDE.md b/CLAUDE.md
index 5973460009..ac89ea232b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -81,8 +81,8 @@ When in planning mode:
 ```bash
 dotnet restore
 dotnet build --no-restore
-dotnet test Tests/UnitTestsParallelizable --no-build
-dotnet test Tests/UnitTests --no-build
+dotnet test --project Tests/UnitTestsParallelizable --no-build
+dotnet test --project Tests/UnitTests --no-build
 ```
 
 ## Key Concepts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2b556c5a00..0b1abf6c57 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,22 +76,22 @@ Welcome! This guide provides everything you need to know to contribute effective
 
 1. **Non-parallel tests** (depend on static state, ~10 min timeout):
    ```bash
-   dotnet test Tests/UnitTests --no-build --verbosity normal
+   dotnet test --project Tests/UnitTests --no-build --verbosity normal
    ```
    - Uses `Application.Init` and static state
    - Cannot run in parallel
-   - Includes `--blame` flags for crash diagnostics
+   - Includes `--diagnostic` flag for logging
 
 2. **Parallel tests** (can run concurrently, ~10 min timeout):
    ```bash
-   dotnet test Tests/UnitTestsParallelizable --no-build --verbosity normal
+   dotnet test --project Tests/UnitTestsParallelizable --no-build --verbosity normal
    ```
    - No dependencies on static state
    - **Preferred for new tests**
 
 3. **Integration tests**:
    ```bash
-   dotnet test Tests/IntegrationTests --no-build --verbosity normal
+   dotnet test --project Tests/IntegrationTests --no-build --verbosity normal
    ```
 
 ### Common Build Issues
@@ -176,11 +176,8 @@ Welcome! This guide provides everything you need to know to contribute effective
 - **Never decrease code coverage** - PRs must maintain or increase coverage
 - Target: 70%+ coverage for new code
 - **Coverage collection**:
-- Centralized in `TestResults/` directory at repository root
-- Collected only on Linux (ubuntu-latest) runners in CI for performance
-- Windows and macOS runners skip coverage collection to reduce execution time
-- Coverage reports uploaded to Codecov automatically from Linux runner
-- CI monitors coverage on each PR
+- Temporarily disabled in CI during xUnit v3 / MTP migration
+- Will be re-enabled once an MTP-compatible coverage solution is integrated
 
 ### Test Patterns
 
@@ -195,7 +192,7 @@ Welcome! This guide provides everything you need to know to contribute effective
 ### Test Configuration
 
 - `xunit.runner.json` - xUnit configuration
-- `coverlet.runsettings` - Coverage settings (OpenCover format)
+- `coverlet.runsettings` - Coverage settings (currently unused, pending MTP integration)
 
 ## API Documentation Requirements
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 34805646a7..b699b270a7 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,43 +6,43 @@
     <!-- Enable Nuget Source Link for github -->
     <PackageVersion Include="AnsiConsoleToHtml" Version="0.2.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[8,9)" />
-    <PackageVersion Include="ColorHelper" Version="[1.8.1,2)" />
-    <PackageVersion Include="JetBrains.Annotations" Version="[2025.2.2,)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageVersion Include="System.IO.Abstractions" Version="[22.0.16,23)" />
-    <PackageVersion Include="Wcwidth" Version="[4.0.0,)" />
-    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21.2,2)" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
+    <PackageVersion Include="ColorHelper" Version="1.8.1" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+    <PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />
+    <PackageVersion Include="Wcwidth" Version="4.0.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
+    <PackageVersion Include="Serilog" Version="4.3.1" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.11,4)" />
-    <PackageVersion Include="CsvHelper" Version="[33.0.1,34)" />
-    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="[3.1.6,4)" />
-    <PackageVersion Include="System.CommandLine" Version="[2.0.0-beta4.22272.1,3)" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="[8.4.0,9)" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.2,)" />
-    <PackageVersion Include="ReactiveUI" Version="[20.1.63,21)" />
-    <PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="[1.3.1,2)" />
-    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="[2.1.8,3)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.13,18)" />
-    <PackageVersion Include="Moq" Version="[4.20.72,5)" />
-    <PackageVersion Include="ReportGenerator" Version="5.4.5" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
-    <PackageVersion Include="xunit" Version="[2.9.3,3)" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="[1.6.24,2)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,3)" />
-    <PackageVersion Include="coverlet.collector" Version="[6.0.4,7)" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
+    <PackageVersion Include="CsvHelper" Version="33.1.0" />
+    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.3" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+    <PackageVersion Include="ReactiveUI" Version="23.1.8" />
+    <PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="ReportGenerator" Version="5.5.3" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
+    <PackageVersion Include="coverlet.collector" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PackageVersion Include="Terminal.Gui" Version="2.0.0" />
diff --git a/Examples/ReactiveExample/LoginView.cs b/Examples/ReactiveExample/LoginView.cs
index 0eb5e7a345..4090d2694d 100644
--- a/Examples/ReactiveExample/LoginView.cs
+++ b/Examples/ReactiveExample/LoginView.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 using System.Reactive.Linq;
 using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
@@ -138,7 +139,7 @@ public LoginView (LoginViewModel viewModel)
                 ViewModel
                     .WhenAnyObservable (x => x.Login.IsExecuting)
                     .Select (executing => executing ? ProgressMessage : IdleMessage)
-                    .ObserveOn (RxApp.MainThreadScheduler)
+                    .ObserveOn (Program._rxApp.MainThreadScheduler!)
                     .BindTo (progress, x => x.Text)
                     .DisposeWith (_disposable);
             });
diff --git a/Examples/ReactiveExample/Program.cs b/Examples/ReactiveExample/Program.cs
index e70611afc5..fd7572b69d 100644
--- a/Examples/ReactiveExample/Program.cs
+++ b/Examples/ReactiveExample/Program.cs
@@ -1,5 +1,5 @@
 using System.Reactive.Concurrency;
-using ReactiveUI;
+using ReactiveUI.Builder;
 using Terminal.Gui.App;
 using Terminal.Gui.Configuration;
 
@@ -7,14 +7,17 @@ namespace ReactiveExample;
 
 public static class Program
 {
-    private static void Main (string [] args)
+    internal static ReactiveUIBuilder _rxApp;
+
+    private static void Main (string [] _)
     {
         ConfigurationManager.Enable (ConfigLocations.All);
         using IApplication app = Application.Create ();
         app.Init ();
-        RxApp.MainThreadScheduler = new TerminalScheduler (app);
-        RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
-        var loginView = new LoginView (new ());
+        _rxApp = RxAppBuilder.CreateReactiveUIBuilder ();
+        _rxApp.WithMainThreadScheduler (new TerminalScheduler (app));
+        _rxApp.WithTaskPoolScheduler (TaskPoolScheduler.Default);
+        var loginView = new LoginView (new LoginViewModel ());
         app.Run (loginView);
         loginView.Dispose ();
     }
diff --git a/Examples/ScenarioRunner/Program.cs b/Examples/ScenarioRunner/Program.cs
index 4925d55128..b2d353c46d 100644
--- a/Examples/ScenarioRunner/Program.cs
+++ b/Examples/ScenarioRunner/Program.cs
@@ -1,8 +1,6 @@
 #nullable enable
 using System.Collections.ObjectModel;
 using System.CommandLine;
-using System.CommandLine.Builder;
-using System.CommandLine.Parsing;
 using System.Reflection;
 using System.Text;
 using Microsoft.Extensions.Logging;
@@ -34,168 +32,178 @@ public static int Main (string [] args)
         // Get allowed driver names
         string? [] allowedDrivers = DriverRegistry.GetDriverNames ().ToArray ();
 
-        Option<string> driverOption = new Option<string> ("--driver", "The IDriver to use.").FromAmong (allowedDrivers!);
-        driverOption.SetDefaultValue (string.Empty);
-        driverOption.AddAlias ("-d");
+        Option<string> driverOption = new Option<string> ("--driver") { Description = "The IDriver to use.", DefaultValueFactory = _ => string.Empty };
+        driverOption.AcceptOnlyFromAmong (allowedDrivers!);
+        driverOption.Aliases.Add ("-d");
 
-        Option<bool> disableConfigManagement = new ("--disable-cm", "Indicates Configuration Management should not be enabled.");
-        disableConfigManagement.AddAlias ("-dcm");
+        Option<bool> disableConfigManagement = new ("--disable-cm") { Description = "Indicates Configuration Management should not be enabled." };
+        disableConfigManagement.Aliases.Add ("-dcm");
 
-        Option<bool> force16Colors = new ("--force-16-colors", "Forces the driver to use 16-color mode instead of TrueColor.");
-        force16Colors.AddAlias ("-16");
+        Option<bool> force16Colors = new ("--force-16-colors") { Description = "Forces the driver to use 16-color mode instead of TrueColor." };
+        force16Colors.Aliases.Add ("-16");
 
-        Option<uint> benchmarkTimeout = new ("--timeout",
-                                             () => Scenario.BenchmarkTimeout,
-                                             $"The maximum time in milliseconds to run a benchmark. Default is {Scenario.BenchmarkTimeout}ms.");
-        benchmarkTimeout.AddAlias ("-t");
+        Option<uint> benchmarkTimeout = new ("--timeout")
+        {
+            Description = $"The maximum time in milliseconds to run a benchmark. Default is {Scenario.BenchmarkTimeout}ms.",
+            DefaultValueFactory = _ => Scenario.BenchmarkTimeout
+        };
+        benchmarkTimeout.Aliases.Add ("-t");
 
-        Option<string> resultsFile = new ("--file", "The file to save benchmark results to.");
-        resultsFile.AddAlias ("-f");
+        Option<string> resultsFile = new ("--file") { Description = "The file to save benchmark results to." };
+        resultsFile.Aliases.Add ("-f");
 
         LogFilePath = $"{LOGFILE_LOCATION}/{Assembly.GetExecutingAssembly ().GetName ().Name}";
 
-        Option<string> debugLogLevel = new Option<string> ("--debug-log-level", "The level to use for logging.").FromAmong (Enum.GetNames<LogLevel> ());
-        debugLogLevel.SetDefaultValue ("Warning");
-        debugLogLevel.AddAlias ("-dl");
+        Option<string> debugLogLevel = new Option<string> ("--debug-log-level")
+        {
+            Description = "The level to use for logging.", DefaultValueFactory = _ => "Warning"
+        };
+        debugLogLevel.AcceptOnlyFromAmong (Enum.GetNames<LogLevel> ());
+        debugLogLevel.Aliases.Add ("-dl");
 
         // List command
         Command listCommand = new ("list", "List all available scenarios");
 
-        listCommand.SetHandler (() =>
-                                {
-                                    ObservableCollection<Scenario> scenarios = Scenario.GetScenarios ();
+        listCommand.SetAction (_ =>
+                               {
+                                   ObservableCollection<Scenario> scenarios = Scenario.GetScenarios ();
 
-                                    Console.WriteLine (@$"Available scenarios ({scenarios.Count})");
-                                    Console.WriteLine ();
+                                   Console.WriteLine (@$"Available scenarios ({scenarios.Count})");
+                                   Console.WriteLine ();
 
-                                    foreach (Scenario s in scenarios)
-                                    {
-                                        Console.WriteLine (@$"  {s.GetName (),-30} {s.GetDescription ()}");
-                                    }
-                                });
+                                   foreach (Scenario s in scenarios)
+                                   {
+                                       Console.WriteLine (@$"  {s.GetName (),-30} {s.GetDescription ()}");
+                                   }
+                               });
 
         // Run command
-        Argument<string> scenarioArgument = new ("scenario", "The name of the Scenario to run.");
+        Argument<string> scenarioArgument = new ("scenario") { Description = "The name of the Scenario to run." };
 
         Command runCommand = new ("run", "Run a specific scenario") { scenarioArgument };
 
-        runCommand.AddOption (driverOption);
-        runCommand.AddOption (disableConfigManagement);
-        runCommand.AddOption (force16Colors);
-        runCommand.AddOption (debugLogLevel);
+        runCommand.Options.Add (driverOption);
+        runCommand.Options.Add (disableConfigManagement);
+        runCommand.Options.Add (force16Colors);
+        runCommand.Options.Add (debugLogLevel);
 
-        runCommand.SetHandler ((scenarioName, driver, disableCm, force16, logLevel) =>
-                               {
-                                   SetupLogging (logLevel);
+        runCommand.SetAction (parseResult =>
+                              {
+                                  // Extract the values ​​using parseResult.
+                                  string scenarioName = parseResult.GetRequiredValue (scenarioArgument);
+                                  string driver = parseResult.GetRequiredValue (driverOption);
+                                  bool disableCm = parseResult.GetRequiredValue (disableConfigManagement);
+                                  bool force16 = parseResult.GetRequiredValue (force16Colors);
+                                  string logLevel = parseResult.GetRequiredValue (debugLogLevel);
 
-                                   Runner runner = new ();
+                                  // Executing the original logic
+                                  SetupLogging (logLevel);
 
-                                   if (!disableCm)
-                                   {
-                                       runner.SetRuntimeConfig(driver, force16 ? true : null);
-                                       ConfigurationManager.Enable (ConfigLocations.All);
-                                   }
+                                  Runner runner = new ();
 
-                                   Scenario? scenario = FindScenario (scenarioName);
+                                  if (!disableCm)
+                                  {
+                                      runner.SetRuntimeConfig (driver, force16 ? true : null);
+                                      ConfigurationManager.Enable (ConfigLocations.All);
+                                  }
 
-                                   if (scenario is null)
-                                   {
-                                       Console.Error.WriteLine ($"Scenario '{scenarioName}' not found.");
+                                  Scenario? scenario = FindScenario (scenarioName);
 
-                                       return;
-                                   }
+                                  if (scenario is null)
+                                  {
+                                      Console.Error.WriteLine ($"Scenario '{scenarioName}' not found.");
 
-                                   // Pass force16 only if explicitly set (default false means not set)
-                                   runner.RunScenario (scenarioName, false);
-                               },
-                               scenarioArgument,
-                               driverOption,
-                               disableConfigManagement,
-                               force16Colors,
-                               debugLogLevel);
+                                      return; // SetAction returns void, so the empty return value works.
+                                  }
+
+                                  // Pass force16 only if explicitly set (default false means not set)
+                                  runner.RunScenario (scenarioName, false);
+                              });
 
         // Benchmark command
-        Argument<string?> benchmarkScenarioArgument =
-            new ("scenario", () => null, "The name of the Scenario to benchmark. If not specified, all scenarios are benchmarked.");
+        Argument<string?> benchmarkScenarioArgument = new ("scenario")
+        {
+            Description = "The name of the Scenario to benchmark. If not specified, all scenarios are benchmarked.", DefaultValueFactory = _ => null
+        };
 
         Command benchmarkCommand = new ("benchmark", "Benchmark scenarios") { benchmarkScenarioArgument };
 
-        benchmarkCommand.AddOption (driverOption);
-        benchmarkCommand.AddOption (disableConfigManagement);
-        benchmarkCommand.AddOption (force16Colors);
-        benchmarkCommand.AddOption (benchmarkTimeout);
-        benchmarkCommand.AddOption (resultsFile);
-        benchmarkCommand.AddOption (debugLogLevel);
-
-        benchmarkCommand.SetHandler ((scenarioName, driver, disableCm, force16, timeout, file, logLevel) =>
-                                     {
-                                         SetupLogging (logLevel);
-                                         Scenario.BenchmarkTimeout = timeout;
-
-                                         Runner runner = new ();
-
-                                         if (!disableCm)
-                                         {
-                                             // Pass force16 only if explicitly set
-                                             runner.SetRuntimeConfig (driver, force16 ? true : null);
-                                             ConfigurationManager.Enable (ConfigLocations.All);
-                                         }
-
-                                         List<BenchmarkResults> results;
-
-                                         if (string.IsNullOrEmpty (scenarioName))
-                                         {
-                                             // Benchmark all scenarios
-                                             ObservableCollection<Scenario> scenarios = Scenario.GetScenarios ();
-                                             results = runner.BenchmarkAllScenarios (scenarios);
-                                         }
-                                         else
-                                         {
-                                             // Benchmark single scenario
-                                             Scenario? scenario = FindScenario (scenarioName);
-
-                                             if (scenario is null)
-                                             {
-                                                 Console.Error.WriteLine ($"Scenario '{scenarioName}' not found.");
-
-                                                 return;
-                                             }
-
-                                             BenchmarkResults? result = runner.RunScenario (scenarioName, true);
-                                             results = result is { } ? [result] : [];
-                                         }
-
-                                         if (results.Count == 0)
-                                         {
-                                             Console.WriteLine (@"No benchmark results collected.");
-
-                                             return;
-                                         }
-
-                                         if (!string.IsNullOrEmpty (file))
-                                         {
-                                             Runner.SaveResultsToFile (results, file);
-                                             Console.WriteLine (@$"Results saved to {file}");
-                                         }
-                                         else
-                                         {
-                                             // Display in UI
-                                             Runner.DisplayResultsUI (results);
-                                         }
-                                     },
-                                     benchmarkScenarioArgument,
-                                     driverOption,
-                                     disableConfigManagement,
-                                     force16Colors,
-                                     benchmarkTimeout,
-                                     resultsFile,
-                                     debugLogLevel);
+        benchmarkCommand.Options.Add (driverOption);
+        benchmarkCommand.Options.Add (disableConfigManagement);
+        benchmarkCommand.Options.Add (force16Colors);
+        benchmarkCommand.Options.Add (benchmarkTimeout);
+        benchmarkCommand.Options.Add (resultsFile);
+        benchmarkCommand.Options.Add (debugLogLevel);
 
-        RootCommand rootCommand = new ("Terminal.Gui Scenario Runner - Run and benchmark Terminal.Gui scenarios") { listCommand, runCommand, benchmarkCommand };
+        benchmarkCommand.SetAction (parseResult =>
+                                    {
+                                        // Extract the values ​​using parseResult.
+                                        string scenarioName = parseResult.GetRequiredValue (scenarioArgument);
+                                        string driver = parseResult.GetRequiredValue (driverOption);
+                                        bool disableCm = parseResult.GetRequiredValue (disableConfigManagement);
+                                        bool force16 = parseResult.GetRequiredValue (force16Colors);
+                                        uint timeout = parseResult.GetRequiredValue (benchmarkTimeout);
+                                        string file = parseResult.GetRequiredValue (resultsFile);
+                                        string logLevel = parseResult.GetRequiredValue (debugLogLevel);
+
+                                        SetupLogging (logLevel);
+                                        Scenario.BenchmarkTimeout = timeout;
+
+                                        Runner runner = new ();
+
+                                        if (!disableCm)
+                                        {
+                                            // Pass force16 only if explicitly set
+                                            runner.SetRuntimeConfig (driver, force16 ? true : null);
+                                            ConfigurationManager.Enable (ConfigLocations.All);
+                                        }
+
+                                        List<BenchmarkResults> results;
+
+                                        if (string.IsNullOrEmpty (scenarioName))
+                                        {
+                                            // Benchmark all scenarios
+                                            ObservableCollection<Scenario> scenarios = Scenario.GetScenarios ();
+                                            results = runner.BenchmarkAllScenarios (scenarios);
+                                        }
+                                        else
+                                        {
+                                            // Benchmark single scenario
+                                            Scenario? scenario = FindScenario (scenarioName);
+
+                                            if (scenario is null)
+                                            {
+                                                Console.Error.WriteLine ($"Scenario '{scenarioName}' not found.");
+
+                                                return;
+                                            }
+
+                                            BenchmarkResults? result = runner.RunScenario (scenarioName, true);
+                                            results = result is { } ? [result] : [];
+                                        }
+
+                                        if (results.Count == 0)
+                                        {
+                                            Console.WriteLine (@"No benchmark results collected.");
+
+                                            return;
+                                        }
+
+                                        if (!string.IsNullOrEmpty (file))
+                                        {
+                                            Runner.SaveResultsToFile (results, file);
+                                            Console.WriteLine (@$"Results saved to {file}");
+                                        }
+                                        else
+                                        {
+                                            // Display in UI
+                                            Runner.DisplayResultsUI (results);
+                                        }
+                                    });
 
-        Parser parser = new CommandLineBuilder (rootCommand).UseDefaults ().Build ();
+        RootCommand rootCommand = new ("Terminal.Gui Scenario Runner - Run and benchmark Terminal.Gui scenarios") { listCommand, runCommand, benchmarkCommand };
 
-        return parser.Invoke (args);
+        return rootCommand.Parse (args).Invoke ();
     }
 
     private static Scenario? FindScenario (string name)
diff --git a/Examples/UICatalog/Scenarios/Editor.cs b/Examples/UICatalog/Scenarios/Editor.cs
index 602184cd2a..2569539709 100644
--- a/Examples/UICatalog/Scenarios/Editor.cs
+++ b/Examples/UICatalog/Scenarios/Editor.cs
@@ -107,7 +107,7 @@ public override void Main ()
             Title = "ForceMinimumPosTo_Zero", Value = _forceMinimumPosToZero ? CheckState.Checked : CheckState.UnChecked
         };
 
-        _miForceMinimumPosToZeroCheckBox.ValueChanging += (s, e) =>
+        _miForceMinimumPosToZeroCheckBox.ValueChanged += (s, e) =>
                                                           {
                                                               _forceMinimumPosToZero = e.NewValue == CheckState.Checked;
 
@@ -143,8 +143,7 @@ public override void Main ()
                                        {
                                            if (!e.Value)
                                            {
-                                               // BUGBUG: This should restore the original culture info
-                                               Thread.CurrentThread.CurrentUICulture = new CultureInfo ("en-US");
+                                               Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
                                            }
                                        };
 
@@ -304,7 +303,7 @@ void CreateCultureMenuItem (string title, string cultureName, bool isChecked)
 
             allCheckBoxes.Add (checkBox);
 
-            checkBox.ValueChanging += (s, e) =>
+            checkBox.ValueChanged += (s, e) =>
                                       {
                                           if (e.NewValue == CheckState.Checked)
                                           {
@@ -744,14 +743,14 @@ private View CreateFindTab ()
         {
             X = 0, Y = Pos.Top (txtToFind) + 2, Value = _matchCase ? CheckState.Checked : CheckState.UnChecked, Text = "Match c_ase"
         };
-        ckbMatchCase.ValueChanging += (s, e) => { _matchCase = e.NewValue == CheckState.Checked; };
+        ckbMatchCase.ValueChanged += (s, e) => { _matchCase = e.NewValue == CheckState.Checked; };
         d.Add (ckbMatchCase);
 
         CheckBox ckbMatchWholeWord = new ()
         {
             X = 0, Y = Pos.Top (ckbMatchCase) + 1, Value = _matchWholeWord ? CheckState.Checked : CheckState.UnChecked, Text = "Match _whole word"
         };
-        ckbMatchWholeWord.ValueChanging += (s, e) => { _matchWholeWord = e.NewValue == CheckState.Checked; };
+        ckbMatchWholeWord.ValueChanged += (s, e) => { _matchWholeWord = e.NewValue == CheckState.Checked; };
         d.Add (ckbMatchWholeWord);
 
         return d;
@@ -824,14 +823,14 @@ private View CreateReplaceTab ()
         {
             X = 0, Y = Pos.Top (txtToFind) + 2, Value = _matchCase ? CheckState.Checked : CheckState.UnChecked, Text = "Match c_ase"
         };
-        ckbMatchCase.ValueChanging += (s, e) => { _matchCase = e.NewValue == CheckState.Checked; };
+        ckbMatchCase.ValueChanged += (s, e) => { _matchCase = e.NewValue == CheckState.Checked; };
         d.Add (ckbMatchCase);
 
         CheckBox ckbMatchWholeWord = new ()
         {
             X = 0, Y = Pos.Top (ckbMatchCase) + 1, Value = _matchWholeWord ? CheckState.Checked : CheckState.UnChecked, Text = "Match _whole word"
         };
-        ckbMatchWholeWord.ValueChanging += (s, e) => { _matchWholeWord = e.NewValue == CheckState.Checked; };
+        ckbMatchWholeWord.ValueChanged += (s, e) => { _matchWholeWord = e.NewValue == CheckState.Checked; };
         d.Add (ckbMatchWholeWord);
 
         return d;
diff --git a/Examples/UICatalog/UICatalog.cs b/Examples/UICatalog/UICatalog.cs
index c6f32830eb..b6a5e2bbe6 100644
--- a/Examples/UICatalog/UICatalog.cs
+++ b/Examples/UICatalog/UICatalog.cs
@@ -10,9 +10,8 @@
 global using Terminal.Gui.Text;
 global using Terminal.Gui.FileServices;
 global using Terminal.Gui.Resources;
-global using Terminal.Gui.Tracing;
 using System.CommandLine;
-using System.CommandLine.Builder;
+using System.CommandLine.Help;
 using System.CommandLine.Parsing;
 using System.Diagnostics;
 using System.Globalization;
@@ -81,60 +80,77 @@ private static int Main (string [] args)
         // Get allowed driver names
         string? [] allowedDrivers = DriverRegistry.GetDriverNames ().ToArray ();
 
-        Option<string> driverOption = new Option<string> ("--driver", "The IDriver to use.").FromAmong (allowedDrivers!);
-        driverOption.SetDefaultValue (string.Empty);
-        driverOption.AddAlias ("-d");
-        driverOption.AddAlias ("--d");
+        Option<string> driverOption = new ("--driver")
+        {
+            Description = "The IDriver to use."
+        };
+        driverOption.AcceptOnlyFromAmong (allowedDrivers!);
+        driverOption.DefaultValueFactory = _ => string.Empty;
+        driverOption.Aliases.Add ("-d");
+        driverOption.Aliases.Add ("--d");
 
         // Add validator separately (not chained)
-        driverOption.AddValidator (result =>
+        driverOption.Validators.Add (result =>
                                    {
                                        var value = result.GetValueOrDefault<string> ();
 
                                        if (result.Tokens.Count > 0 && !allowedDrivers.Contains (value))
                                        {
-                                           result.ErrorMessage = $"Invalid driver name '{value}'. Allowed values: {string.Join (", ", allowedDrivers)}";
+                                           result.AddError ($"Invalid driver name '{value}'. Allowed values: {string.Join (", ", allowedDrivers)}");
                                        }
                                    });
 
         // Configuration Management
-        Option<bool> disableConfigManagement = new ("--disable-cm",
-                                                    "Indicates Configuration Management should not be enabled. Only `ConfigLocations.HardCoded` settings will be loaded.");
-        disableConfigManagement.AddAlias ("-dcm");
-        disableConfigManagement.AddAlias ("--dcm");
+        Option<bool> disableConfigManagement = new ("--disable-cm")
+        {
+            Description = "Indicates Configuration Management should not be enabled. Only `ConfigLocations.HardCoded` settings will be loaded."
+        };
+        disableConfigManagement.Aliases.Add ("-dcm");
+        disableConfigManagement.Aliases.Add ("--dcm");
 
-        Option<bool> benchmarkFlag = new ("--benchmark", "Enables benchmarking. If a Scenario is specified, just that Scenario will be benchmarked.");
-        benchmarkFlag.AddAlias ("-b");
-        benchmarkFlag.AddAlias ("--b");
+        Option<bool> benchmarkFlag = new ("--benchmark")
+        {
+            Description = "Enables benchmarking. If a Scenario is specified, just that Scenario will be benchmarked."
+        };
+        benchmarkFlag.Aliases.Add ("-b");
+        benchmarkFlag.Aliases.Add ("--b");
 
-        Option<bool> force16ColorsOption = new ("--force-16-colors", "Forces the driver to use 16-color mode instead of TrueColor.");
-        force16ColorsOption.AddAlias ("-16");
+        Option<bool> force16ColorsOption = new ("--force-16-colors") { Description = "Forces the driver to use 16-color mode instead of TrueColor." };
+        force16ColorsOption.Aliases.Add ("-16");
 
-        Option<uint> benchmarkTimeout = new ("--timeout",
-                                             () => Scenario.BenchmarkTimeout,
-                                             $"The maximum time in milliseconds to run a benchmark for. Default is {Scenario.BenchmarkTimeout}ms.");
-        benchmarkTimeout.AddAlias ("-t");
-        benchmarkTimeout.AddAlias ("--t");
+        Option<uint> benchmarkTimeout = new ("--timeout")
+        {
+            Description = $"The maximum time in milliseconds to run a benchmark for. Default is {Scenario.BenchmarkTimeout}ms.",
+            DefaultValueFactory = _ => Scenario.BenchmarkTimeout
+        };
+        benchmarkTimeout.Aliases.Add ("-t");
+        benchmarkTimeout.Aliases.Add ("--t");
 
-        Option<string> resultsFile = new ("--file", "The file to save benchmark results to. If not specified, the results will be displayed in a TableView.");
-        resultsFile.AddAlias ("-f");
-        resultsFile.AddAlias ("--f");
+        Option<string> resultsFile = new ("--file")
+        {
+            Description = "The file to save benchmark results to. If not specified, the results will be displayed in a TableView.",
+            DefaultValueFactory = _ => string.Empty
+        };
+        resultsFile.Aliases.Add ("-f");
+        resultsFile.Aliases.Add ("--f");
 
         // what's the app name?
         LogFilePath = $"{LOGFILE_LOCATION}/{Assembly.GetExecutingAssembly ().GetName ().Name}.log";
 
-        Option<string> debugLogLevel =
-            new Option<string> ("--debug-log-level", $"The level to use for logging (debug console and {LogFilePath})").FromAmong (Enum.GetNames<LogLevel> ());
-        debugLogLevel.SetDefaultValue ("Warning");
-        debugLogLevel.AddAlias ("-dl");
-        debugLogLevel.AddAlias ("--dl");
+        Option<string> debugLogLevel = new ("--debug-log-level")
+        {
+            Description = $"The level to use for logging (debug console and {LogFilePath})"
+        };
+        debugLogLevel.AcceptOnlyFromAmong (Enum.GetNames<LogLevel> ());
+        debugLogLevel.DefaultValueFactory = _ => "Warning";
+        debugLogLevel.Aliases.Add ("-dl");
+        debugLogLevel.Aliases.Add ("--dl");
 
-        Argument<string> scenarioArgument =
-            new Argument<string> ("scenario",
-                                  description: "The name of the Scenario to run. If not provided, the UI Catalog UI will be shown.",
-                                  getDefaultValue: () => "none").FromAmong (UICatalogRunnable.CachedScenarios.Select (s => s.GetName ())
-                                                                                             .Append ("none")
-                                                                                             .ToArray ());
+        Argument<string> scenarioArgument = new ("scenario")
+        {
+            Description = "The name of the Scenario to run. If not provided, the UI Catalog UI will be shown.", DefaultValueFactory = _ => "none"
+        };
+        scenarioArgument.AcceptOnlyFromAmong (UICatalogRunnable.CachedScenarios.Select (s => s.GetName ()).Append ("none").ToArray ());
 
         var rootCommand = new RootCommand ("A comprehensive sample library and test app for Terminal.Gui")
         {
@@ -148,19 +164,19 @@ private static int Main (string [] args)
             force16ColorsOption
         };
 
-        rootCommand.SetHandler (context =>
+        rootCommand.SetAction (context =>
                                 {
-                                    bool force16 = context.ParseResult.GetValueForOption (force16ColorsOption);
+                                    bool force16 = context.GetRequiredValue (force16ColorsOption);
 
                                     UICatalogCommandLineOptions options = new ()
                                     {
-                                        Scenario = context.ParseResult.GetValueForArgument (scenarioArgument),
-                                        Driver = context.ParseResult.GetValueForOption (driverOption) ?? string.Empty,
-                                        DontEnableConfigurationManagement = context.ParseResult.GetValueForOption (disableConfigManagement),
-                                        Benchmark = context.ParseResult.GetValueForOption (benchmarkFlag),
-                                        BenchmarkTimeout = context.ParseResult.GetValueForOption (benchmarkTimeout),
-                                        ResultsFile = context.ParseResult.GetValueForOption (resultsFile) ?? string.Empty,
-                                        DebugLogLevel = context.ParseResult.GetValueForOption (debugLogLevel) ?? "Warning",
+                                        Scenario = context.GetRequiredValue (scenarioArgument),
+                                        Driver = context.GetRequiredValue (driverOption) ?? string.Empty,
+                                        DontEnableConfigurationManagement = context.GetRequiredValue (disableConfigManagement),
+                                        Benchmark = context.GetRequiredValue (benchmarkFlag),
+                                        BenchmarkTimeout = context.GetRequiredValue (benchmarkTimeout),
+                                        ResultsFile = context.GetRequiredValue (resultsFile) ?? string.Empty,
+                                        DebugLogLevel = context.GetRequiredValue (debugLogLevel) ?? "Warning",
 
                                         // Only set Force16Colors if explicitly specified on command line
                                         Force16Colors = force16 ? true : null
@@ -172,17 +188,21 @@ private static int Main (string [] args)
 
         var helpShown = false;
 
-        Parser parser = new CommandLineBuilder (rootCommand).UseHelp (_ => helpShown = true).Build ();
+        ParseResult parseResult = rootCommand.Parse (args);
 
-        parser.Invoke (args);
+        // Check if the analysis results indicate that help should be displayed
+        if (parseResult.Errors.Count == 0 && parseResult.Action is HelpAction)
+        {
+            helpShown = true;
+        }
+
+        parseResult.Invoke ();
 
         if (helpShown)
         {
             return 0;
         }
 
-        ParseResult parseResult = parser.Parse (args);
-
         if (parseResult.Errors.Count > 0)
         {
             foreach (ParseError error in parseResult.Errors)
diff --git a/Terminal.Gui/App/Clipboard/ClipboardProcessRunner.cs b/Terminal.Gui/App/Clipboard/ClipboardProcessRunner.cs
index 70c471d744..07f431dfd1 100644
--- a/Terminal.Gui/App/Clipboard/ClipboardProcessRunner.cs
+++ b/Terminal.Gui/App/Clipboard/ClipboardProcessRunner.cs
@@ -31,6 +31,11 @@ public static (int exitCode, string result) Process (
     {
         var output = string.Empty;
 
+        if (Console.IsInputRedirected || Console.IsOutputRedirected)
+        {
+            return (-1, output);
+        }
+
         using var process = new Process ();
 
         process.StartInfo = new()
diff --git a/Terminal.Gui/Drivers/Input/IInput.cs b/Terminal.Gui/Drivers/Input/IInput.cs
index 5ad1f6b690..b5a6f96658 100644
--- a/Terminal.Gui/Drivers/Input/IInput.cs
+++ b/Terminal.Gui/Drivers/Input/IInput.cs
@@ -66,7 +66,7 @@ public interface IInput<TInputRecord> : IDisposable
     /// </summary>
     /// <remarks>
     ///     <para>
-    ///         This property allows external code (e.g., test harnesses like <c>TestContext</c>) to
+    ///         This property allows external code (e.g., test harnesses like <c>AppTestHelper</c>) to
     ///         provide additional cancellation signals such as timeouts or hard-stop conditions.
     ///     </para>
     ///     <para>
diff --git a/Terminal.Gui/Drivers/UnixDriver/UnixClipboard.cs b/Terminal.Gui/Drivers/UnixDriver/UnixClipboard.cs
index 6562f3b2dc..acfc35b36a 100644
--- a/Terminal.Gui/Drivers/UnixDriver/UnixClipboard.cs
+++ b/Terminal.Gui/Drivers/UnixDriver/UnixClipboard.cs
@@ -8,7 +8,7 @@ namespace Terminal.Gui.Drivers;
 internal class UnixClipboard : ClipboardBase
 {
     private string _xclipPath = string.Empty;
-    public UnixClipboard () { IsSupported = CheckSupport (); }
+    public UnixClipboard () => IsSupported = CheckSupport ();
     public override bool IsSupported { get; }
 
     protected override string GetClipboardDataImpl ()
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index 765c46305d..544579f229 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -87,7 +87,7 @@
         <InternalsVisibleTo Include="StressTests" />
         <InternalsVisibleTo Include="IntegrationTests" />
         <InternalsVisibleTo Include="TerminalGuiDesigner" />
-        <InternalsVisibleTo Include="TerminalGuiFluentTesting" />
+        <InternalsVisibleTo Include="AppTestHelpers" />
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     </ItemGroup>
     <!-- =================================================================== -->
diff --git a/Terminal.sln b/Terminal.sln
index ff01131635..74d32e37af 100644
--- a/Terminal.sln
+++ b/Terminal.sln
@@ -113,11 +113,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StressTests", "Tests\Stress
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.Parallelizable", "Tests\UnitTestsParallelizable\UnitTests.Parallelizable.csproj", "{DE780834-190A-8277-51FD-750CC666E82D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTesting", "Tests\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj", "{2DBA7BDC-17AE-474B-A507-00807D087607}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppTestHelpers", "Tests\AppTestHelpers\AppTestHelpers.csproj", "{2DBA7BDC-17AE-474B-A507-00807D087607}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit", "Tests\TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj", "{F56BAFFD-F227-4B0A-96F0-C800FAEF2036}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppTestHelpers.XunitHelpers", "Tests\AppTestHelpers.XunitHelpers\AppTestHelpers.XunitHelpers.csproj", "{F56BAFFD-F227-4B0A-96F0-C800FAEF2036}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit.Generator", "Tests\TerminalGuiFluentTestingXunit.Generator\TerminalGuiFluentTestingXunit.Generator.csproj", "{199F27D8-A905-4DDC-82CA-1FE1A90B1788}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppTestHelpers.XunitHelpers.Generator", "Tests\AppTestHelpers.XunitHelpers.Generator\AppTestHelpers.XunitHelpers.Generator.csproj", "{199F27D8-A905-4DDC-82CA-1FE1A90B1788}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{1A3CBA89-EDAB-4F75-811E-FE81B13A4836}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/Tests/TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj b/Tests/AppTestHelpers.XunitHelpers.Generator/AppTestHelpers.XunitHelpers.Generator.csproj
similarity index 100%
rename from Tests/TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj
rename to Tests/AppTestHelpers.XunitHelpers.Generator/AppTestHelpers.XunitHelpers.Generator.csproj
diff --git a/Tests/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs b/Tests/AppTestHelpers.XunitHelpers.Generator/TheGenerator.cs
similarity index 93%
rename from Tests/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs
rename to Tests/AppTestHelpers.XunitHelpers.Generator/TheGenerator.cs
index 45e74fc293..2f4859e6dc 100644
--- a/Tests/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs
+++ b/Tests/AppTestHelpers.XunitHelpers.Generator/TheGenerator.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace TerminalGuiFluentTestingXunit.Generator;
+namespace AppTestHelpers.XunitHelpers.Generator;
 
 [Generator]
 public class TheGenerator : IIncrementalGenerator
@@ -89,10 +89,10 @@ private void GenerateMethods (INamedTypeSymbol assertType, SourceProductionConte
 
         var header = """"
                      #nullable enable
-                     using TerminalGuiFluentTesting;
+                     using AppTestHelpers;
                      using Xunit;
 
-                     namespace TerminalGuiFluentTestingXunit;
+                     namespace AppTestHelpers.XunitHelpers;
 
                      public static partial class XunitContextExtensions
                      {
@@ -117,26 +117,26 @@ public static partial class XunitContextExtensions
             }
 
             var method = $$"""
-                           {{signature}}
-                           {
-                               try
+                               {{signature}}
                                {
-                                   Assert.{{methodName}}{{typeParams}} ({{string.Join (",", paramNames)}});
-                               }
-                               catch(Exception ex)
-                               {
-                                   context.HardStop (ex);
+                                   try
+                                   {
+                                       Xunit.Assert.{{methodName}}{{typeParams}} ({{string.Join (",", paramNames)}});
+                                   }
+                                   catch(Exception ex)
+                                   {
+                                       context.HardStop (ex);
+                                       
+                                   
+                                       throw;
+                                   
+                                   }
                                    
-                               
-                                   throw;
-                               
+                                   return context;
                                }
-                               
-                               return context;
-                           }
                            """;
 
-            sb.AppendLine (method);
+            sb.AppendLine (method.Replace ("*", ""));
         }
 
         sb.AppendLine (tail);
@@ -154,9 +154,9 @@ out string typeParams
     {
         typeParams = string.Empty;
 
-        // Create the "this TestContext context" parameter
+        // Create the "this AppTestHelper context" parameter
         ParameterSyntax contextParam = SyntaxFactory.Parameter (SyntaxFactory.Identifier ("context"))
-                                                    .WithType (SyntaxFactory.ParseTypeName ("TestContext"))
+                                                    .WithType (SyntaxFactory.ParseTypeName ("AppTestHelper"))
                                                     .AddModifiers (SyntaxFactory.Token (SyntaxKind.ThisKeyword)); // Add the "this" keyword
 
         // Extract the parameter names (expected and actual)
@@ -182,8 +182,8 @@ out string typeParams
 
         parameters.Insert (0, contextParam); // Insert 'context' as the first parameter
 
-        // Change the return type to TestContext
-        TypeSyntax returnType = SyntaxFactory.ParseTypeName ("TestContext");
+        // Change the return type to AppTestHelper
+        TypeSyntax returnType = SyntaxFactory.ParseTypeName ("AppTestHelper");
 
         // Change the method name to AssertEqual
         SyntaxToken newMethodName = SyntaxFactory.Identifier ($"Assert{methodName}");
diff --git a/Tests/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj b/Tests/AppTestHelpers.XunitHelpers/AppTestHelpers.XunitHelpers.csproj
similarity index 50%
rename from Tests/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj
rename to Tests/AppTestHelpers.XunitHelpers/AppTestHelpers.XunitHelpers.csproj
index 31e008633a..6e783b82c5 100644
--- a/Tests/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj
+++ b/Tests/AppTestHelpers.XunitHelpers/AppTestHelpers.XunitHelpers.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+	  <OutputType>Exe</OutputType>
+	  <UseAppHost>true</UseAppHost>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -9,11 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TerminalGuiFluentTestingXunit.Generator\TerminalGuiFluentTestingXunit.Generator.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
+    <ProjectReference Include="..\AppTestHelpers.XunitHelpers.Generator\AppTestHelpers.XunitHelpers.Generator.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\AppTestHelpers\AppTestHelpers.csproj" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/Tests/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs b/Tests/AppTestHelpers.XunitHelpers/XunitContextExtensions.cs
similarity index 77%
rename from Tests/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs
rename to Tests/AppTestHelpers.XunitHelpers/XunitContextExtensions.cs
index 71755ce035..3318240847 100644
--- a/Tests/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs
+++ b/Tests/AppTestHelpers.XunitHelpers/XunitContextExtensions.cs
@@ -1,8 +1,7 @@
 using System.Drawing;
-using TerminalGuiFluentTesting;
 using Xunit;
 
-namespace TerminalGuiFluentTestingXunit;
+namespace AppTestHelpers.XunitHelpers;
 
 public static partial class XunitContextExtensions
 {
@@ -15,7 +14,7 @@ public static partial class XunitContextExtensions
     /// <param name="context"></param>
     /// <param name="expected"></param>
     /// <returns></returns>
-    public static TestContext AssertCursorPosition (this TestContext context, Point expected)
+    public static AppTestHelper AssertCursorPosition (this AppTestHelper context, Point expected)
     {
         try
         {
diff --git a/Tests/TerminalGuiFluentTesting/TestContext.ContextMenu.cs b/Tests/AppTestHelpers/AppTestHelper.ContextMenu.cs
similarity index 90%
rename from Tests/TerminalGuiFluentTesting/TestContext.ContextMenu.cs
rename to Tests/AppTestHelpers/AppTestHelper.ContextMenu.cs
index a20cf5ce92..f440f4bb16 100644
--- a/Tests/TerminalGuiFluentTesting/TestContext.ContextMenu.cs
+++ b/Tests/AppTestHelpers/AppTestHelper.ContextMenu.cs
@@ -2,9 +2,9 @@
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
-public partial class TestContext
+public partial class AppTestHelper
 {
     /// <summary>
     ///     Registers a right click handler on the <see cref="LastView"/> added view (or root view) that
@@ -12,7 +12,7 @@ public partial class TestContext
     /// </summary>
     /// <param name="contextMenu"></param>
     /// <returns></returns>
-    public TestContext WithContextMenu (PopoverMenu? contextMenu)
+    public AppTestHelper WithContextMenu (PopoverMenu? contextMenu)
     {
         if (contextMenu?.App is null)
         {
diff --git a/Tests/TerminalGuiFluentTesting/TestContext.Input.cs b/Tests/AppTestHelpers/AppTestHelper.Input.cs
similarity index 89%
rename from Tests/TerminalGuiFluentTesting/TestContext.Input.cs
rename to Tests/AppTestHelpers/AppTestHelper.Input.cs
index 6a151c98f1..5f54506f2e 100644
--- a/Tests/TerminalGuiFluentTesting/TestContext.Input.cs
+++ b/Tests/AppTestHelpers/AppTestHelper.Input.cs
@@ -4,9 +4,9 @@
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
-public partial class TestContext
+public partial class AppTestHelper
 {
     /// <summary>
     ///     Simulates a right click at the given screen coordinates on the current driver.
@@ -16,7 +16,7 @@ public partial class TestContext
     /// <param name="screenX">0 indexed screen coordinates</param>
     /// <param name="screenY">0 indexed screen coordinates</param>
     /// <returns></returns>
-    public TestContext RightClick (int screenX, int screenY)
+    public AppTestHelper RightClick (int screenX, int screenY)
     {
         InjectMouseEvent (new Mouse
         {
@@ -40,7 +40,7 @@ public TestContext RightClick (int screenX, int screenY)
     /// <param name="screenX">0 indexed screen coordinates</param>
     /// <param name="screenY">0 indexed screen coordinates</param>
     /// <returns></returns>
-    public TestContext LeftClick (int screenX, int screenY)
+    public AppTestHelper LeftClick (int screenX, int screenY)
     {
         InjectMouseEvent (new Mouse
         {
@@ -63,7 +63,7 @@ public TestContext LeftClick (int screenX, int screenY)
     /// <typeparam name="TView"></typeparam>
     /// <param name="evaluator"></param>
     /// <returns></returns>
-    public TestContext LeftClick<TView> (Func<TView, bool> evaluator) where TView : View =>
+    public AppTestHelper LeftClick<TView> (Func<TView, bool> evaluator) where TView : View =>
         InjectMouseEvent (new Mouse { Flags = MouseFlags.LeftButtonClicked }, evaluator);
 
     /// <summary>
@@ -75,8 +75,8 @@ public TestContext LeftClick<TView> (Func<TView, bool> evaluator) where TView :
     ///     Whether to advance time after this event to space clicks apart (prevents multi-click
     ///     detection).
     /// </param>
-    /// <returns>This TestContext for fluent chaining.</returns>
-    private TestContext InjectMouseEvent (Mouse mouse, bool advanceTimeAfter = false)
+    /// <returns>This AppTestHelper for fluent chaining.</returns>
+    private AppTestHelper InjectMouseEvent (Mouse mouse, bool advanceTimeAfter = false)
     {
         // Use the new injection infrastructure
         WaitIteration (app =>
@@ -116,12 +116,12 @@ private TestContext InjectMouseEvent (Mouse mouse, bool advanceTimeAfter = false
     /// </summary>
     /// <param name="mouse">The mouse event to inject.</param>
     /// <param name="evaluator">Function to find the target view.</param>
-    /// <returns>This TestContext for fluent chaining.</returns>
-    private TestContext InjectMouseEvent<TView> (Mouse mouse, Func<TView, bool> evaluator) where TView : View
+    /// <returns>This AppTestHelper for fluent chaining.</returns>
+    private AppTestHelper InjectMouseEvent<TView> (Mouse mouse, Func<TView, bool> evaluator) where TView : View
     {
         var screen = Point.Empty;
 
-        TestContext ctx = WaitIteration (_ =>
+        AppTestHelper ctx = WaitIteration (_ =>
                                          {
                                              TView v = Find (evaluator);
                                              screen = v.ViewportToScreen (new Point (0, 0));
@@ -139,8 +139,8 @@ private TestContext InjectMouseEvent<TView> (Mouse mouse, Func<TView, bool> eval
     ///     Uses the new simplified injection API with virtual time support.
     /// </summary>
     /// <param name="key">The key to inject.</param>
-    /// <returns>This TestContext for fluent chaining.</returns>
-    public TestContext KeyDown (Key key)
+    /// <returns>This AppTestHelper for fluent chaining.</returns>
+    public AppTestHelper KeyDown (Key key)
     {
         //Logging.Trace ($"Injecting key: {key}");
 
diff --git a/Tests/TerminalGuiFluentTesting/TestContext.Navigation.cs b/Tests/AppTestHelpers/AppTestHelper.Navigation.cs
similarity index 93%
rename from Tests/TerminalGuiFluentTesting/TestContext.Navigation.cs
rename to Tests/AppTestHelpers/AppTestHelper.Navigation.cs
index 2e3a82bfc2..27ce8d5c6f 100644
--- a/Tests/TerminalGuiFluentTesting/TestContext.Navigation.cs
+++ b/Tests/AppTestHelpers/AppTestHelper.Navigation.cs
@@ -1,8 +1,8 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
-public partial class TestContext
+public partial class AppTestHelper
 {
     /// <summary>
     ///     Sets the input focus to the given <see cref="View"/>.
@@ -13,7 +13,7 @@ public partial class TestContext
     /// <param name="toFocus"></param>
     /// <returns></returns>
     /// <exception cref="ArgumentException"></exception>
-    public TestContext Focus (View toFocus)
+    public AppTestHelper Focus (View toFocus)
     {
         toFocus.FocusDeepest (NavigationDirection.Forward, TabBehavior.TabStop);
 
@@ -37,7 +37,7 @@ public TestContext Focus (View toFocus)
     /// </param>
     /// <returns></returns>
     /// <exception cref="ArgumentException"></exception>
-    public TestContext Focus<T> (Func<T, bool>? evaluator = null) where T : View
+    public AppTestHelper Focus<T> (Func<T, bool>? evaluator = null) where T : View
     {
         evaluator ??= _ => true;
         View? t = App?.TopRunnableView;
diff --git a/Tests/TerminalGuiFluentTesting/TestContext.ViewBase.cs b/Tests/AppTestHelpers/AppTestHelper.ViewBase.cs
similarity index 95%
rename from Tests/TerminalGuiFluentTesting/TestContext.ViewBase.cs
rename to Tests/AppTestHelpers/AppTestHelper.ViewBase.cs
index 549737ea12..f9d2deeb81 100644
--- a/Tests/TerminalGuiFluentTesting/TestContext.ViewBase.cs
+++ b/Tests/AppTestHelpers/AppTestHelper.ViewBase.cs
@@ -1,8 +1,8 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
-public partial class TestContext
+public partial class AppTestHelper
 {
     /// <summary>
     ///     Adds the given <paramref name="v"/> to the current top level view
@@ -10,7 +10,7 @@ public partial class TestContext
     /// </summary>
     /// <param name="v"></param>
     /// <returns></returns>
-    public TestContext Add (View v)
+    public AppTestHelper Add (View v)
     {
         WaitIteration ((app) =>
                        {
diff --git a/Tests/TerminalGuiFluentTesting/TestContext.cs b/Tests/AppTestHelpers/AppTestHelper.cs
similarity index 94%
rename from Tests/TerminalGuiFluentTesting/TestContext.cs
rename to Tests/AppTestHelpers/AppTestHelper.cs
index 4814958d62..a7d25954e2 100644
--- a/Tests/TerminalGuiFluentTesting/TestContext.cs
+++ b/Tests/AppTestHelpers/AppTestHelper.cs
@@ -6,13 +6,13 @@
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 /// <summary>
-///     Fluent API context for testing a Terminal.Gui application. Create
+///     Helper for building integration tests for Terminal.Gui applications. Create
 ///     an instance using <see cref="With"/> static class.
 /// </summary>
-public partial class TestContext : IDisposable
+public partial class AppTestHelper : IDisposable
 {
     // ===== Threading & Synchronization =====
     private readonly CancellationTokenSource _runCancellationTokenSource = new ();
@@ -60,7 +60,7 @@ public partial class TestContext : IDisposable
     ///     Constructor for tests that only need Application.Init without running the main loop.
     ///     Uses the driver's default screen size instead of forcing a specific size.
     /// </summary>
-    public TestContext (string driverName, TextWriter? logWriter = null, TimeSpan? timeout = null)
+    public AppTestHelper (string driverName, TextWriter? logWriter = null, TimeSpan? timeout = null)
     {
         _driverName = driverName;
         _logWriter = logWriter;
@@ -110,7 +110,7 @@ public TestContext (string driverName, TextWriter? logWriter = null, TimeSpan? t
     /// <summary>
     ///     Constructor for tests that need to run the application with Application.Run.
     /// </summary>
-    internal TestContext (Func<IRunnable> runnableBuilder, int width, int height, string driverName, TextWriter? logWriter = null, TimeSpan? timeout = null)
+    internal AppTestHelper (Func<IRunnable> runnableBuilder, int width, int height, string driverName, TextWriter? logWriter = null, TimeSpan? timeout = null)
     {
         _driverName = driverName;
         _logWriter = logWriter;
@@ -283,7 +283,7 @@ private void CommonInit (int width, int height, TimeSpan? timeout)
     /// </summary>
     /// <param name="doAction"></param>
     /// <returns></returns>
-    public TestContext Then (Action<IApplication> doAction)
+    public AppTestHelper Then (Action<IApplication> doAction)
     {
         try
         {
@@ -307,7 +307,7 @@ public TestContext Then (Action<IApplication> doAction)
     /// </summary>
     /// <param name="action"></param>
     /// <returns></returns>
-    public TestContext WaitIteration (Action<IApplication>? action = null)
+    public AppTestHelper WaitIteration (Action<IApplication>? action = null)
     {
         // If application has already exited don't wait!
         if (Finished || _runCancellationTokenSource.Token.IsCancellationRequested || _ansiInput.ExternalCancellationTokenSource!.Token.IsCancellationRequested)
@@ -355,9 +355,9 @@ public TestContext WaitIteration (Action<IApplication>? action = null)
         return this;
     }
 
-    public TestContext WaitUntil (Func<bool> condition)
+    public AppTestHelper WaitUntil (Func<bool> condition)
     {
-        TestContext? c = null;
+        AppTestHelper? c = null;
         var sw = Stopwatch.StartNew ();
 
         //Logging.Trace ($"WaitUntil started with timeout {_timeout}");
@@ -397,9 +397,9 @@ public TestContext WaitUntil (Func<bool> condition)
     /// <param name="width">new Width for the console.</param>
     /// <param name="height">new Height for the console.</param>
     /// <returns></returns>
-    public TestContext ResizeConsole (int width, int height) => WaitIteration (app => { app.Driver!.SetScreenSize (width, height); });
+    public AppTestHelper ResizeConsole (int width, int height) => WaitIteration (app => { app.Driver!.SetScreenSize (width, height); });
 
-    public TestContext ScreenShot (string title, TextWriter? writer) =>
+    public AppTestHelper ScreenShot (string title, TextWriter? writer) =>
 
         //Logging.Trace ($"{this.ToIdentifyingString ()}");
         WaitIteration (app =>
@@ -410,7 +410,7 @@ public TestContext ScreenShot (string title, TextWriter? writer) =>
                            writer?.WriteLine (text);
                        });
 
-    public TestContext AnsiScreenShot (string title, TextWriter? writer) =>
+    public AppTestHelper AnsiScreenShot (string title, TextWriter? writer) =>
 
         //Logging.Trace ($"{this.ToIdentifyingString ()}");
         WaitIteration (app =>
@@ -424,7 +424,7 @@ public TestContext AnsiScreenShot (string title, TextWriter? writer) =>
     /// <summary>
     ///     Stops the application and waits for the background thread to exit.
     /// </summary>
-    public TestContext Stop ()
+    public AppTestHelper Stop ()
     {
         Logging.Trace ($"Stopping application for driver: {_driverName}");
 
@@ -513,7 +513,7 @@ public void HardStop (Exception? ex = null)
     /// </summary>
     /// <param name="writer"></param>
     /// <returns></returns>
-    public TestContext WriteOutLogs (TextWriter? writer)
+    public AppTestHelper WriteOutLogs (TextWriter? writer)
     {
         if (writer is null)
         {
@@ -554,7 +554,7 @@ private void CleanupApplication ()
     /// </summary>
     public void Dispose ()
     {
-        //Logging.Trace ($"Disposing TestContext");
+        //Logging.Trace ($"Disposing AppTestHelper");
         Stop ();
 
         var shouldThrow = false;
diff --git a/Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj b/Tests/AppTestHelpers/AppTestHelpers.csproj
similarity index 100%
rename from Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj
rename to Tests/AppTestHelpers/AppTestHelpers.csproj
diff --git a/Tests/TerminalGuiFluentTesting/AssemblyInfo.cs b/Tests/AppTestHelpers/AssemblyInfo.cs
similarity index 100%
rename from Tests/TerminalGuiFluentTesting/AssemblyInfo.cs
rename to Tests/AppTestHelpers/AssemblyInfo.cs
diff --git a/Tests/TerminalGuiFluentTesting/TestDriver.cs b/Tests/AppTestHelpers/TestDriver.cs
similarity index 93%
rename from Tests/TerminalGuiFluentTesting/TestDriver.cs
rename to Tests/AppTestHelpers/TestDriver.cs
index f67b9e66a1..ac1e25189d 100644
--- a/Tests/TerminalGuiFluentTesting/TestDriver.cs
+++ b/Tests/AppTestHelpers/TestDriver.cs
@@ -1,4 +1,4 @@
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 /// <summary>
 ///     Which driver simulation should be used for testing
diff --git a/Tests/TerminalGuiFluentTesting/TextWriterLogger.cs b/Tests/AppTestHelpers/TextWriterLogger.cs
similarity index 93%
rename from Tests/TerminalGuiFluentTesting/TextWriterLogger.cs
rename to Tests/AppTestHelpers/TextWriterLogger.cs
index 39c39266bb..60dda5f01e 100644
--- a/Tests/TerminalGuiFluentTesting/TextWriterLogger.cs
+++ b/Tests/AppTestHelpers/TextWriterLogger.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 internal class TextWriterLogger (TextWriter writer) : ILogger
 {
diff --git a/Tests/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs b/Tests/AppTestHelpers/TextWriterLoggerProvider.cs
similarity index 88%
rename from Tests/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs
rename to Tests/AppTestHelpers/TextWriterLoggerProvider.cs
index 2a6628329c..d6ea91a0b8 100644
--- a/Tests/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs
+++ b/Tests/AppTestHelpers/TextWriterLoggerProvider.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 internal class TextWriterLoggerProvider (TextWriter writer) : ILoggerProvider
 {
diff --git a/Tests/TerminalGuiFluentTesting/ThreadSafeStringWriter.cs b/Tests/AppTestHelpers/ThreadSafeStringWriter.cs
similarity index 93%
rename from Tests/TerminalGuiFluentTesting/ThreadSafeStringWriter.cs
rename to Tests/AppTestHelpers/ThreadSafeStringWriter.cs
index f9d06743f2..2edebb7282 100644
--- a/Tests/TerminalGuiFluentTesting/ThreadSafeStringWriter.cs
+++ b/Tests/AppTestHelpers/ThreadSafeStringWriter.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 class ThreadSafeStringWriter : StringWriter
 {
diff --git a/Tests/TerminalGuiFluentTesting/With.cs b/Tests/AppTestHelpers/With.cs
similarity index 80%
rename from Tests/TerminalGuiFluentTesting/With.cs
rename to Tests/AppTestHelpers/With.cs
index c55384f287..acfeac4274 100644
--- a/Tests/TerminalGuiFluentTesting/With.cs
+++ b/Tests/AppTestHelpers/With.cs
@@ -1,5 +1,5 @@
 
-namespace TerminalGuiFluentTesting;
+namespace AppTestHelpers;
 
 /// <summary>
 ///     Entry point to fluent assertions.
@@ -14,7 +14,7 @@ public static class With
     /// <param name="driverName"></param>
     /// <param name="logWriter"></param>
     /// <returns></returns>
-    public static TestContext A<T> (int width, int height, string driverName, TextWriter? logWriter = null) where T : IRunnable, new()
+    public static AppTestHelper A<T> (int width, int height, string driverName, TextWriter? logWriter = null) where T : IRunnable, new()
     {
         return new (() => new T ()
         {
@@ -32,7 +32,7 @@ public static class With
     /// <param name="driverName"></param>
     /// <param name="logWriter"></param>
     /// <returns></returns>
-    public static TestContext A (Func<IRunnable> runnableFactory, int width, int height, string driverName, TextWriter? logWriter = null)
+    public static AppTestHelper A (Func<IRunnable> runnableFactory, int width, int height, string driverName, TextWriter? logWriter = null)
     {
         return new (runnableFactory, width, height, driverName, logWriter, Timeout);
     }
diff --git a/Tests/IntegrationTests/DialogTests.cs b/Tests/IntegrationTests/DialogTests.cs
index e8767f58bc..67ebf4b2bb 100644
--- a/Tests/IntegrationTests/DialogTests.cs
+++ b/Tests/IntegrationTests/DialogTests.cs
@@ -1,7 +1,4 @@
 #nullable enable
-using UnitTests;
-using Xunit.Abstractions;
-
 namespace IntegrationTests;
 
 public class DialogTests
diff --git a/Tests/IntegrationTests/FluentTests/FileDialogTests.cs b/Tests/IntegrationTests/FluentTests/FileDialogTests.cs
index e456d90bed..9580a79af4 100644
--- a/Tests/IntegrationTests/FluentTests/FileDialogTests.cs
+++ b/Tests/IntegrationTests/FluentTests/FileDialogTests.cs
@@ -3,9 +3,8 @@
 using System.IO.Abstractions;
 using System.IO.Abstractions.TestingHelpers;
 using System.Runtime.InteropServices;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
@@ -58,7 +57,7 @@ public void CancelFileDialog_QuitKey_Quits (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd), 100, 20, d, _out)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd), 100, 20, d, _out)
                                   .ScreenShot ("Save dialog", _out)
                                   .KeyDown (Application.QuitKey)
                                   .AssertTrue (sd!.Canceled);
@@ -70,7 +69,7 @@ public void CancelFileDialog_UsingCancelButton_TabThenEnter (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .Focus<Button> (b => b.Text == Strings.btnCancel)
                                   .AssertTrue (sd!.Canceled)
@@ -83,7 +82,7 @@ public void CancelFileDialog_UsingCancelButton_LeftClickButton (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .LeftClick<Button> (b => b.Text == Strings.btnCancel)
                                   .AssertTrue (sd!.Canceled);
@@ -95,7 +94,7 @@ public void CancelFileDialog_UsingCancelButton_AltC (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd), 100, 20, d, _out)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd), 100, 20, d, _out)
                                   .ScreenShot ("Save dialog", _out)
                                   .KeyDown (Key.C.WithAlt)
                                   .AssertTrue (sd!.Canceled);
@@ -108,7 +107,7 @@ public void SaveFileDialog_UsingOkButton_Enter (string d)
         SaveDialog? sd = null;
         MockFileSystem? fs = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .LeftClick<Button> (b => b.Text == Strings.cmdSave)
                                   .AssertFalse (sd!.Canceled)
@@ -122,7 +121,7 @@ public void SaveFileDialog_UsingOkButton_AltS (string d)
         SaveDialog? sd = null;
         MockFileSystem? fs = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .KeyDown (Key.S.WithAlt)
                                   .AssertFalse (sd!.Canceled)
@@ -136,7 +135,7 @@ public void SaveFileDialog_UsingOkButton_TabEnter (string d)
         SaveDialog? sd = null;
         MockFileSystem? fs = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out fs), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .Focus<Button> (b => b.Text == Strings.cmdSave)
                                   .KeyDown (Key.Enter)
@@ -156,7 +155,7 @@ public void SaveFileDialog_PressingPopTree_ShouldNotChangeCancel (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .AssertTrue (sd!.Canceled)
                                   .Focus<Button> (b => b.Text == "►_Tree")
@@ -171,7 +170,7 @@ public void SaveFileDialog_PopTree_AndNavigate (string d)
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
                                   .ScreenShot ("Save dialog", _out)
                                   .AssertTrue (sd!.Canceled)
                                   .LeftClick<Button> (b => b.Text == "►_Tree")
@@ -192,7 +191,7 @@ public void SaveFileDialog_PopTree_AndNavigate_PreserveFilenameOnDirectoryChange
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
                                   .Then (_ => sd!.Style.PreserveFilenameOnDirectoryChanges = true)
                                   .ScreenShot ("Save dialog", _out)
                                   .AssertTrue (sd!.Canceled)
@@ -235,7 +234,7 @@ public void SaveFileDialog_PopTree_AndNavigate_PreserveFilenameOnDirectoryChange
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
                                   .Then (_ => sd!.Style.PreserveFilenameOnDirectoryChanges = false)
                                   .ScreenShot ("Save dialog", _out)
                                   .AssertTrue (sd!.Canceled)
@@ -294,7 +293,7 @@ public void SaveFileDialog_TableView_UpDown_PreserveFilenameOnDirectoryChanges_T
     {
         SaveDialog? sd = null;
 
-        using TestContext c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
+        using AppTestHelper c = With.A (() => NewSaveDialog (out sd, out MockFileSystem _), 100, 20, d)
                                   .Then (_ => sd!.Style.PreserveFilenameOnDirectoryChanges = preserve)
                                   .ScreenShot ("Save dialog", _out)
                                   .AssertTrue (sd!.Canceled)
diff --git a/Tests/IntegrationTests/FluentTests/LinearRangeFluentTests.cs b/Tests/IntegrationTests/FluentTests/LinearRangeFluentTests.cs
index 05fe33ccb1..22cfe681e0 100644
--- a/Tests/IntegrationTests/FluentTests/LinearRangeFluentTests.cs
+++ b/Tests/IntegrationTests/FluentTests/LinearRangeFluentTests.cs
@@ -1,5 +1,4 @@
-using TerminalGuiFluentTesting;
-using Xunit.Abstractions;
+using AppTestHelpers;
 
 namespace IntegrationTests;
 
@@ -11,43 +10,43 @@ public class LinearRangeFluentTests (ITestOutputHelper outputHelper) : TestsAllD
     [MemberData (nameof (GetAllDriverNames))]
     public void LinearRange_CanCreateAndRender (string d)
     {
-        using TestContext c = With.A<Window> (30, 10, d, _out)
-                                  .Add (
-                                        new LinearRange<int> ([0, 10, 20, 30, 40, 50])
-                                        {
-                                            X = 2,
-                                            Y = 2,
-                                            Type = LinearRangeType.Single
-                                        })
-                                  .Focus<LinearRange<int>> ()
-                                  .WaitIteration ()
-                                  .ScreenShot ("LinearRange initial render", _out)
-                                  .Stop ();
+        using AppTestHelper c = With.A<Window> (30, 10, d, _out)
+                                        .Add (
+                                              new LinearRange<int> ([0, 10, 20, 30, 40, 50])
+                                              {
+                                                  X = 2,
+                                                  Y = 2,
+                                                  Type = LinearRangeType.Single
+                                              })
+                                        .Focus<LinearRange<int>> ()
+                                        .WaitIteration ()
+                                        .ScreenShot ("LinearRange initial render", _out)
+                                        .Stop ();
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void LinearRange_CanNavigateWithArrowKeys (string d)
     {
-        using TestContext c = With.A<Window> (30, 10, d, _out)
-                                  .Add (
-                                        new LinearRange<int> ([0, 10, 20, 30])
-                                        {
-                                            X = 2,
-                                            Y = 2,
-                                            Type = LinearRangeType.Single,
-                                            AllowEmpty = false
-                                        })
-                                  .Focus<LinearRange<int>> ()
-                                  .WaitIteration ()
-                                  .ScreenShot ("Initial state", _out)
-                                  .KeyDown (Key.CursorRight)
-                                  .WaitIteration ()
-                                  .ScreenShot ("After right arrow", _out)
-                                  .KeyDown (Key.CursorRight)
-                                  .WaitIteration ()
-                                  .ScreenShot ("After second right arrow", _out)
-                                  .Stop ();
+        using AppTestHelper c = With.A<Window> (30, 10, d, _out)
+                                        .Add (
+                                              new LinearRange<int> ([0, 10, 20, 30])
+                                              {
+                                                  X = 2,
+                                                  Y = 2,
+                                                  Type = LinearRangeType.Single,
+                                                  AllowEmpty = false
+                                              })
+                                        .Focus<LinearRange<int>> ()
+                                        .WaitIteration ()
+                                        .ScreenShot ("Initial state", _out)
+                                        .KeyDown (Key.CursorRight)
+                                        .WaitIteration ()
+                                        .ScreenShot ("After right arrow", _out)
+                                        .KeyDown (Key.CursorRight)
+                                        .WaitIteration ()
+                                        .ScreenShot ("After second right arrow", _out)
+                                        .Stop ();
     }
 
     [Theory]
@@ -81,12 +80,12 @@ public void LinearRange_TypeChange_TriggersEvents (string d)
         // Change the type before adding to window
         linearRange.Type = LinearRangeType.Range;
 
-        using TestContext c = With.A<Window> (30, 10, d, _out)
-                                  .Add (linearRange)
-                                  .Focus<LinearRange<int>> ()
-                                  .WaitIteration ()
-                                  .ScreenShot ("After type change to Range", _out)
-                                  .Stop ();
+        using AppTestHelper c = With.A<Window> (30, 10, d, _out)
+                                        .Add (linearRange)
+                                        .Focus<LinearRange<int>> ()
+                                        .WaitIteration ()
+                                        .ScreenShot ("After type change to Range", _out)
+                                        .Stop ();
 
         Assert.True (changingEventRaised);
         Assert.True (changedEventRaised);
@@ -97,48 +96,48 @@ public void LinearRange_TypeChange_TriggersEvents (string d)
     [MemberData (nameof (GetAllDriverNames))]
     public void LinearRange_RangeType_CanSelectRange (string d)
     {
-        using TestContext c = With.A<Window> (30, 10, d, _out)
-                                  .Add (
-                                        new LinearRange<int> ([0, 10, 20, 30, 40])
-                                        {
-                                            X = 2,
-                                            Y = 2,
-                                            Type = LinearRangeType.Range,
-                                            AllowEmpty = false
-                                        })
-                                  .Focus<LinearRange<int>> ()
-                                  .WaitIteration ()
-                                  .ScreenShot ("Range type initial", _out)
-                                  .KeyDown (Key.Space)
-                                  .WaitIteration ()
-                                  .ScreenShot ("After first selection", _out)
-                                  .KeyDown (Key.CursorRight.WithCtrl)
-                                  .WaitIteration ()
-                                  .KeyDown (Key.CursorRight.WithCtrl)
-                                  .WaitIteration ()
-                                  .ScreenShot ("After extending range", _out)
-                                  .Stop ();
+        using AppTestHelper c = With.A<Window> (30, 10, d, _out)
+                                        .Add (
+                                              new LinearRange<int> ([0, 10, 20, 30, 40])
+                                              {
+                                                  X = 2,
+                                                  Y = 2,
+                                                  Type = LinearRangeType.Range,
+                                                  AllowEmpty = false
+                                              })
+                                        .Focus<LinearRange<int>> ()
+                                        .WaitIteration ()
+                                        .ScreenShot ("Range type initial", _out)
+                                        .KeyDown (Key.Space)
+                                        .WaitIteration ()
+                                        .ScreenShot ("After first selection", _out)
+                                        .KeyDown (Key.CursorRight.WithCtrl)
+                                        .WaitIteration ()
+                                        .KeyDown (Key.CursorRight.WithCtrl)
+                                        .WaitIteration ()
+                                        .ScreenShot ("After extending range", _out)
+                                        .Stop ();
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void LinearRange_VerticalOrientation_Renders (string d)
     {
-        using TestContext c = With.A<Window> (10, 15, d, _out)
-                                  .Add (
-                                        new LinearRange<int> ([0, 10, 20, 30])
-                                        {
-                                            X = 2,
-                                            Y = 2,
-                                            Orientation = Orientation.Vertical,
-                                            Type = LinearRangeType.Single
-                                        })
-                                  .Focus<LinearRange<int>> ()
-                                  .WaitIteration ()
-                                  .ScreenShot ("Vertical orientation", _out)
-                                  .KeyDown (Key.CursorDown)
-                                  .WaitIteration ()
-                                  .ScreenShot ("After down arrow", _out)
-                                  .Stop ();
+        using AppTestHelper c = With.A<Window> (10, 15, d, _out)
+                                        .Add (
+                                              new LinearRange<int> ([0, 10, 20, 30])
+                                              {
+                                                  X = 2,
+                                                  Y = 2,
+                                                  Orientation = Orientation.Vertical,
+                                                  Type = LinearRangeType.Single
+                                              })
+                                        .Focus<LinearRange<int>> ()
+                                        .WaitIteration ()
+                                        .ScreenShot ("Vertical orientation", _out)
+                                        .KeyDown (Key.CursorDown)
+                                        .WaitIteration ()
+                                        .ScreenShot ("After down arrow", _out)
+                                        .Stop ();
     }
 }
diff --git a/Tests/IntegrationTests/FluentTests/MenuBarTests.cs b/Tests/IntegrationTests/FluentTests/MenuBarTests.cs
index 3051692f96..3ae493e0be 100644
--- a/Tests/IntegrationTests/FluentTests/MenuBarTests.cs
+++ b/Tests/IntegrationTests/FluentTests/MenuBarTests.cs
@@ -1,8 +1,7 @@
 using System.Drawing;
 using System.Globalization;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
@@ -23,16 +22,16 @@ public MenuBarTests (ITestOutputHelper outputHelper)
     [MemberData (nameof (GetAllDriverNames))]
     public void Initializes_WithNoItems (string d)
     {
-        using TestContext c = With.A<Window> (80, 25, d, _out)
-                                  .Then (_ =>
-                                         {
-                                             // Create a menu bar with no items
-                                             var menuBar = new MenuBar ();
-                                             Assert.Empty (menuBar.SubViews);
-                                             Assert.False (menuBar.CanFocus);
-                                             Assert.Equal (Orientation.Horizontal, menuBar.Orientation);
-                                             Assert.Equal (Key.F9, MenuBar.DefaultKey);
-                                         });
+        using AppTestHelper c = With.A<Window> (80, 25, d, _out)
+                                        .Then (_ =>
+                                               {
+                                                   // Create a menu bar with no items
+                                                   var menuBar = new MenuBar ();
+                                                   Assert.Empty (menuBar.SubViews);
+                                                   Assert.False (menuBar.CanFocus);
+                                                   Assert.Equal (Orientation.Horizontal, menuBar.Orientation);
+                                                   Assert.Equal (Key.F9, MenuBar.DefaultKey);
+                                               });
     }
 
     [Theory]
@@ -41,113 +40,113 @@ public void Initializes_WithItems (string d)
     {
         MenuBarItem [] menuItems = [];
 
-        using TestContext c = With.A<Window> (80, 25, d, _out)
-                                  .Then (_ =>
-                                         {
-                                             // Create items for the menu bar
-                                             menuItems =
-                                             [
-                                                 new MenuBarItem (Strings.menuFile, [new MenuItem (Strings.cmdOpen, "Opens a file", () => { })]),
-                                                 new MenuBarItem ("_Edit", [new MenuItem (Strings.cmdCopy, "Copies selection", () => { })])
-                                             ];
-
-                                             var menuBar = new MenuBar (menuItems);
-                                             Assert.Equal (2, menuBar.SubViews.Count);
-
-                                             // First item should be the File menu
-                                             var fileMenu = menuBar.SubViews.ElementAt (0) as MenuBarItem;
-                                             Assert.NotNull (fileMenu);
-                                             Assert.Equal (Strings.menuFile, fileMenu.Title);
-
-                                             // Second item should be the Edit menu
-                                             var editMenu = menuBar.SubViews.ElementAt (1) as MenuBarItem;
-                                             Assert.NotNull (editMenu);
-                                             Assert.Equal ("_Edit", editMenu.Title);
-                                         });
+        using AppTestHelper c = With.A<Window> (80, 25, d, _out)
+                                        .Then (_ =>
+                                               {
+                                                   // Create items for the menu bar
+                                                   menuItems =
+                                                   [
+                                                       new MenuBarItem (Strings.menuFile, [new MenuItem (Strings.cmdOpen, "Opens a file", () => { })]),
+                                                       new MenuBarItem ("_Edit", [new MenuItem (Strings.cmdCopy, "Copies selection", () => { })])
+                                                   ];
+
+                                                   var menuBar = new MenuBar (menuItems);
+                                                   Assert.Equal (2, menuBar.SubViews.Count);
+
+                                                   // First item should be the File menu
+                                                   var fileMenu = menuBar.SubViews.ElementAt (0) as MenuBarItem;
+                                                   Assert.NotNull (fileMenu);
+                                                   Assert.Equal (Strings.menuFile, fileMenu.Title);
+
+                                                   // Second item should be the Edit menu
+                                                   var editMenu = menuBar.SubViews.ElementAt (1) as MenuBarItem;
+                                                   Assert.NotNull (editMenu);
+                                                   Assert.Equal ("_Edit", editMenu.Title);
+                                               });
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void AddsItems_WithMenusProperty (string d)
     {
-        using TestContext c = With.A<Window> (80, 25, d, _out)
-                                  .Then (_ =>
-                                         {
-                                             var menuBar = new MenuBar ();
+        using AppTestHelper c = With.A<Window> (80, 25, d, _out)
+                                        .Then (_ =>
+                                               {
+                                                   var menuBar = new MenuBar ();
 
-                                             // Set items through Menus property
-                                             menuBar.Menus = [new MenuBarItem (Strings.menuFile), new MenuBarItem ("_Edit"), new MenuBarItem ("_View")];
+                                                   // Set items through Menus property
+                                                   menuBar.Menus = [new MenuBarItem (Strings.menuFile), new MenuBarItem ("_Edit"), new MenuBarItem ("_View")];
 
-                                             Assert.Equal (3, menuBar.SubViews.Count);
-                                         });
+                                                   Assert.Equal (3, menuBar.SubViews.Count);
+                                               });
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void ChangesKey_RaisesEvent (string d)
     {
-        using TestContext c = With.A<Window> (80, 25, d, _out)
-                                  .Then (_ =>
-                                         {
-                                             var menuBar = new MenuBar ();
-
-                                             var oldKeyValue = Key.Empty;
-                                             var newKeyValue = Key.Empty;
-                                             var eventRaised = false;
-
-                                             menuBar.KeyChanged += (_, args) =>
-                                                                   {
-                                                                       eventRaised = true;
-                                                                       oldKeyValue = args.OldKey;
-                                                                       newKeyValue = args.NewKey;
-                                                                   };
-
-                                             // Default key should be F9
-                                             Assert.Equal (Key.F9, menuBar.Key);
-
-                                             // Change key to F1
-                                             menuBar.Key = Key.F1;
-
-                                             // Verify event was raised
-                                             Assert.True (eventRaised);
-                                             Assert.Equal (Key.F9, oldKeyValue);
-                                             Assert.Equal (Key.F1, newKeyValue);
-
-                                             // Verify key was changed
-                                             Assert.Equal (Key.F1, menuBar.Key);
-                                         });
+        using AppTestHelper c = With.A<Window> (80, 25, d, _out)
+                                        .Then (_ =>
+                                               {
+                                                   var menuBar = new MenuBar ();
+
+                                                   var oldKeyValue = Key.Empty;
+                                                   var newKeyValue = Key.Empty;
+                                                   var eventRaised = false;
+
+                                                   menuBar.KeyChanged += (_, args) =>
+                                                                         {
+                                                                             eventRaised = true;
+                                                                             oldKeyValue = args.OldKey;
+                                                                             newKeyValue = args.NewKey;
+                                                                         };
+
+                                                   // Default key should be F9
+                                                   Assert.Equal (Key.F9, menuBar.Key);
+
+                                                   // Change key to F1
+                                                   menuBar.Key = Key.F1;
+
+                                                   // Verify event was raised
+                                                   Assert.True (eventRaised);
+                                                   Assert.Equal (Key.F9, oldKeyValue);
+                                                   Assert.Equal (Key.F1, newKeyValue);
+
+                                                   // Verify key was changed
+                                                   Assert.Equal (Key.F1, menuBar.Key);
+                                               });
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void EnableForDesign_CreatesMenuItems (string d)
     {
-        using TestContext c = With.A<Window> (80, 25, d, _out)
-                                  .Then (app =>
-                                         {
-                                             var menuBar = new MenuBar ();
-                                             app.TopRunnableView!.Add (menuBar);
-
-                                             // Call EnableForDesign
-                                             View top = app.TopRunnableView!;
-                                             bool result = menuBar.EnableForDesign (ref top);
-
-                                             // Should return true
-                                             Assert.True (result);
-
-                                             // Should have created menu items
-                                             Assert.True (menuBar.SubViews.Count > 0);
-
-                                             // Should have File, Edit and Help menus
-                                             View? fileMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == Strings.menuFile);
-                                             View? editMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == "_Edit");
-                                             View? helpMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == Strings.menuHelp);
-
-                                             Assert.NotNull (fileMenu);
-                                             Assert.NotNull (editMenu);
-                                             Assert.NotNull (helpMenu);
-                                         })
-                                  .ScreenShot ("MenuBar EnableForDesign", _out);
+        using AppTestHelper c = With.A<Window> (80, 25, d, _out)
+                                        .Then (app =>
+                                               {
+                                                   var menuBar = new MenuBar ();
+                                                   app.TopRunnableView!.Add (menuBar);
+
+                                                   // Call EnableForDesign
+                                                   View top = app.TopRunnableView!;
+                                                   bool result = menuBar.EnableForDesign (ref top);
+
+                                                   // Should return true
+                                                   Assert.True (result);
+
+                                                   // Should have created menu items
+                                                   Assert.True (menuBar.SubViews.Count > 0);
+
+                                                   // Should have File, Edit and Help menus
+                                                   View? fileMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == Strings.menuFile);
+                                                   View? editMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == "_Edit");
+                                                   View? helpMenu = menuBar.SubViews.FirstOrDefault (v => (v as MenuBarItem)?.Title == Strings.menuHelp);
+
+                                                   Assert.NotNull (fileMenu);
+                                                   Assert.NotNull (editMenu);
+                                                   Assert.NotNull (helpMenu);
+                                               })
+                                        .ScreenShot ("MenuBar EnableForDesign", _out);
     }
 
     [Theory]
@@ -157,36 +156,36 @@ public void Navigation_Left_Right_Wraps (string d)
         MenuBar? menuBar = null;
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             menuBar = new MenuBar ();
-                                             View top = app.TopRunnableView!;
-                                             menuBar.EnableForDesign (ref top);
-                                             app.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .WaitIteration ()
-                                  .ScreenShot ("MenuBar initial state", _out)
-                                  .KeyDown (MenuBar.DefaultKey)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (menuBar?.IsOpen ())
-                                  .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
-                                  .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
-                                  .KeyDown (Key.CursorRight)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .ScreenShot ("After right arrow", _out)
-                                  .AssertEqual ("Cu_t", app?.Navigation?.GetFocused ()!.Title)
-                                  .KeyDown (Key.CursorRight)
-                                  .ScreenShot ("After second right arrow", _out)
-                                  .AssertEqual ("_Online Help...", app?.Navigation?.GetFocused ()!.Title)
-                                  .ScreenShot ("After third right arrow", _out)
-                                  .KeyDown (Key.CursorRight)
-                                  .ScreenShot ("After fourth right arrow", _out)
-                                  .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
-                                  .KeyDown (Key.CursorLeft)
-                                  .ScreenShot ("After left arrow", _out)
-                                  .AssertEqual ("_Online Help...", app?.Navigation?.GetFocused ()!.Title);
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   menuBar = new MenuBar ();
+                                                   View top = app.TopRunnableView!;
+                                                   menuBar.EnableForDesign (ref top);
+                                                   app.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .WaitIteration ()
+                                        .ScreenShot ("MenuBar initial state", _out)
+                                        .KeyDown (MenuBar.DefaultKey)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (menuBar?.IsOpen ())
+                                        .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
+                                        .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
+                                        .KeyDown (Key.CursorRight)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .ScreenShot ("After right arrow", _out)
+                                        .AssertEqual ("Cu_t", app?.Navigation?.GetFocused ()!.Title)
+                                        .KeyDown (Key.CursorRight)
+                                        .ScreenShot ("After second right arrow", _out)
+                                        .AssertEqual ("_Online Help...", app?.Navigation?.GetFocused ()!.Title)
+                                        .ScreenShot ("After third right arrow", _out)
+                                        .KeyDown (Key.CursorRight)
+                                        .ScreenShot ("After fourth right arrow", _out)
+                                        .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
+                                        .KeyDown (Key.CursorLeft)
+                                        .ScreenShot ("After left arrow", _out)
+                                        .AssertEqual ("_Online Help...", app?.Navigation?.GetFocused ()!.Title);
     }
 
     [Theory]
@@ -196,28 +195,28 @@ public void MenuBarItem_With_QuitKey_Open_QuitKey_Restores_Focus_Correctly (stri
         MenuBar? menuBar = null;
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             menuBar = new MenuBar ();
-                                             View top = app.TopRunnableView!;
-
-                                             top.Add (new View { CanFocus = true, Id = "focusableView" });
-                                             menuBar.EnableForDesign (ref top);
-                                             app.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ())
-                                  .ScreenShot ("MenuBar initial state", _out)
-                                  .KeyDown (MenuBar.DefaultKey)
-                                  .AssertEqual ("_New", app.Navigation!.GetFocused ()!.Title)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (menuBar?.IsOpen ())
-                                  .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
-                                  .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
-                                  .KeyDown (Application.QuitKey)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ());
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   menuBar = new MenuBar ();
+                                                   View top = app.TopRunnableView!;
+
+                                                   top.Add (new View { CanFocus = true, Id = "focusableView" });
+                                                   menuBar.EnableForDesign (ref top);
+                                                   app.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ())
+                                        .ScreenShot ("MenuBar initial state", _out)
+                                        .KeyDown (MenuBar.DefaultKey)
+                                        .AssertEqual ("_New", app.Navigation!.GetFocused ()!.Title)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (menuBar?.IsOpen ())
+                                        .AssertEqual ("_New", app?.Navigation?.GetFocused ()!.Title)
+                                        .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
+                                        .KeyDown (Application.QuitKey)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ());
     }
 
     [Theory]
@@ -227,29 +226,29 @@ public void MenuBarItem_Without_QuitKey_Open_QuitKey_Restores_Focus_Correctly (s
         MenuBar? menuBar = null;
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Add (new View { CanFocus = true, Id = "focusableView" })
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             menuBar = new MenuBar ();
-                                             View? runnable = app.TopRunnableView;
-                                             menuBar.EnableForDesign (ref runnable!);
-                                             app.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .WaitIteration ()
-                                  .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
-                                  .ScreenShot ("MenuBar initial state", _out)
-                                  .KeyDown (MenuBar.DefaultKey)
-                                  .KeyDown (Key.CursorRight)
-                                  .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (menuBar?.IsOpen ())
-                                  .AssertEqual ("Cu_t", app?.Navigation?.GetFocused ()!.Title)
-                                  .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
-                                  .KeyDown (Application.QuitKey)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertIsNotType<MenuItem> (app?.Navigation?.GetFocused ());
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Add (new View { CanFocus = true, Id = "focusableView" })
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   menuBar = new MenuBar ();
+                                                   View? runnable = app.TopRunnableView;
+                                                   menuBar.EnableForDesign (ref runnable!);
+                                                   app.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .WaitIteration ()
+                                        .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
+                                        .ScreenShot ("MenuBar initial state", _out)
+                                        .KeyDown (MenuBar.DefaultKey)
+                                        .KeyDown (Key.CursorRight)
+                                        .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (menuBar?.IsOpen ())
+                                        .AssertEqual ("Cu_t", app?.Navigation?.GetFocused ()!.Title)
+                                        .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
+                                        .KeyDown (Application.QuitKey)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertIsNotType<MenuItem> (app?.Navigation?.GetFocused ());
     }
 
     [Theory]
@@ -259,27 +258,27 @@ public void MenuBarItem_With_QuitKey_Open_QuitKey_Does_Not_Quit_App (string d)
         MenuBar? menuBar = null;
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             menuBar = new MenuBar ();
-                                             View top = app.TopRunnableView!;
-
-                                             top.Add (new View { CanFocus = true, Id = "focusableView" });
-                                             menuBar.EnableForDesign (ref top);
-                                             app.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .WaitIteration ()
-                                  .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ())
-                                  .ScreenShot ("MenuBar initial state", _out)
-                                  .KeyDown (MenuBar.DefaultKey)
-                                  .AssertEqual ("_New", app.Navigation!.GetFocused ()!.Title)
-                                  .AssertTrue (app?.TopRunnable!.IsRunning)
-                                  .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
-                                  .KeyDown (Application.QuitKey)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (app!.TopRunnable!.IsRunning);
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   menuBar = new MenuBar ();
+                                                   View top = app.TopRunnableView!;
+
+                                                   top.Add (new View { CanFocus = true, Id = "focusableView" });
+                                                   menuBar.EnableForDesign (ref top);
+                                                   app.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .WaitIteration ()
+                                        .AssertIsNotType<MenuItem> (app!.Navigation!.GetFocused ())
+                                        .ScreenShot ("MenuBar initial state", _out)
+                                        .KeyDown (MenuBar.DefaultKey)
+                                        .AssertEqual ("_New", app.Navigation!.GetFocused ()!.Title)
+                                        .AssertTrue (app?.TopRunnable!.IsRunning)
+                                        .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
+                                        .KeyDown (Application.QuitKey)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (app!.TopRunnable!.IsRunning);
     }
 
     [Theory]
@@ -289,33 +288,33 @@ public void MenuBarItem_Without_QuitKey_Open_QuitKey_Does_Not_Quit_MenuBar_Super
         MenuBar? menuBar = null;
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             menuBar = new MenuBar ();
-                                             View top = app.TopRunnableView!;
-
-                                             top.Add (new View { CanFocus = true, Id = "focusableView" });
-                                             menuBar.EnableForDesign (ref top);
-                                             IEnumerable<MenuItem> items = menuBar.GetMenuItemsWith (mi => mi.Title == Strings.cmdQuit);
-
-                                             foreach (MenuItem item in items)
-                                             {
-                                                 item.Key = Key.Empty;
-                                             }
-
-                                             app.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .WaitIteration ()
-                                  .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
-                                  .ScreenShot ("MenuBar initial state", _out)
-                                  .KeyDown (MenuBar.DefaultKey)
-                                  .AssertEqual ("_New", app?.Navigation!.GetFocused ()!.Title)
-                                  .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
-                                  .KeyDown (Application.QuitKey)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (app?.TopRunnable!.IsRunning);
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   menuBar = new MenuBar ();
+                                                   View top = app.TopRunnableView!;
+
+                                                   top.Add (new View { CanFocus = true, Id = "focusableView" });
+                                                   menuBar.EnableForDesign (ref top);
+                                                   IEnumerable<MenuItem> items = menuBar.GetMenuItemsWith (mi => mi.Title == Strings.cmdQuit);
+
+                                                   foreach (MenuItem item in items)
+                                                   {
+                                                       item.Key = Key.Empty;
+                                                   }
+
+                                                   app.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .WaitIteration ()
+                                        .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
+                                        .ScreenShot ("MenuBar initial state", _out)
+                                        .KeyDown (MenuBar.DefaultKey)
+                                        .AssertEqual ("_New", app?.Navigation!.GetFocused ()!.Title)
+                                        .ScreenShot ($"After {MenuBar.DefaultKey}", _out)
+                                        .KeyDown (Application.QuitKey)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (app?.TopRunnable!.IsRunning);
     }
 
     // Claude - Opus 4.6
@@ -336,34 +335,34 @@ public void Bar_CommandView_In_Menu_Click_Activates_Correct_Shortcut ()
         var shortcut3ActivatedCount = 0;
         Shortcut? shortcut2 = null;
 
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       Shortcut s1 = new () { Title = "First", Key = Key.F1, Id = "s1" };
-                                       s1.Activated += (_, _) => shortcut1ActivatedCount++;
+                                             Shortcut s1 = new () { Title = "First", Key = Key.F1, Id = "s1" };
+                                             s1.Activated += (_, _) => shortcut1ActivatedCount++;
 
-                                       shortcut2 = new Shortcut { Title = "Second", Key = Key.F2, Id = "s2" };
-                                       shortcut2.Activated += (_, _) => shortcut2ActivatedCount++;
+                                             shortcut2 = new Shortcut { Title = "Second", Key = Key.F2, Id = "s2" };
+                                             shortcut2.Activated += (_, _) => shortcut2ActivatedCount++;
 
-                                       Shortcut s3 = new () { Title = "Third", Key = Key.F3, Id = "s3" };
-                                       s3.Activated += (_, _) => shortcut3ActivatedCount++;
+                                             Shortcut s3 = new () { Title = "Third", Key = Key.F3, Id = "s3" };
+                                             s3.Activated += (_, _) => shortcut3ActivatedCount++;
 
-                                       Bar bar = new () { Orientation = Orientation.Vertical };
-                                       bar.Add (s1, shortcut2, s3);
+                                             Bar bar = new () { Orientation = Orientation.Vertical };
+                                             bar.Add (s1, shortcut2, s3);
 
-                                       menuBar = new MenuBar
-                                       {
-                                           Menus =
-                                               [
-                                                   new MenuBarItem ("_Test",
-                                                                    [new MenuItem { Id = "barItem", HelpText = "Bar with shortcuts", CommandView = bar }])
-                                               ]
-                                       };
+                                             menuBar = new MenuBar
+                                             {
+                                                 Menus =
+                                                 [
+                                                     new MenuBarItem ("_Test",
+                                                                      [new MenuItem { Id = "barItem", HelpText = "Bar with shortcuts", CommandView = bar }])
+                                                 ]
+                                             };
 
-                                       app.TopRunnableView!.Add (menuBar);
-                                   });
+                                             app.TopRunnableView!.Add (menuBar);
+                                         });
 
         c = c.WaitIteration ();
 
@@ -412,36 +411,36 @@ public void OptionSelector_CommandView_In_RootMenu_Space_Sets_Correct_Value ()
         var valueChangedCount = 0;
 
         // Step 1: Build a simple MenuBar with an OptionSelector directly in the root Menu
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       // Must have CanFocus=true for keyboard nav to work in a selector
-                                       optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
+                                             // Must have CanFocus=true for keyboard nav to work in a selector
+                                             optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
 
-                                       menuBar = new MenuBar
-                                       {
-                                           Menus =
-                                               [
-                                                   new MenuBarItem ("_Test",
-                                                                    [
-                                                                        new MenuItem
-                                                                            {
-                                                                                Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector
-                                                                            }
-                                                                    ])
-                                               ]
-                                       };
+                                             menuBar = new MenuBar
+                                             {
+                                                 Menus =
+                                                 [
+                                                     new MenuBarItem ("_Test",
+                                                                      [
+                                                                          new MenuItem
+                                                                          {
+                                                                              Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector
+                                                                          }
+                                                                      ])
+                                                 ]
+                                             };
 
-                                       app.TopRunnableView!.Add (menuBar);
+                                             app.TopRunnableView!.Add (menuBar);
 
-                                       optionSelector.ValueChanged += (_, args) =>
-                                                                      {
-                                                                          capturedNewValue = args.Value;
-                                                                          valueChangedCount++;
-                                                                      };
-                                   });
+                                             optionSelector.ValueChanged += (_, args) =>
+                                                                            {
+                                                                                capturedNewValue = args.Value;
+                                                                                valueChangedCount++;
+                                                                            };
+                                         });
 
         c = c.WaitIteration ();
 
@@ -489,24 +488,24 @@ public void OptionSelector_CommandView_In_Menu_Click_Sets_Correct_Value ()
         var valueChangedCount = 0;
 
         // Step 1: Build a simple MenuBar with an OptionSelector directly in the root Menu
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
+                                             optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
 
-                                       menu = new Menu ([new MenuItem { Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector }]);
+                                             menu = new Menu ([new MenuItem { Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector }]);
 
-                                       app.TopRunnableView!.Add (menu);
+                                             app.TopRunnableView!.Add (menu);
 
-                                       optionSelector.ValueChanged += (_, args) =>
-                                                                      {
-                                                                          Logging.Debug ($"OptionSelector ValueChanged event fired with new value: {args.Value}");
-                                                                          capturedNewValue = args.Value;
-                                                                          valueChangedCount++;
-                                                                      };
-                                   });
+                                             optionSelector.ValueChanged += (_, args) =>
+                                                                            {
+                                                                                Logging.Debug ($"OptionSelector ValueChanged event fired with new value: {args.Value}");
+                                                                                capturedNewValue = args.Value;
+                                                                                valueChangedCount++;
+                                                                            };
+                                         });
 
         c = c.WaitIteration ();
 
@@ -554,36 +553,36 @@ public void OptionSelector_CommandView_In_RootMenu_Click_Sets_Correct_Value ()
         var valueChangedCount = 0;
 
         // Step 1: Build a simple MenuBar with an OptionSelector directly in the root Menu
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
+                                             optionSelector = new OptionSelector<Schemes> { Title = "Scheme", CanFocus = true };
 
-                                       menuBar = new MenuBar
-                                       {
-                                           Menus =
-                                               [
-                                                   new MenuBarItem ("_Test",
-                                                                    [
-                                                                        new MenuItem
-                                                                            {
-                                                                                Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector
-                                                                            }
-                                                                    ])
-                                               ]
-                                       };
+                                             menuBar = new MenuBar
+                                             {
+                                                 Menus =
+                                                 [
+                                                     new MenuBarItem ("_Test",
+                                                                      [
+                                                                          new MenuItem
+                                                                          {
+                                                                              Id = "selectorItem", HelpText = "Pick a scheme", CommandView = optionSelector
+                                                                          }
+                                                                      ])
+                                                 ]
+                                             };
 
-                                       app.TopRunnableView!.Add (menuBar);
+                                             app.TopRunnableView!.Add (menuBar);
 
-                                       optionSelector.ValueChanged += (_, args) =>
-                                                                      {
-                                                                          Logging.Debug ($"OptionSelector ValueChanged event fired with new value: {args.Value}");
-                                                                          capturedNewValue = args.Value;
-                                                                          valueChangedCount++;
-                                                                      };
-                                   });
+                                             optionSelector.ValueChanged += (_, args) =>
+                                                                            {
+                                                                                Logging.Debug ($"OptionSelector ValueChanged event fired with new value: {args.Value}");
+                                                                                capturedNewValue = args.Value;
+                                                                                valueChangedCount++;
+                                                                            };
+                                         });
 
         c = c.WaitIteration ();
 
@@ -632,27 +631,27 @@ public void Checkbox_CommandView_In_RootMenu_Click_Sets_Correct_Value ()
         var valueChangedCount = 0;
 
         // Step 1: Build a simple MenuBar with an OptionSelector directly in the root Menu
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       checkBox = new CheckBox { Title = "_Checkbox", CanFocus = true };
+                                             checkBox = new CheckBox { Title = "_Checkbox", CanFocus = true };
 
-                                       menuBar = new MenuBar
-                                       {
-                                           Menus = [new MenuBarItem ("_Test", [new MenuItem { Id = "czechMi", HelpText = "Czech me", CommandView = checkBox }])]
-                                       };
+                                             menuBar = new MenuBar
+                                             {
+                                                 Menus = [new MenuBarItem ("_Test", [new MenuItem { Id = "czechMi", HelpText = "Czech me", CommandView = checkBox }])]
+                                             };
 
-                                       app.TopRunnableView!.Add (menuBar);
+                                             app.TopRunnableView!.Add (menuBar);
 
-                                       checkBox.ValueChanged += (_, args) =>
-                                                                {
-                                                                    Logging.Debug ($"Checkbox ValueChanged event fired with new value: {args.NewValue}");
-                                                                    capturedNewValue = args.NewValue;
-                                                                    valueChangedCount++;
-                                                                };
-                                   });
+                                             checkBox.ValueChanged += (_, args) =>
+                                                                      {
+                                                                          Logging.Debug ($"Checkbox ValueChanged event fired with new value: {args.NewValue}");
+                                                                          capturedNewValue = args.NewValue;
+                                                                          valueChangedCount++;
+                                                                      };
+                                         });
 
         c = c.WaitIteration ();
 
@@ -699,27 +698,27 @@ public void Checkbox_CommandView_In_RootMenu_Click_On_HelpView_Sets_Correct_Valu
         var valueChangedCount = 0;
 
         // Step 1: Build a simple MenuBar with an OptionSelector directly in the root Menu
-        TestContext c = With.A<Window> (80, 30, d, _out)
-                            .Then (a =>
-                                   {
-                                       app = a;
+        AppTestHelper c = With.A<Window> (80, 30, d, _out)
+                                  .Then (a =>
+                                         {
+                                             app = a;
 
-                                       checkBox = new CheckBox { Title = "_Checkbox", CanFocus = true };
+                                             checkBox = new CheckBox { Title = "_Checkbox", CanFocus = true };
 
-                                       menuBar = new MenuBar
-                                       {
-                                           Menus = [new MenuBarItem ("_Test", [new MenuItem { Id = "czechMi", HelpText = "Czech me", CommandView = checkBox }])]
-                                       };
+                                             menuBar = new MenuBar
+                                             {
+                                                 Menus = [new MenuBarItem ("_Test", [new MenuItem { Id = "czechMi", HelpText = "Czech me", CommandView = checkBox }])]
+                                             };
 
-                                       app.TopRunnableView!.Add (menuBar);
+                                             app.TopRunnableView!.Add (menuBar);
 
-                                       checkBox.ValueChanged += (_, args) =>
-                                                                {
-                                                                    Logging.Debug ($"Checkbox ValueChanged event fired with new value: {args.NewValue}");
-                                                                    capturedNewValue = args.NewValue;
-                                                                    valueChangedCount++;
-                                                                };
-                                   });
+                                             checkBox.ValueChanged += (_, args) =>
+                                                                      {
+                                                                          Logging.Debug ($"Checkbox ValueChanged event fired with new value: {args.NewValue}");
+                                                                          capturedNewValue = args.NewValue;
+                                                                          valueChangedCount++;
+                                                                      };
+                                         });
 
         c = c.WaitIteration ();
 
@@ -772,19 +771,19 @@ public void MenuBar_Not_Active_DoesNotEat_Space (string d)
                                 }
                             };
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             var menuBar = new MenuBar ();
-                                             View top = a.TopRunnableView!;
-                                             menuBar.EnableForDesign (ref top);
-                                             a.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .Add (testView)
-                                  .WaitIteration ()
-                                  .Focus (testView)
-                                  .KeyDown (Key.Space)
-                                  .AssertEqual (1, spaceKeyDownCount);
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   var menuBar = new MenuBar ();
+                                                   View top = a.TopRunnableView!;
+                                                   menuBar.EnableForDesign (ref top);
+                                                   a.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .Add (testView)
+                                        .WaitIteration ()
+                                        .Focus (testView)
+                                        .KeyDown (Key.Space)
+                                        .AssertEqual (1, spaceKeyDownCount);
     }
 
     [Theory]
@@ -802,19 +801,19 @@ public void MenuBar_Not_Active_DoesNotEat_Enter (string d)
                                 }
                             };
 
-        using TestContext c = With.A<Window> (50, 20, d, _out)
-                                  .Then (a =>
-                                         {
-                                             var menuBar = new MenuBar ();
-                                             View top = a.TopRunnableView!;
-                                             menuBar.EnableForDesign (ref top);
-                                             a.TopRunnableView!.Add (menuBar);
-                                         })
-                                  .Add (testView)
-                                  .WaitIteration ()
-                                  .Focus (testView)
-                                  .KeyDown (Key.Enter)
-                                  .AssertEqual (1, enterKeyDownCount);
+        using AppTestHelper c = With.A<Window> (50, 20, d, _out)
+                                        .Then (a =>
+                                               {
+                                                   var menuBar = new MenuBar ();
+                                                   View top = a.TopRunnableView!;
+                                                   menuBar.EnableForDesign (ref top);
+                                                   a.TopRunnableView!.Add (menuBar);
+                                               })
+                                        .Add (testView)
+                                        .WaitIteration ()
+                                        .Focus (testView)
+                                        .KeyDown (Key.Enter)
+                                        .AssertEqual (1, enterKeyDownCount);
     }
 
     // Claude - Opus 4.6
@@ -834,7 +833,7 @@ public void InlineMenuBarItem_Opens_SubMenu_Below ()
         MenuBarItem? inlineItem = null;
         MenuBarItem? popoverItem = null;
 
-        TestContext c = With.A<Window> (60, 20, d, _out)
+        AppTestHelper c = With.A<Window> (60, 20, d, _out)
                             .Then (a =>
                                    {
                                        app = a;
@@ -927,7 +926,7 @@ public void InlineMenuBarItem_Click_Toggles_SubMenu ()
         IApplication? app = null;
         MenuBarItem? inlineItem = null;
 
-        TestContext c = With.A<Window> (60, 20, d, _out)
+        AppTestHelper c = With.A<Window> (60, 20, d, _out)
                             .Then (a =>
                                    {
                                        app = a;
@@ -986,7 +985,7 @@ public void InlineMenuBarItem_MenuItem_Action_Fires ()
         MenuBarItem? inlineItem = null;
         var actionFiredCount = 0;
 
-        TestContext c = With.A<Window> (60, 20, d, _out)
+        AppTestHelper c = With.A<Window> (60, 20, d, _out)
                             .Then (a =>
                                    {
                                        app = a;
diff --git a/Tests/IntegrationTests/FluentTests/NavigationTests.cs b/Tests/IntegrationTests/FluentTests/NavigationTests.cs
index e52fe9d406..449dcb537d 100644
--- a/Tests/IntegrationTests/FluentTests/NavigationTests.cs
+++ b/Tests/IntegrationTests/FluentTests/NavigationTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
-using TerminalGuiFluentTesting;
-using Xunit.Abstractions;
+using AppTestHelpers;
 
 namespace IntegrationTests;
 
@@ -18,54 +17,54 @@ public void Runnable_TabGroup_Forward_Backward ()
         var v5 = new View { Id = "v5", CanFocus = true };
         var v6 = new View { Id = "v6", CanFocus = true };
 
-        using TestContext c = With.A<Window> (50, 20, "ansi", _out)
-                                  .Then (app =>
-                                         {
-                                             var w1 = new Window { Id = "w1" };
-                                             w1.Add (v1, v2);
-                                             var w2 = new Window { Id = "w2" };
-                                             w2.Add (v3, v4);
-                                             var w3 = new Window { Id = "w3" };
-                                             w3.Add (v5, v6);
-                                             app?.TopRunnableView!.Add (w1, w2, w3);
-                                         })
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v1.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v3.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v1.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v3.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v1.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v3.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v1.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v3.HasFocus)
-                                  .KeyDown (Key.Tab)
-                                  .WaitUntil (() => v4.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v1.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v5.HasFocus)
-                                  .KeyDown (Key.Tab)
-                                  .WaitUntil (() => v6.HasFocus)
-                                  .KeyDown (Key.F6.WithShift)
-                                  .WaitUntil (() => v4.HasFocus)
-                                  .KeyDown (Key.F6)
-                                  .WaitUntil (() => v6.HasFocus);
+        using AppTestHelper c = With.A<Window> (50, 20, "ansi", _out)
+                                        .Then (app =>
+                                               {
+                                                   var w1 = new Window { Id = "w1" };
+                                                   w1.Add (v1, v2);
+                                                   var w2 = new Window { Id = "w2" };
+                                                   w2.Add (v3, v4);
+                                                   var w3 = new Window { Id = "w3" };
+                                                   w3.Add (v5, v6);
+                                                   app?.TopRunnableView!.Add (w1, w2, w3);
+                                               })
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v1.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v3.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v1.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v3.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v1.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v3.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v1.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v3.HasFocus)
+                                        .KeyDown (Key.Tab)
+                                        .WaitUntil (() => v4.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v1.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v5.HasFocus)
+                                        .KeyDown (Key.Tab)
+                                        .WaitUntil (() => v6.HasFocus)
+                                        .KeyDown (Key.F6.WithShift)
+                                        .WaitUntil (() => v4.HasFocus)
+                                        .KeyDown (Key.F6)
+                                        .WaitUntil (() => v6.HasFocus);
         Assert.False (v1.HasFocus);
         Assert.False (v2.HasFocus);
         Assert.False (v3.HasFocus);
diff --git a/Tests/IntegrationTests/FluentTests/PopverMenuTests.cs b/Tests/IntegrationTests/FluentTests/PopverMenuTests.cs
index 96787c9534..28815ea040 100644
--- a/Tests/IntegrationTests/FluentTests/PopverMenuTests.cs
+++ b/Tests/IntegrationTests/FluentTests/PopverMenuTests.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
@@ -22,28 +21,28 @@ public PopoverMenuTests (ITestOutputHelper outputHelper)
     [MemberData (nameof (GetAllDriverNames))]
     public void EnableForDesign_CreatesMenuItems (string d)
     {
-        using TestContext c = With.A<Window> (80, 25, d)
-                                  .Then (app =>
-                                         {
-                                             PopoverMenu popoverMenu = new ();
-                                             app.TopRunnableView!.Add (popoverMenu);
+        using AppTestHelper c = With.A<Window> (80, 25, d)
+                                        .Then (app =>
+                                               {
+                                                   PopoverMenu popoverMenu = new ();
+                                                   app.TopRunnableView!.Add (popoverMenu);
 
-                                             // Call EnableForDesign
-                                             View top = app.TopRunnableView;
-                                             bool result = popoverMenu.EnableForDesign (ref top);
+                                                   // Call EnableForDesign
+                                                   View top = app.TopRunnableView;
+                                                   bool result = popoverMenu.EnableForDesign (ref top);
 
-                                             // Should return true
-                                             Assert.True (result);
+                                                   // Should return true
+                                                   Assert.True (result);
 
-                                             // Should have created menu items
-                                             Assert.NotNull (popoverMenu.Root);
-                                             Assert.Equal (7, popoverMenu.Root.SubViews.Count);
+                                                   // Should have created menu items
+                                                   Assert.NotNull (popoverMenu.Root);
+                                                   Assert.Equal (7, popoverMenu.Root.SubViews.Count);
 
-                                             // Should have Cut menu item
-                                             View? cutMenuItem = popoverMenu.Root?.GetMenuItemsOfAllSubMenus ().FirstOrDefault (v => v?.Title == "Cu_t");
+                                                   // Should have Cut menu item
+                                                   View? cutMenuItem = popoverMenu.Root?.GetMenuItemsOfAllSubMenus ().FirstOrDefault (v => v?.Title == "Cu_t");
 
-                                             Assert.NotNull (cutMenuItem);
-                                         });
+                                                   Assert.NotNull (cutMenuItem);
+                                               });
     }
 
     private static readonly object o = new ();
@@ -56,40 +55,40 @@ public void Activate_Sets_Application_Navigation_Correctly (string d)
         {
             IApplication? app = null;
 
-            using TestContext c = With.A<Window> (50, 20, d)
-                                      .Then (a =>
-                                             {
-                                                 app = a;
-                                                 PopoverMenu popoverMenu = new () { App = app };
-
-                                                 // Call EnableForDesign
-                                                 View top = app.TopRunnableView!;
-                                                 popoverMenu.EnableForDesign (ref top);
-
-                                                 var view = new View
-                                                 {
-                                                     CanFocus = true,
-                                                     Height = Dim.Auto (),
-                                                     Width = Dim.Auto (),
-                                                     Id = "focusableView",
-                                                     Text = "View"
-                                                 };
-                                                 app.TopRunnableView!.Add (view);
-
-                                                 // EnableForDesign sets to true; undo that
-                                                 popoverMenu.Visible = false;
-
-                                                 app?.Popovers!.Register (popoverMenu);
-
-                                                 view.SetFocus ();
-                                             })
-                                      .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                      .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
-                                      .ScreenShot ("PopoverMenu initial state", _out)
-                                      .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
-                                      .ScreenShot ("After Show", _out)
-                                      .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                      .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title);
+            using AppTestHelper c = With.A<Window> (50, 20, d)
+                                            .Then (a =>
+                                                   {
+                                                       app = a;
+                                                       PopoverMenu popoverMenu = new () { App = app };
+
+                                                       // Call EnableForDesign
+                                                       View top = app.TopRunnableView!;
+                                                       popoverMenu.EnableForDesign (ref top);
+
+                                                       var view = new View
+                                                       {
+                                                           CanFocus = true,
+                                                           Height = Dim.Auto (),
+                                                           Width = Dim.Auto (),
+                                                           Id = "focusableView",
+                                                           Text = "View"
+                                                       };
+                                                       app.TopRunnableView!.Add (view);
+
+                                                       // EnableForDesign sets to true; undo that
+                                                       popoverMenu.Visible = false;
+
+                                                       app?.Popovers!.Register (popoverMenu);
+
+                                                       view.SetFocus ();
+                                                   })
+                                            .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                            .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
+                                            .ScreenShot ("PopoverMenu initial state", _out)
+                                            .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
+                                            .ScreenShot ("After Show", _out)
+                                            .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                            .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title);
         }
     }
 
@@ -99,43 +98,43 @@ public void QuitKey_Hides (string d)
     {
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-
-                                             // Call EnableForDesign
-                                             View top = app.TopRunnableView!;
-                                             bool result = popoverMenu.EnableForDesign (ref top);
-
-                                             var view = new View
-                                             {
-                                                 CanFocus = true,
-                                                 Height = Dim.Auto (),
-                                                 Width = Dim.Auto (),
-                                                 Id = "focusableView",
-                                                 Text = "View"
-                                             };
-                                             app.TopRunnableView!.Add (view);
-
-                                             // EnableForDesign sets to true; undo that
-                                             popoverMenu.Visible = false;
-
-                                             app?.Popovers!.Register (popoverMenu);
-
-                                             view.SetFocus ();
-                                         })
-                                  .ScreenShot ("PopoverMenu initial state", _out)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
-                                  .ScreenShot ("After Show", _out)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .KeyDown (Application.QuitKey)
-                                  .ScreenShot ($"After {Application.QuitKey}", _out)
-                                  .AssertFalse (app?.Popovers!.Popovers.Cast<PopoverMenu> ().FirstOrDefault ()!.Visible)
-                                  .AssertNull (app?.Popovers!.GetActivePopover ())
-                                  .AssertTrue (app?.TopRunnable!.IsRunning);
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+
+                                                   // Call EnableForDesign
+                                                   View top = app.TopRunnableView!;
+                                                   bool result = popoverMenu.EnableForDesign (ref top);
+
+                                                   var view = new View
+                                                   {
+                                                       CanFocus = true,
+                                                       Height = Dim.Auto (),
+                                                       Width = Dim.Auto (),
+                                                       Id = "focusableView",
+                                                       Text = "View"
+                                                   };
+                                                   app.TopRunnableView!.Add (view);
+
+                                                   // EnableForDesign sets to true; undo that
+                                                   popoverMenu.Visible = false;
+
+                                                   app?.Popovers!.Register (popoverMenu);
+
+                                                   view.SetFocus ();
+                                               })
+                                        .ScreenShot ("PopoverMenu initial state", _out)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
+                                        .ScreenShot ("After Show", _out)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .KeyDown (Application.QuitKey)
+                                        .ScreenShot ($"After {Application.QuitKey}", _out)
+                                        .AssertFalse (app?.Popovers!.Popovers.Cast<PopoverMenu> ().FirstOrDefault ()!.Visible)
+                                        .AssertNull (app?.Popovers!.GetActivePopover ())
+                                        .AssertTrue (app?.TopRunnable!.IsRunning);
     }
 
     [Theory]
@@ -144,44 +143,44 @@ public void QuitKey_Restores_Focus_Correctly (string d)
     {
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-
-                                             // Call EnableForDesign
-                                             View top = app.TopRunnableView!;
-                                             bool result = popoverMenu.EnableForDesign (ref top);
-
-                                             var view = new View
-                                             {
-                                                 CanFocus = true,
-                                                 Height = Dim.Auto (),
-                                                 Width = Dim.Auto (),
-                                                 Id = "focusableView",
-                                                 Text = "View"
-                                             };
-                                             app.TopRunnableView!.Add (view);
-
-                                             // EnableForDesign sets to true; undo that
-                                             popoverMenu.Visible = false;
-
-                                             app?.Popovers!.Register (popoverMenu);
-
-                                             view.SetFocus ();
-                                         })
-                                  .ScreenShot ("PopoverMenu initial state", _out)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
-                                  .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
-                                  .ScreenShot ("After Show", _out)
-                                  .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertIsType<MenuItem> (app?.Navigation!.GetFocused ())
-                                  .KeyDown (Application.QuitKey)
-                                  .ScreenShot ($"After {Application.QuitKey}", _out)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ());
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+
+                                                   // Call EnableForDesign
+                                                   View top = app.TopRunnableView!;
+                                                   bool result = popoverMenu.EnableForDesign (ref top);
+
+                                                   var view = new View
+                                                   {
+                                                       CanFocus = true,
+                                                       Height = Dim.Auto (),
+                                                       Width = Dim.Auto (),
+                                                       Id = "focusableView",
+                                                       Text = "View"
+                                                   };
+                                                   app.TopRunnableView!.Add (view);
+
+                                                   // EnableForDesign sets to true; undo that
+                                                   popoverMenu.Visible = false;
+
+                                                   app?.Popovers!.Register (popoverMenu);
+
+                                                   view.SetFocus ();
+                                               })
+                                        .ScreenShot ("PopoverMenu initial state", _out)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
+                                        .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
+                                        .ScreenShot ("After Show", _out)
+                                        .AssertTrue (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertIsType<MenuItem> (app?.Navigation!.GetFocused ())
+                                        .KeyDown (Application.QuitKey)
+                                        .ScreenShot ($"After {Application.QuitKey}", _out)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ());
     }
 
     [Theory]
@@ -190,43 +189,43 @@ public void MenuBarItem_With_QuitKey_Open_QuitKey_Does_Not_Quit_App (string d)
     {
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-
-                                             // Call EnableForDesign
-                                             View top = app.TopRunnableView!;
-                                             bool result = popoverMenu.EnableForDesign (ref top);
-
-                                             var view = new View
-                                             {
-                                                 CanFocus = true,
-                                                 Height = Dim.Auto (),
-                                                 Width = Dim.Auto (),
-                                                 Id = "focusableView",
-                                                 Text = "View"
-                                             };
-                                             app.TopRunnableView!.Add (view);
-
-                                             // EnableForDesign sets to true; undo that
-                                             popoverMenu.Visible = false;
-
-                                             app?.Popovers!.Register (popoverMenu);
-
-                                             view.SetFocus ();
-                                         })
-                                  .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
-                                  .ScreenShot ("PopoverMenu initial state", _out)
-                                  .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
-                                  .ScreenShot ("PopoverMenu after Show", _out)
-                                  .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title)
-                                  .AssertTrue (app?.TopRunnable!.IsRunning)
-                                  .KeyDown (Application.QuitKey)
-                                  .ScreenShot ($"After {Application.QuitKey}", _out)
-                                  .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
-                                  .AssertTrue (app?.TopRunnable!.IsRunning);
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+
+                                                   // Call EnableForDesign
+                                                   View top = app.TopRunnableView!;
+                                                   bool result = popoverMenu.EnableForDesign (ref top);
+
+                                                   var view = new View
+                                                   {
+                                                       CanFocus = true,
+                                                       Height = Dim.Auto (),
+                                                       Width = Dim.Auto (),
+                                                       Id = "focusableView",
+                                                       Text = "View"
+                                                   };
+                                                   app.TopRunnableView!.Add (view);
+
+                                                   // EnableForDesign sets to true; undo that
+                                                   popoverMenu.Visible = false;
+
+                                                   app?.Popovers!.Register (popoverMenu);
+
+                                                   view.SetFocus ();
+                                               })
+                                        .AssertIsNotType<MenuItem> (app?.Navigation!.GetFocused ())
+                                        .ScreenShot ("PopoverMenu initial state", _out)
+                                        .Then (_ => app?.Popovers!.Show (app?.Popovers.Popovers.First ()))
+                                        .ScreenShot ("PopoverMenu after Show", _out)
+                                        .AssertEqual ("Cu_t", app?.Navigation!.GetFocused ()!.Title)
+                                        .AssertTrue (app?.TopRunnable!.IsRunning)
+                                        .KeyDown (Application.QuitKey)
+                                        .ScreenShot ($"After {Application.QuitKey}", _out)
+                                        .AssertFalse (app?.Popovers?.GetActivePopover () is PopoverMenu)
+                                        .AssertTrue (app?.TopRunnable!.IsRunning);
     }
 
     [Theory]
@@ -247,19 +246,19 @@ public void Not_Active_DoesNotEat_Space (string d)
 
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-                                             View top = app.TopRunnableView!;
-                                             popoverMenu.EnableForDesign (ref top);
-                                             app?.Popovers!.Register (popoverMenu);
-                                         })
-                                  .Add (testView)
-                                  .Focus (testView)
-                                  .KeyDown (Key.Space)
-                                  .AssertEqual (1, spaceKeyDownCount);
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+                                                   View top = app.TopRunnableView!;
+                                                   popoverMenu.EnableForDesign (ref top);
+                                                   app?.Popovers!.Register (popoverMenu);
+                                               })
+                                        .Add (testView)
+                                        .Focus (testView)
+                                        .KeyDown (Key.Space)
+                                        .AssertEqual (1, spaceKeyDownCount);
     }
 
     [Theory]
@@ -280,19 +279,19 @@ public void Not_Active_DoesNotEat_Enter (string d)
 
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-                                             View top = app.TopRunnableView!;
-                                             popoverMenu.EnableForDesign (ref top);
-                                             app?.Popovers!.Register (popoverMenu);
-                                         })
-                                  .Add (testView)
-                                  .Focus (testView)
-                                  .KeyDown (Key.Enter)
-                                  .AssertEqual (1, enterKeyDownCount);
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+                                                   View top = app.TopRunnableView!;
+                                                   popoverMenu.EnableForDesign (ref top);
+                                                   app?.Popovers!.Register (popoverMenu);
+                                               })
+                                        .Add (testView)
+                                        .Focus (testView)
+                                        .KeyDown (Key.Enter)
+                                        .AssertEqual (1, enterKeyDownCount);
     }
 
     [Theory]
@@ -313,18 +312,18 @@ public void Not_Active_DoesNotEat_QuitKey (string d)
 
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (50, 20, d)
-                                  .Then (a =>
-                                         {
-                                             app = a;
-                                             PopoverMenu popoverMenu = new () { App = app };
-                                             View top = app.TopRunnableView!;
-                                             popoverMenu.EnableForDesign (ref top);
-                                             app?.Popovers!.Register (popoverMenu);
-                                         })
-                                  .Add (testView)
-                                  .KeyDown (Application.QuitKey)
-                                  .AssertEqual (1, quitKeyDownCount);
+        using AppTestHelper c = With.A<Window> (50, 20, d)
+                                        .Then (a =>
+                                               {
+                                                   app = a;
+                                                   PopoverMenu popoverMenu = new () { App = app };
+                                                   View top = app.TopRunnableView!;
+                                                   popoverMenu.EnableForDesign (ref top);
+                                                   app?.Popovers!.Register (popoverMenu);
+                                               })
+                                        .Add (testView)
+                                        .KeyDown (Application.QuitKey)
+                                        .AssertEqual (1, quitKeyDownCount);
     }
 
     [Theory]
@@ -337,24 +336,24 @@ public void ContextMenu_CrashesOnRight (string d)
 
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (40, 10, d, _out)
-                                  .Then (a => app = a)
-                                  .WithContextMenu (new PopoverMenu (menuItems) { App = app })
-                                  .ScreenShot ("Before open menu", _out)
-
-                                  // Click in main area inside border
-                                  .RightClick (1, 1)
-                                  .Then (_ =>
-                                         {
-                                             // Test depends on menu having a border
-                                             IPopover? popover = app?.Popovers!.GetActivePopover ();
-                                             Assert.NotNull (popover);
-                                             var popoverMenu = popover as PopoverMenu;
-                                             popoverMenu!.Root!.BorderStyle = LineStyle.Single;
-                                         })
-                                  .ScreenShot ("After open menu", _out)
-                                  .LeftClick (2, 2)
-                                  .AssertTrue (clicked);
+        using AppTestHelper c = With.A<Window> (40, 10, d, _out)
+                                        .Then (a => app = a)
+                                        .WithContextMenu (new PopoverMenu (menuItems) { App = app })
+                                        .ScreenShot ("Before open menu", _out)
+
+                                        // Click in main area inside border
+                                        .RightClick (1, 1)
+                                        .Then (_ =>
+                                               {
+                                                   // Test depends on menu having a border
+                                                   IPopover? popover = app?.Popovers!.GetActivePopover ();
+                                                   Assert.NotNull (popover);
+                                                   var popoverMenu = popover as PopoverMenu;
+                                                   popoverMenu!.Root!.BorderStyle = LineStyle.Single;
+                                               })
+                                        .ScreenShot ("After open menu", _out)
+                                        .LeftClick (2, 2)
+                                        .AssertTrue (clicked);
     }
 
     [Theory]
@@ -385,22 +384,22 @@ public void ContextMenu_OpenSubmenu (string d)
 
         IApplication? app = null;
 
-        using TestContext c = With.A<Window> (40, 10, d)
-                                  .Then (a => app = a)
-                                  .WithContextMenu (new PopoverMenu (menuItems) { App = app })
-                                  .ScreenShot ("Before open menu", _out)
-
-                                  // Click in main area inside border
-                                  .RightClick (1, 1)
-                                  .ScreenShot ("After open menu", _out)
-                                  .KeyDown (Key.CursorDown)
-                                  .KeyDown (Key.CursorDown)
-                                  .KeyDown (Key.CursorDown)
-                                  .KeyDown (Key.CursorRight)
-                                  .ScreenShot ("After open submenu", _out)
-                                  .KeyDown (Key.CursorDown)
-                                  .KeyDown (Key.Enter)
-                                  .ScreenShot ("Menu should be closed after selecting", _out);
+        using AppTestHelper c = With.A<Window> (40, 10, d)
+                                        .Then (a => app = a)
+                                        .WithContextMenu (new PopoverMenu (menuItems) { App = app })
+                                        .ScreenShot ("Before open menu", _out)
+
+                                        // Click in main area inside border
+                                        .RightClick (1, 1)
+                                        .ScreenShot ("After open menu", _out)
+                                        .KeyDown (Key.CursorDown)
+                                        .KeyDown (Key.CursorDown)
+                                        .KeyDown (Key.CursorDown)
+                                        .KeyDown (Key.CursorRight)
+                                        .ScreenShot ("After open submenu", _out)
+                                        .KeyDown (Key.CursorDown)
+                                        .KeyDown (Key.Enter)
+                                        .ScreenShot ("Menu should be closed after selecting", _out);
         Assert.True (clicked);
     }
 }
diff --git a/Tests/IntegrationTests/FluentTests/TestContextKeyEventTests.cs b/Tests/IntegrationTests/FluentTests/TestContextKeyEventTests.cs
index 8c60a577e4..587f5e8838 100644
--- a/Tests/IntegrationTests/FluentTests/TestContextKeyEventTests.cs
+++ b/Tests/IntegrationTests/FluentTests/TestContextKeyEventTests.cs
@@ -1,11 +1,10 @@
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
 /// <summary>
-///     Integration tests for TestContext keyboard event handling (InjectKeyEvent).
+///     Integration tests for AppTestHelper keyboard event handling (InjectKeyEvent).
 /// </summary>
 public class TestContextKeyEventTests (ITestOutputHelper outputHelper) : TestsAllDrivers
 {
@@ -15,24 +14,24 @@ public class TestContextKeyEventTests (ITestOutputHelper outputHelper) : TestsAl
     [MemberData (nameof (GetAllDriverNames))]
     public void QuitKey_ViaApplication_Stops (string d)
     {
-        using TestContext context = With.A<Window> (40, 10, d)
-                                           .Then ((app) =>
-                                                  {
-                                                      app?.Keyboard.RaiseKeyDownEvent (Application.QuitKey);
-                                                      Assert.False (app!.TopRunnable!.IsRunning);
-                                                  });
+        using AppTestHelper helper = With.A<Window> (40, 10, d)
+                                              .Then ((app) =>
+                                                     {
+                                                         app?.Keyboard.RaiseKeyDownEvent (Application.QuitKey);
+                                                         Assert.False (app!.TopRunnable!.IsRunning);
+                                                     });
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void QuitKey_ViaStops (string d)
     {
-        using TestContext context = With.A<Window> (40, 10, d,  _out);
-        Assert.True (context.App?.TopRunnable!.IsRunning);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out);
+        Assert.True (helper.App?.TopRunnable!.IsRunning);
 
-        IRunnable? top = context.App?.TopRunnable;
-        context.KeyDown (Application.QuitKey);
-        context.App?.Dispose ();
+        IRunnable? top = helper.App?.TopRunnable;
+        helper.KeyDown (Application.QuitKey);
+        helper.App?.Dispose ();
 
         Assert.False (top!.IsRunning);
     }
@@ -45,11 +44,11 @@ public void AfterResizeConsole_StillWorks (string d)
         var view = new View { CanFocus = true };
         view.KeyDown += (s, e) => keyReceived = true;
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .ResizeConsole (50, 20)
-                                           .KeyDown (Key.A);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .ResizeConsole (50, 20)
+                                              .KeyDown (Key.A);
 
         Assert.True (keyReceived);
     }
@@ -60,12 +59,12 @@ public void Backspace_DeletesCharacter (string d)
     {
         var textField = new TextField { Text = "TEST", Width = 20 };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (textField)
-                                           .Focus (textField)
-                                           .Then ((_) => textField.MoveEnd ())
-                                           .KeyDown (Key.Backspace)
-                                           .KeyDown (Key.Backspace);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (textField)
+                                              .Focus (textField)
+                                              .Then ((_) => textField.MoveEnd ())
+                                              .KeyDown (Key.Backspace)
+                                              .KeyDown (Key.Backspace);
 
         Assert.Equal ("TE", textField.Text);
     }
@@ -79,19 +78,19 @@ public void ChainedWithOtherOperations_WorksCorrectly (string d)
         var button = new Button { Text = "Click Me" };
         button.Accepting += (s, e) => clickedCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (textField)
-                                           .Add (button)
-                                           .Then ((_) => textField.SetFocus ())
-                                           .KeyDown (Key.T.WithShift)
-                                           .KeyDown (Key.E)
-                                           .KeyDown (Key.S)
-                                           .KeyDown (Key.T)
-                                           .AssertEqual ("Test", textField.Text)
-                                           .KeyDown (Key.Tab)
-                                           .Then ((_) => Assert.True (button.HasFocus))
-                                           .KeyDown (Key.Enter)
-                                           .AssertEqual (1, clickedCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (textField)
+                                              .Add (button)
+                                              .Then ((_) => textField.SetFocus ())
+                                              .KeyDown (Key.T.WithShift)
+                                              .KeyDown (Key.E)
+                                              .KeyDown (Key.S)
+                                              .KeyDown (Key.T)
+                                              .AssertEqual ("Test", textField.Text)
+                                              .KeyDown (Key.Tab)
+                                              .Then ((_) => Assert.True (button.HasFocus))
+                                              .KeyDown (Key.Enter)
+                                              .AssertEqual (1, clickedCount);
     }
 
     [Theory]
@@ -109,10 +108,10 @@ public void EnqueuesKeyAndProcessesIt (string d)
             receivedKey = e;
         };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .KeyDown (Key.A);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .KeyDown (Key.A);
 
         Assert.True (keyReceived, "Key was not received by the view");
         Assert.Equal (Key.A, receivedKey);
@@ -127,12 +126,12 @@ public void FunctionKeys_ProcessesCorrectly (string d)
         var view = new View { CanFocus = true };
         view.KeyDown += (s, e) => keysReceived.Add (e);
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .KeyDown (Key.F1)
-                                           .KeyDown (Key.F5)
-                                           .KeyDown (Key.F12);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .KeyDown (Key.F1)
+                                              .KeyDown (Key.F5)
+                                              .KeyDown (Key.F12);
 
         Assert.Equal (3, keysReceived.Count);
         Assert.Equal (Key.F1, keysReceived [0]);
@@ -149,12 +148,12 @@ public void MultipleKeys_ProcessesInOrder (string d)
         var view = new View { CanFocus = true };
         view.KeyDown += (s, e) => keysReceived.Add (e);
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .KeyDown (Key.A)
-                                           .KeyDown (Key.B)
-                                           .KeyDown (Key.C);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .KeyDown (Key.A)
+                                              .KeyDown (Key.B)
+                                              .KeyDown (Key.C);
 
         Assert.Equal (3, keysReceived.Count);
         Assert.Equal (Key.A, keysReceived [0]);
@@ -169,18 +168,18 @@ public void NavigationKeys_ChangeFocus (string d)
         var view1 = new View { Id = "view1", CanFocus = true };
         var view2 = new View { Id = "view2", CanFocus = true };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view1)
-                                           .Add (view2)
-                                           .Then ((_) => view1.SetFocus ())
-                                           .AssertTrue (view1.HasFocus)
-                                           .AssertFalse (view2.HasFocus)
-                                           .KeyDown (Key.Tab)
-                                           .AssertFalse (view1.HasFocus)
-                                           .AssertTrue (view2.HasFocus)
-                                           .KeyDown (Key.Tab.WithShift)
-                                           .AssertTrue (view1.HasFocus)
-                                           .AssertFalse (view2.HasFocus);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view1)
+                                              .Add (view2)
+                                              .Then ((_) => view1.SetFocus ())
+                                              .AssertTrue (view1.HasFocus)
+                                              .AssertFalse (view2.HasFocus)
+                                              .KeyDown (Key.Tab)
+                                              .AssertFalse (view1.HasFocus)
+                                              .AssertTrue (view2.HasFocus)
+                                              .KeyDown (Key.Tab.WithShift)
+                                              .AssertTrue (view1.HasFocus)
+                                              .AssertFalse (view2.HasFocus);
     }
 
     [Theory]
@@ -189,14 +188,14 @@ public void NumericKeys_ProcessesCorrectly (string d)
     {
         var textField = new TextField { Width = 20 };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (textField)
-                                           .Then ((_) => textField.SetFocus ())
-                                           .KeyDown (Key.D1)
-                                           .KeyDown (Key.D2)
-                                           .KeyDown (Key.D3)
-                                           .KeyDown (Key.D4)
-                                           .KeyDown (Key.D5);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (textField)
+                                              .Then ((_) => textField.SetFocus ())
+                                              .KeyDown (Key.D1)
+                                              .KeyDown (Key.D2)
+                                              .KeyDown (Key.D3)
+                                              .KeyDown (Key.D4)
+                                              .KeyDown (Key.D5);
 
         Assert.Equal ("12345", textField.Text);
     }
@@ -209,14 +208,14 @@ public void RapidSequence_ProcessesAllKeys (string d)
         var view = new View { CanFocus = true };
         view.KeyDown += (s, e) => keysReceived.Add (e);
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ());
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ());
 
         // Send 10 keys rapidly
         for (var i = 0; i < 10; i++)
         {
-            context.KeyDown ((Key)(Key.A.KeyCode + (uint)i));
+            helper.KeyDown ((Key)(Key.A.KeyCode + (uint)i));
         }
 
         Assert.Equal (10, keysReceived.Count);
@@ -236,14 +235,14 @@ public void SpecialKeys_ProcessesCorrectly (string d)
         var view = new View { CanFocus = true };
         view.KeyDown += (s, e) => keysReceived.Add (e);
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .KeyDown (Key.Enter)
-                                           .KeyDown (Key.Tab)
-                                           .KeyDown (Key.CursorUp)
-                                           .KeyDown (Key.CursorDown)
-                                           .KeyDown (Key.Esc);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .KeyDown (Key.Enter)
+                                              .KeyDown (Key.Tab)
+                                              .KeyDown (Key.CursorUp)
+                                              .KeyDown (Key.CursorDown)
+                                              .KeyDown (Key.Esc);
 
         Assert.Equal (5, keysReceived.Count);
         Assert.Equal (Key.Enter, keysReceived [0]);
@@ -265,16 +264,16 @@ public void WithListView_NavigatesItems (string d)
         listView.SetSource (["Item1", "Item2", "Item3", "Item4", "Item5"]);
         listView.SelectedItem = 0;
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (listView)
-                                           .Then ((_) => listView.SetFocus ())
-                                           .AssertEqual (0, listView.SelectedItem)
-                                           .KeyDown (Key.CursorDown)
-                                           .AssertEqual (1, listView.SelectedItem)
-                                           .KeyDown (Key.CursorDown)
-                                           .AssertEqual (2, listView.SelectedItem)
-                                           .KeyDown (Key.CursorUp)
-                                           .AssertEqual (1, listView.SelectedItem);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (listView)
+                                              .Then ((_) => listView.SetFocus ())
+                                              .AssertEqual (0, listView.SelectedItem)
+                                              .KeyDown (Key.CursorDown)
+                                              .AssertEqual (1, listView.SelectedItem)
+                                              .KeyDown (Key.CursorDown)
+                                              .AssertEqual (2, listView.SelectedItem)
+                                              .KeyDown (Key.CursorUp)
+                                              .AssertEqual (1, listView.SelectedItem);
     }
 
     [Theory]
@@ -292,10 +291,10 @@ public void WithModifiers_ProcessesCorrectly (string d)
             receivedKey = e;
         };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (view)
-                                           .Then ((_) => view.SetFocus ())
-                                           .KeyDown (Key.A.WithCtrl);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (view)
+                                              .Then ((_) => view.SetFocus ())
+                                              .KeyDown (Key.A.WithCtrl);
 
         Assert.True (keyReceived);
         Assert.Equal (Key.A.WithCtrl, receivedKey);
@@ -308,13 +307,13 @@ public void WithTextField_UpdatesText (string d)
     {
         var textField = new TextField { Width = 20 };
 
-        using TestContext context = With.A<Window> (40, 10, d,  _out)
-                                           .Add (textField)
-                                           .KeyDown (Key.H.WithShift)
-                                           .KeyDown (Key.E)
-                                           .KeyDown (Key.L)
-                                           .KeyDown (Key.L)
-                                           .KeyDown (Key.O);
+        using AppTestHelper helper = With.A<Window> (40, 10, d,  _out)
+                                              .Add (textField)
+                                              .KeyDown (Key.H.WithShift)
+                                              .KeyDown (Key.E)
+                                              .KeyDown (Key.L)
+                                              .KeyDown (Key.L)
+                                              .KeyDown (Key.O);
 
         //Assert.Equal ("Hello", textField.Text);
     }
diff --git a/Tests/IntegrationTests/FluentTests/TestContextMouseEventTests.cs b/Tests/IntegrationTests/FluentTests/TestContextMouseEventTests.cs
index cf00a88644..fbb43b4964 100644
--- a/Tests/IntegrationTests/FluentTests/TestContextMouseEventTests.cs
+++ b/Tests/IntegrationTests/FluentTests/TestContextMouseEventTests.cs
@@ -1,12 +1,11 @@
 using System.Drawing;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
 /// <summary>
-///     Integration tests for TestContext mouse event handling (LeftClick, RightClick).
+///     Integration tests for AppTestHelper mouse event handling (LeftClick, RightClick).
 /// </summary>
 public class TestContextMouseEventTests (ITestOutputHelper outputHelper) : TestsAllDrivers
 {
@@ -21,10 +20,10 @@ public void Click_RaisesAccepting (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me" };
         button.Accepting += (_, _) => clickedCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (button)
-                                        .LeftClick (6, 6) // Click inside button (accounting for Window's border)
-                                        .AssertEqual (1, clickedCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (button)
+                                              .LeftClick (6, 6) // Click inside button (accounting for Window's border)
+                                              .AssertEqual (1, clickedCount);
     }
 
     [Theory]
@@ -36,7 +35,7 @@ public void Click_TView_RaisesAccepting (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me" };
         button.Accepting += (_, _) => clickedCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out).Add (button).LeftClick<Button> (b => b.Text == "Click Me").AssertEqual (1, clickedCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out).Add (button).LeftClick<Button> (b => b.Text == "Click Me").AssertEqual (1, clickedCount);
     }
 
     [Theory]
@@ -54,7 +53,7 @@ public void Click_OnView_RaisesMouseEvent (string d)
                                receivedPosition = mouse.Position!.Value;
                            };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out).Add (view).LeftClick (15, 7).AssertTrue (mouseReceived);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out).Add (view).LeftClick (15, 7).AssertTrue (mouseReceived);
     }
 
     [Theory]
@@ -66,12 +65,12 @@ public void MultipleClicks_ProcessesInOrder (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me" };
         button.Accepting += (_, _) => clickCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (button)
-                                        .LeftClick (6, 6)
-                                        .LeftClick (6, 6)
-                                        .LeftClick (6, 6)
-                                        .AssertEqual (3, clickCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (button)
+                                              .LeftClick (6, 6)
+                                              .LeftClick (6, 6)
+                                              .LeftClick (6, 6)
+                                              .AssertEqual (3, clickCount);
     }
 
     [Theory]
@@ -90,7 +89,7 @@ public void RightClick_RaisesCorrectEvent (string d)
                                }
                            };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out).Add (view).RightClick (15, 7).AssertEqual (1, rightClickCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out).Add (view).RightClick (15, 7).AssertEqual (1, rightClickCount);
     }
 
     [Theory]
@@ -117,14 +116,14 @@ public void Click_SetsFocusOnView (string d)
             CanFocus = true
         };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (view1)
-                                        .Add (view2)
-                                        .Then (_ => view1.SetFocus ())
-                                        .AssertTrue (view1.HasFocus)
-                                        .LeftClick (25, 7) // Click on view2
-                                        .AssertFalse (view1.HasFocus)
-                                        .AssertTrue (view2.HasFocus);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (view1)
+                                              .Add (view2)
+                                              .Then (_ => view1.SetFocus ())
+                                              .AssertTrue (view1.HasFocus)
+                                              .LeftClick (25, 7) // Click on view2
+                                              .AssertFalse (view1.HasFocus)
+                                              .AssertTrue (view2.HasFocus);
     }
 
     [Theory]
@@ -136,13 +135,13 @@ public void ChainedWithKeyboard_WorksCorrectly (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me" };
         button.Accepting += (_, _) => clickCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (button)
-                                        .LeftClick (6, 6) // Click button to focus it
-                                        .AssertEqual (1, clickCount)
-                                        .AssertTrue (button.HasFocus)
-                                        .KeyDown (Key.Enter) // Press Enter
-                                        .AssertEqual (2, clickCount); // Should trigger button again
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (button)
+                                              .LeftClick (6, 6) // Click button to focus it
+                                              .AssertEqual (1, clickCount)
+                                              .AssertTrue (button.HasFocus)
+                                              .KeyDown (Key.Enter) // Press Enter
+                                              .AssertEqual (2, clickCount); // Should trigger button again
     }
 
     [Theory]
@@ -151,10 +150,10 @@ public void Click_OnTextField_SetsCaretPosition (string d)
     {
         TextField textField = new () { X = 5, Y = 5, Width = 20, Text = "Hello World" };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (textField)
-                                        .LeftClick (11, 6) // Click in middle of text (accounting for border)
-                                        .AssertTrue (textField.HasFocus);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (textField)
+                                              .LeftClick (11, 6) // Click in middle of text (accounting for border)
+                                              .AssertTrue (textField.HasFocus);
     }
 
     [Theory]
@@ -174,15 +173,15 @@ public void RapidClicks_AllProcessed (string d)
                                }
                            };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out).Add (view);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out).Add (view);
 
         // Rapid fire 10 clicks
         for (var i = 0; i < 10; i++)
         {
-            context.LeftClick (15, 7);
+            helper.LeftClick (15, 7);
         }
 
-        context.AssertEqual (10, clickCount);
+        helper.AssertEqual (10, clickCount);
     }
 
     [Theory]
@@ -195,10 +194,10 @@ public void Click_OutsideView_DoesNotRaiseEvent (string d)
 
         view.MouseEvent += (_, _) => clickCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (view)
-                                        .LeftClick (5, 5) // Click outside view
-                                        .AssertEqual (0, clickCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (view)
+                                              .LeftClick (5, 5) // Click outside view
+                                              .AssertEqual (0, clickCount);
     }
 
     [Theory]
@@ -210,10 +209,10 @@ public void ClickOnDisabledView_DoesNotTrigger (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me", Enabled = false };
         button.Accepting += (_, _) => clickCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (button)
-                                        .LeftClick (6, 6)
-                                        .AssertEqual (0, clickCount); // Should not increment because button is disabled
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (button)
+                                              .LeftClick (6, 6)
+                                              .AssertEqual (0, clickCount); // Should not increment because button is disabled
     }
 
     [Theory]
@@ -225,7 +224,7 @@ public void AfterResize_StillWorks (string d)
         Button button = new () { X = 5, Y = 5, Text = "Click Me" };
         button.Accepting += (_, _) => clickCount++;
 
-        using TestContext context = With.A<Window> (40, 10, d, _out).Add (button).ResizeConsole (50, 20).LeftClick (6, 6).AssertEqual (1, clickCount);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out).Add (button).ResizeConsole (50, 20).LeftClick (6, 6).AssertEqual (1, clickCount);
     }
 
     [Theory]
@@ -234,13 +233,13 @@ public void WithCheckBox_TogglesState (string d)
     {
         CheckBox checkBox = new () { X = 5, Y = 5, Text = "Check Me" };
 
-        using TestContext context = With.A<Window> (40, 10, d, _out)
-                                        .Add (checkBox)
-                                        .AssertEqual (CheckState.UnChecked, checkBox.Value)
-                                        .LeftClick (6, 6) // Click checkbox
-                                        .AssertEqual (CheckState.Checked, checkBox.Value)
-                                        .LeftClick (6, 6) // Click again
-                                        .AssertEqual (CheckState.UnChecked, checkBox.Value);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out)
+                                              .Add (checkBox)
+                                              .AssertEqual (CheckState.UnChecked, checkBox.Value)
+                                              .LeftClick (6, 6) // Click checkbox
+                                              .AssertEqual (CheckState.Checked, checkBox.Value)
+                                              .LeftClick (6, 6) // Click again
+                                              .AssertEqual (CheckState.UnChecked, checkBox.Value);
     }
 
     [Theory]
@@ -251,10 +250,10 @@ public void WithListView_SelectsItem (string d)
         listView.SetSource (["Item1", "Item2", "Item3", "Item4", "Item5"]);
         listView.SelectedItem = 0;
 
-        using TestContext context = With.A<Window> (40, 20, d, _out)
-                                        .Add (listView)
-                                        .AssertEqual (0, listView.SelectedItem)
-                                        .LeftClick (6, 7) // Click on Item2 (accounting for header/border)
-                                        .AssertEqual (1, listView.SelectedItem);
+        using AppTestHelper helper = With.A<Window> (40, 20, d, _out)
+                                              .Add (listView)
+                                              .AssertEqual (0, listView.SelectedItem)
+                                              .LeftClick (6, 7) // Click on Item2 (accounting for header/border)
+                                              .AssertEqual (1, listView.SelectedItem);
     }
 }
diff --git a/Tests/IntegrationTests/FluentTests/TestContextTests.cs b/Tests/IntegrationTests/FluentTests/TestContextTests.cs
index 09b90f8ee3..980acb760a 100644
--- a/Tests/IntegrationTests/FluentTests/TestContextTests.cs
+++ b/Tests/IntegrationTests/FluentTests/TestContextTests.cs
@@ -1,12 +1,11 @@
 using System.Drawing;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
 /// <summary>
-///     Basic tests for TestContext functionality including constructor, lifecycle, and resize operations.
+///     Basic tests for AppTestHelper functionality including constructor, lifecycle, and resize operations.
 /// </summary>
 public class TestContextTests (ITestOutputHelper outputHelper) : TestsAllDrivers
 {
@@ -16,7 +15,7 @@ public class TestContextTests (ITestOutputHelper outputHelper) : TestsAllDrivers
     [MemberData (nameof (GetAllDriverNames))]
     public void Constructor_Sets_Application_Screen (string d)
     {
-        using var context = new TestContext (d, _out, TimeSpan.FromSeconds (10));
+        using var context = new AppTestHelper (d, _out, TimeSpan.FromSeconds (10));
 
         Assert.NotEqual (Rectangle.Empty, context.App?.Screen);
     }
@@ -30,36 +29,36 @@ public void ResizeConsole_Resizes (string d)
             Width = Dim.Fill ()
         };
 
-        using TestContext c = With.A<Window> (40, 10, d)
-                                  .Add (lbl)
-                                  .AssertEqual (38, lbl.Frame.Width) // Window has 2 border
-                                  .ResizeConsole (20, 20)
-                                  .WaitIteration ()
-                                  .AssertEqual (18, lbl.Frame.Width);
+        using AppTestHelper c = With.A<Window> (40, 10, d)
+                                        .Add (lbl)
+                                        .AssertEqual (38, lbl.Frame.Width) // Window has 2 border
+                                        .ResizeConsole (20, 20)
+                                        .WaitIteration ()
+                                        .AssertEqual (18, lbl.Frame.Width);
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void With_New_A_Runs (string d)
     {
-        using TestContext context = With.A<Window> (40, 10, d, _out);
-        Assert.True (context.App!.TopRunnable!.IsRunning);
-        Assert.NotEqual (Rectangle.Empty, context.App!.Screen);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out);
+        Assert.True (helper.App!.TopRunnable!.IsRunning);
+        Assert.NotEqual (Rectangle.Empty, helper.App!.Screen);
     }
 
     [Theory]
     [MemberData (nameof (GetAllDriverNames))]
     public void AnsiScreenShot_Renders_Ansi_Stream (string d)
     {
-        using TestContext context = With.A<Window> (10, 3, d, _out)
-                                        .Then (app =>
-                                               {
-                                                   app.TopRunnableView!.BorderStyle = LineStyle.None;
-                                                   app.TopRunnableView!.Border!.Thickness = Thickness.Empty;
-                                                   app.TopRunnableView.Text = "hello";
-                                               })
-                                        .ScreenShot ("ScreenShot", _out)
-                                        .AnsiScreenShot ("AnsiScreenShot", _out)
+        using AppTestHelper helper = With.A<Window> (10, 3, d, _out)
+                                              .Then (app =>
+                                                     {
+                                                         app.TopRunnableView!.BorderStyle = LineStyle.None;
+                                                         app.TopRunnableView!.Border!.Thickness = Thickness.Empty;
+                                                         app.TopRunnableView.Text = "hello";
+                                                     })
+                                              .ScreenShot ("ScreenShot", _out)
+                                              .AnsiScreenShot ("AnsiScreenShot", _out)
             ;
     }
 
@@ -67,7 +66,7 @@ public void AnsiScreenShot_Renders_Ansi_Stream (string d)
     [MemberData (nameof (GetAllDriverNames))]
     public void With_Starts_Stops_Without_Error (string d)
     {
-        using TestContext context = With.A<Window> (40, 10, d, _out);
+        using AppTestHelper helper = With.A<Window> (40, 10, d, _out);
 
         // No actual assertions are needed — if no exceptions are thrown, it's working
     }
@@ -76,7 +75,7 @@ public void With_Starts_Stops_Without_Error (string d)
     [MemberData (nameof (GetAllDriverNames))]
     public void With_Without_Stop_Still_Cleans_Up (string d)
     {
-        TestContext? context;
+        AppTestHelper? context;
 
         using (context = With.A<Window> (40, 10, d, _out))
         {
@@ -91,19 +90,19 @@ public void With_Without_Stop_Still_Cleans_Up (string d)
     public void AssertCursorPos_Works (string d)
     {
         // Simulates typing abcd into a TextField with width 3 (wide enough to render 2 characters only)
-        using TestContext c = With.A<Window> (100, 20, d, _out)
-                                  .Add (
-                                        new ()
-                                        {
-                                            Height = 1,
-                                            Width = 1,
-                                            CanFocus = true
-                                        })
-                                  .Then (app =>
-                                         {
-                                             app!.TopRunnableView!.SubViews.ElementAt (0).Cursor = new () { Style = CursorStyle.BlinkingBar, Position = new Point (1, 1) };
-                                         })
-                                  .AssertCursorPosition (new (1, 1)) // Initial cursor position (because Window has border)
+        using AppTestHelper c = With.A<Window> (100, 20, d, _out)
+                                        .Add (
+                                              new ()
+                                              {
+                                                  Height = 1,
+                                                  Width = 1,
+                                                  CanFocus = true
+                                              })
+                                        .Then (app =>
+                                               {
+                                                   app!.TopRunnableView!.SubViews.ElementAt (0).Cursor = new () { Style = CursorStyle.BlinkingBar, Position = new Point (1, 1) };
+                                               })
+                                        .AssertCursorPosition (new (1, 1)) // Initial cursor position (because Window has border)
             ;
     }
 }
diff --git a/Tests/IntegrationTests/FluentTests/TextFieldTests.cs b/Tests/IntegrationTests/FluentTests/TextFieldTests.cs
index dc6a37e591..20572cf339 100644
--- a/Tests/IntegrationTests/FluentTests/TextFieldTests.cs
+++ b/Tests/IntegrationTests/FluentTests/TextFieldTests.cs
@@ -1,7 +1,6 @@
 using System.Drawing;
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
@@ -14,22 +13,22 @@ public class TextFieldTests (ITestOutputHelper outputHelper) : TestsAllDrivers
     public void TextField_Cursor_AtEnd_WhenTyping (string d)
     {
         // Simulates typing abcd into a TextField with width 3 (wide enough to render 2 characters only)
-        using TestContext c = With.A<Window> (100, 20, d,  _out)
-                                     .Add (new TextField { Width = 3 })
-                                     .Focus<TextField> ()
-                                     .AssertCursorPosition (new (1, 1)) // Initial cursor position (because Window has border)
-                                     .KeyDown (Key.A)
-                                     .ScreenShot ("After typing first letter", _out)
-                                     .AssertCursorPosition (new Point (2, 1)) // Cursor moves along as letter is pressed
-                                     .KeyDown (Key.B)
-                                     .AssertCursorPosition (new Point (3, 1)) // Cursor moves along as letter is pressed
-                                     .KeyDown (Key.C)
-                                     .ScreenShot ("After typing all letters", _out)
-                                     .AssertCursorPosition (new Point (3, 1)) // Cursor stays where it is because we are at end of TextField
-                                     .KeyDown (Key.D)
-                                     .ScreenShot ("Typing one more letter", _out)
-                                     .AssertCursorPosition (new Point (3, 1)) // Cursor still stays at end of TextField
-                                     .WriteOutLogs (_out)
+        using AppTestHelper c = With.A<Window> (100, 20, d,  _out)
+                                        .Add (new TextField { Width = 3 })
+                                        .Focus<TextField> ()
+                                        .AssertCursorPosition (new (1, 1)) // Initial cursor position (because Window has border)
+                                        .KeyDown (Key.A)
+                                        .ScreenShot ("After typing first letter", _out)
+                                        .AssertCursorPosition (new Point (2, 1)) // Cursor moves along as letter is pressed
+                                        .KeyDown (Key.B)
+                                        .AssertCursorPosition (new Point (3, 1)) // Cursor moves along as letter is pressed
+                                        .KeyDown (Key.C)
+                                        .ScreenShot ("After typing all letters", _out)
+                                        .AssertCursorPosition (new Point (3, 1)) // Cursor stays where it is because we are at end of TextField
+                                        .KeyDown (Key.D)
+                                        .ScreenShot ("Typing one more letter", _out)
+                                        .AssertCursorPosition (new Point (3, 1)) // Cursor still stays at end of TextField
+                                        .WriteOutLogs (_out)
             ;
     }
 }
diff --git a/Tests/IntegrationTests/FluentTests/TreeViewTests.cs b/Tests/IntegrationTests/FluentTests/TreeViewTests.cs
index cda13e7999..d06b6f88d7 100644
--- a/Tests/IntegrationTests/FluentTests/TreeViewTests.cs
+++ b/Tests/IntegrationTests/FluentTests/TreeViewTests.cs
@@ -1,6 +1,5 @@
-using TerminalGuiFluentTesting;
-using TerminalGuiFluentTestingXunit;
-using Xunit.Abstractions;
+using AppTestHelpers;
+using AppTestHelpers.XunitHelpers;
 
 namespace IntegrationTests;
 
@@ -33,7 +32,7 @@ public void TreeView_AllowReOrdering (string d)
         };
         tv.AddObject (root);
 
-        using TestContext context =
+        using AppTestHelper helper =
             With.A<Window> (40, 10, d,  _out)
                 .Add (tv)
                 .Focus (tv)
@@ -68,7 +67,7 @@ public void TreeView_AllowReOrdering (string d)
                                  })
                 .WriteOutLogs (_out);
 
-        context.Stop ();
+        helper.Stop ();
     }
 
     [Theory]
@@ -126,7 +125,7 @@ public void TreeViewReOrder_PreservesExpansion (string d)
         tv.AddObject (root);
         tv.ExpandAll ();
 
-        using TestContext context =
+        using AppTestHelper helper =
             With.A<Window> (40, 13, d)
                 .Add (tv)
                 .WaitIteration ()
@@ -165,6 +164,6 @@ public void TreeViewReOrder_PreservesExpansion (string d)
                                  })
                 .WriteOutLogs (_out);
 
-        context.Stop ();
+        helper.Stop ();
     }
 }
diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj
index 7fd15470ca..8b1545686a 100644
--- a/Tests/IntegrationTests/IntegrationTests.csproj
+++ b/Tests/IntegrationTests/IntegrationTests.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+	      <OutputType>Exe</OutputType>
+	      <UseAppHost>true</UseAppHost>
+	      <IsTestProject>true</IsTestProject>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
         <DefineConstants>$(DefineConstants);JETBRAINS_ANNOTATIONS;CONTRACTS_FULL</DefineConstants>
         <DebugType>portable</DebugType>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -19,16 +21,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" />
+        <PackageReference Include="coverlet.collector">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.visualstudio" />
-        <PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="all" />
+        <PackageReference Include="xunit.v3" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
-        <ProjectReference Include="..\..\Tests\TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj" />
-        <ProjectReference Include="..\..\Tests\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
+        <ProjectReference Include="..\..\Tests\AppTestHelpers.XunitHelpers\AppTestHelpers.XunitHelpers.csproj" />
+        <ProjectReference Include="..\..\Tests\AppTestHelpers\AppTestHelpers.csproj" />
         <ProjectReference Include="..\..\Examples\UICatalog\UICatalog.csproj" />
         <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
     </ItemGroup>
diff --git a/Tests/IntegrationTests/TestOutputWriter.cs b/Tests/IntegrationTests/TestOutputWriter.cs
index e921654a10..99bdba47c3 100644
--- a/Tests/IntegrationTests/TestOutputWriter.cs
+++ b/Tests/IntegrationTests/TestOutputWriter.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Xunit.Abstractions;
 
 namespace IntegrationTests;
 
diff --git a/Tests/StressTests/ApplicationStressTests.cs b/Tests/StressTests/ApplicationStressTests.cs
index 7fbc8ec632..4c57f7a3d0 100644
--- a/Tests/StressTests/ApplicationStressTests.cs
+++ b/Tests/StressTests/ApplicationStressTests.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Xunit.Abstractions;
 
 // ReSharper disable AccessToDisposedClosure
 
@@ -47,7 +46,7 @@ public async Task InvokeLeakTest ()
         _tbCounter = 0;
 
         int pollMs = Debugger.IsAttached ? POLL_MS_DEBUGGER : POLL_MS_NORMAL;
-        Task task = Task.Run (() => RunTest (app, r, tf, NUM_PASSES, NUM_INCREMENTS, pollMs));
+        Task task = Task.Run (() => RunTest (app, r, tf, NUM_PASSES, NUM_INCREMENTS, pollMs), TestContext.Current.CancellationToken);
 
         // blocks here until the RequestStop is processed at the end of the test
         app.Run (top);
diff --git a/Tests/StressTests/ScenariosStressTests.cs b/Tests/StressTests/ScenariosStressTests.cs
index 3be218a3fa..588efa9113 100644
--- a/Tests/StressTests/ScenariosStressTests.cs
+++ b/Tests/StressTests/ScenariosStressTests.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using UICatalog;
-using Xunit.Abstractions;
 
 namespace StressTests;
 
diff --git a/Tests/StressTests/StressTests.csproj b/Tests/StressTests/StressTests.csproj
index 9c238bdb35..a8c06c6afa 100644
--- a/Tests/StressTests/StressTests.csproj
+++ b/Tests/StressTests/StressTests.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Nullable>enable</Nullable>
+	    <OutputType>Exe</OutputType>
+	    <UseAppHost>true</UseAppHost>
+	    <IsTestProject>true</IsTestProject>
+      <Nullable>enable</Nullable>
 
-        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
+      <IsPackable>false</IsPackable>
 	    <DefineConstants>$(DefineConstants);JETBRAINS_ANNOTATIONS;CONTRACTS_FULL</DefineConstants>
 	    <DebugType>portable</DebugType>
 	    <ImplicitUsings>enable</ImplicitUsings>
@@ -20,10 +22,13 @@
 		<Optimize>true</Optimize>
 	</PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" />
+        <PackageReference Include="coverlet.collector">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="xunit.v3" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
diff --git a/Tests/UnitTests/Application/ApplicationScreenTests.cs b/Tests/UnitTests/Application/ApplicationScreenTests.cs
index e81295bc12..0bc65ea801 100644
--- a/Tests/UnitTests/Application/ApplicationScreenTests.cs
+++ b/Tests/UnitTests/Application/ApplicationScreenTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests.ApplicationTests;
+namespace UnitTests.ApplicationTests;
 
 public class ApplicationScreenTests
 {
diff --git a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
index 8f5fb5a24f..6f1c7855aa 100644
--- a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
+++ b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/Tests/UnitTests/Application/SynchronizatonContextTests.cs b/Tests/UnitTests/Application/SynchronizatonContextTests.cs
index c6939eb2e3..e90c774184 100644
--- a/Tests/UnitTests/Application/SynchronizatonContextTests.cs
+++ b/Tests/UnitTests/Application/SynchronizatonContextTests.cs
@@ -45,23 +45,21 @@ public void SynchronizationContext_Post (string driverName = null)
                           }
 
                           // non blocking
-                          context.Post (
-                                        delegate
+                          context.Post (delegate
                                         {
                                             success = true;
 
                                             // then tell the application to quit
                                             Application.Invoke (() => Application.RequestStop ());
                                         },
-                                        null
-                                       );
+                                        null);
 
                           if (Application.TopRunnable is { IsRunning: true })
                           {
                               Assert.False (success);
                           }
-                      }
-                     );
+                      },
+                      TestContext.Current.CancellationToken);
 
             // blocks here until the RequestStop is processed at the end of the test
             Application.Run<Runnable> ();
@@ -79,25 +77,22 @@ public void SynchronizationContext_Send ()
 
         var success = false;
 
-        Task.Run (
-                  () =>
+        Task.Run (() =>
                   {
                       Thread.Sleep (500);
 
                       // blocking
-                      context.Send (
-                                    delegate
+                      context.Send (delegate
                                     {
                                         success = true;
 
                                         // then tell the application to quit
                                         Application.Invoke (() => Application.RequestStop ());
                                     },
-                                    null
-                                   );
+                                    null);
                       Assert.True (success);
-                  }
-                 );
+                  },
+                  TestContext.Current.CancellationToken);
 
         // blocks here until the RequestStop is processed at the end of the test
         Application.Run<Runnable> ();
diff --git a/Tests/UnitTests/AutoInitShutdownAttribute.cs b/Tests/UnitTests/AutoInitShutdownAttribute.cs
index 924bacebbf..0862475659 100644
--- a/Tests/UnitTests/AutoInitShutdownAttribute.cs
+++ b/Tests/UnitTests/AutoInitShutdownAttribute.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
-using Xunit.Sdk;
+using Xunit.v3;
 
 namespace UnitTests;
 
@@ -38,7 +38,7 @@ public AutoInitShutdownAttribute (
     private readonly string _forceDriver;
     private IDisposable _v2Cleanup;
 
-    public override void After (MethodInfo methodUnderTest)
+    public override void After (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"After: {methodUnderTest?.Name ?? "Unknown Test"}");
 
@@ -84,7 +84,7 @@ public override void After (MethodInfo methodUnderTest)
         CM.Disable (true);
     }
 
-    public override void Before (MethodInfo methodUnderTest)
+    public override void Before (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"Before: {methodUnderTest?.Name ?? "Unknown Test"}");
 
diff --git a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
index a94c98a2a9..a853e90fb6 100644
--- a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
+++ b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
@@ -4,7 +4,6 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
-using Xunit.Abstractions;
 using static Terminal.Gui.Configuration.ConfigurationManager;
 using File = System.IO.File;
 using SourcesManager = Terminal.Gui.Configuration.SourcesManager;
diff --git a/Tests/UnitTests/Configuration/ThemeManagerTests.cs b/Tests/UnitTests/Configuration/ThemeManagerTests.cs
index b1ee2f4e21..5107007d52 100644
--- a/Tests/UnitTests/Configuration/ThemeManagerTests.cs
+++ b/Tests/UnitTests/Configuration/ThemeManagerTests.cs
@@ -1,9 +1,5 @@
 #nullable enable
 using System.Collections.Concurrent;
-using System.Diagnostics.Metrics;
-using System.Text;
-using UnitTests.ConfigurationTests;
-using Xunit.Abstractions;
 using static Terminal.Gui.Configuration.ConfigurationManager;
 
 namespace UnitTests.ConfigurationTests;
diff --git a/Tests/UnitTests/DriverAssert.cs b/Tests/UnitTests/DriverAssert.cs
index 5ab1b0699a..aab9df37cc 100644
--- a/Tests/UnitTests/DriverAssert.cs
+++ b/Tests/UnitTests/DriverAssert.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using Xunit.Abstractions;
 
 namespace UnitTests;
 
diff --git a/Tests/UnitTests/FileServices/FileDialogTests.cs b/Tests/UnitTests/FileServices/FileDialogTests.cs
index 8e39ddd3c0..6948967206 100644
--- a/Tests/UnitTests/FileServices/FileDialogTests.cs
+++ b/Tests/UnitTests/FileServices/FileDialogTests.cs
@@ -1,7 +1,5 @@
 using System.IO.Abstractions.TestingHelpers;
 using System.Runtime.InteropServices;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.FileServicesTests;
 
diff --git a/Tests/UnitTests/OutputAssert.cs b/Tests/UnitTests/OutputAssert.cs
index d24f10962d..b64f5ceeed 100644
--- a/Tests/UnitTests/OutputAssert.cs
+++ b/Tests/UnitTests/OutputAssert.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests;
+namespace UnitTests;
 
 /// <summary>
 ///     Provides xunit-style assertions for <see cref="ITestOutputHelper"/>.
diff --git a/Tests/UnitTests/SetupFakeApplicationAttribute.cs b/Tests/UnitTests/SetupFakeApplicationAttribute.cs
index e0e7ec98e1..b6dcd4ab0c 100644
--- a/Tests/UnitTests/SetupFakeApplicationAttribute.cs
+++ b/Tests/UnitTests/SetupFakeApplicationAttribute.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Diagnostics;
 using System.Reflection;
-using Xunit.Sdk;
+using Xunit.v3;
 
 namespace UnitTests;
 
@@ -14,17 +14,17 @@ public class SetupFakeApplicationAttribute : BeforeAfterTestAttribute
 {
     private IDisposable? _appDispose;
 
-    public override void Before (MethodInfo methodUnderTest)
+    public override void Before (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"Before: {methodUnderTest.Name}");
 
         var appFactory = new FakeApplicationFactory ();
         _appDispose = appFactory.SetupFakeApplication ();
 
-        base.Before (methodUnderTest);
+        base.Before (methodUnderTest, test);
     }
 
-    public override void After (MethodInfo methodUnderTest)
+    public override void After (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"After: {methodUnderTest.Name}");
 
@@ -35,7 +35,7 @@ public override void After (MethodInfo methodUnderTest)
         // TODO: Uncomment after investigation.
         //ApplicationImpl.SetInstance (null);
 
-        base.After (methodUnderTest);
+        base.After (methodUnderTest, test);
     }
 
     /// <summary>
diff --git a/Tests/UnitTests/TestDriverBase.cs b/Tests/UnitTests/TestDriverBase.cs
index d151d5758b..4193ec4b4c 100644
--- a/Tests/UnitTests/TestDriverBase.cs
+++ b/Tests/UnitTests/TestDriverBase.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace UnitTests;
 
diff --git a/Tests/UnitTests/TestRespondersDisposedAttribute.cs b/Tests/UnitTests/TestRespondersDisposedAttribute.cs
index d9ccfa3d8d..74fca8453d 100644
--- a/Tests/UnitTests/TestRespondersDisposedAttribute.cs
+++ b/Tests/UnitTests/TestRespondersDisposedAttribute.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
-using Xunit.Sdk;
+using Xunit.v3;
 
 namespace UnitTests;
 
@@ -15,15 +15,15 @@ namespace UnitTests;
 [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method)]
 public class TestRespondersDisposedAttribute : BeforeAfterTestAttribute
 {
-    public TestRespondersDisposedAttribute () { CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo ("en-US"); }
+    public TestRespondersDisposedAttribute () => CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo ("en-US");
 
-    public override void After (MethodInfo methodUnderTest)
+    public override void After (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"After: {methodUnderTest.Name}");
 
         Debug.Assert (!CM.IsEnabled, "This test left ConfigurationManager enabled!");
 
-        base.After (methodUnderTest);
+        base.After (methodUnderTest, test);
 
 #if DEBUG_IDISPOSABLE
         Assert.True (View.EnableDebugIDisposableAsserts);
@@ -31,11 +31,11 @@ public override void After (MethodInfo methodUnderTest)
 #endif
     }
 
-    public override void Before (MethodInfo methodUnderTest)
+    public override void Before (MethodInfo methodUnderTest, IXunitTest test)
     {
         Debug.WriteLine ($"Before: {methodUnderTest.Name}");
 
-        base.Before (methodUnderTest);
+        base.Before (methodUnderTest, test);
 #if DEBUG_IDISPOSABLE
         View.EnableDebugIDisposableAsserts = true;
         // Clear out any lingering Responder instances from previous tests
diff --git a/Tests/UnitTests/Text/AutocompleteTests.cs b/Tests/UnitTests/Text/AutocompleteTests.cs
index 768f0c4c19..34272f33cb 100644
--- a/Tests/UnitTests/Text/AutocompleteTests.cs
+++ b/Tests/UnitTests/Text/AutocompleteTests.cs
@@ -1,5 +1,4 @@
 using System.Text.RegularExpressions;
-using Xunit.Abstractions;
 
 namespace UnitTests.TextTests;
 
diff --git a/Tests/UnitTests/UICatalog/RunnerTests.cs b/Tests/UnitTests/UICatalog/RunnerTests.cs
index bb1c4e4afd..9829bdb8c0 100644
--- a/Tests/UnitTests/UICatalog/RunnerTests.cs
+++ b/Tests/UnitTests/UICatalog/RunnerTests.cs
@@ -5,7 +5,6 @@
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using UICatalog;
-using Xunit.Abstractions;
 using Timeout = System.Threading.Timeout;
 
 namespace UnitTests.UICatalog;
diff --git a/Tests/UnitTests/UICatalog/ScenarioLogCaptureTests.cs b/Tests/UnitTests/UICatalog/ScenarioLogCaptureTests.cs
index 6fb73c9147..050a2edb49 100644
--- a/Tests/UnitTests/UICatalog/ScenarioLogCaptureTests.cs
+++ b/Tests/UnitTests/UICatalog/ScenarioLogCaptureTests.cs
@@ -3,7 +3,6 @@
 // Claude - Opus 4.5
 using Microsoft.Extensions.Logging;
 using UICatalog;
-using Xunit.Abstractions;
 
 namespace UnitTests.UICatalog;
 
@@ -303,8 +302,7 @@ public async Task ThreadSafety_ConcurrentLogging ()
         {
             int threadId = t;
 
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      ILogger logger = capture.CreateLogger ($"Thread{threadId}");
 
@@ -312,7 +310,8 @@ public async Task ThreadSafety_ConcurrentLogging ()
                                      {
                                          logger.LogInformation ($"Thread {threadId} Log {i}");
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
         await Task.WhenAll (tasks);
diff --git a/Tests/UnitTests/UICatalog/ScenarioTests.cs b/Tests/UnitTests/UICatalog/ScenarioTests.cs
index d71a138800..6fb073b808 100644
--- a/Tests/UnitTests/UICatalog/ScenarioTests.cs
+++ b/Tests/UnitTests/UICatalog/ScenarioTests.cs
@@ -4,7 +4,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using UICatalog;
-using Xunit.Abstractions;
 using Timeout = System.Threading.Timeout;
 
 namespace UnitTests.UICatalog;
diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj
index 52ec0b67d2..6a6c8269e0 100644
--- a/Tests/UnitTests/UnitTests.csproj
+++ b/Tests/UnitTests/UnitTests.csproj
@@ -9,6 +9,9 @@
 		<InformationalVersion>2.0</InformationalVersion>
 	</PropertyGroup>
 	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<UseAppHost>true</UseAppHost>
+		<IsTestProject>true</IsTestProject>
 		<IsPackable>false</IsPackable>
 		<UseDataCollector />
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -36,16 +39,13 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="Moq" />
 		<PackageReference Include="ReportGenerator" />
 		<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" />
-		<PackageReference Include="xunit" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="xunit.runner.visualstudio" />
+		<PackageReference Include="xunit.v3" />
 		<PackageReference Include="Xunit.Combinatorial" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
 		<PackageReference Include="coverlet.collector">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -54,7 +54,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
 		<ProjectReference Include="..\..\Examples\UICatalog\UICatalog.csproj" />
-		<ProjectReference Include="..\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
+		<ProjectReference Include="..\AppTestHelpers\AppTestHelpers.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="xunit.runner.json">
diff --git a/Tests/UnitTests/View/Adornment/AdornmentTests.cs b/Tests/UnitTests/View/Adornment/AdornmentTests.cs
index 123faf94ea..442e187f05 100644
--- a/Tests/UnitTests/View/Adornment/AdornmentTests.cs
+++ b/Tests/UnitTests/View/Adornment/AdornmentTests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class AdornmentTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/View/Adornment/BorderTests.cs b/Tests/UnitTests/View/Adornment/BorderTests.cs
index 332cd0304d..b02464ed26 100644
--- a/Tests/UnitTests/View/Adornment/BorderTests.cs
+++ b/Tests/UnitTests/View/Adornment/BorderTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class BorderTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/View/Adornment/PaddingTests.cs b/Tests/UnitTests/View/Adornment/PaddingTests.cs
index ad96a1d0a5..80f5846785 100644
--- a/Tests/UnitTests/View/Adornment/PaddingTests.cs
+++ b/Tests/UnitTests/View/Adornment/PaddingTests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class PaddingTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs b/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
index 5341923604..a2fb54a962 100644
--- a/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
+++ b/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class ShadowStyleTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/View/ArrangementTests.cs b/Tests/UnitTests/View/ArrangementTests.cs
index 3e337f5966..7f28b9c561 100644
--- a/Tests/UnitTests/View/ArrangementTests.cs
+++ b/Tests/UnitTests/View/ArrangementTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class ArrangementTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/View/DiagnosticsTests.cs b/Tests/UnitTests/View/DiagnosticsTests.cs
index d5b95b1e73..e56a09fec1 100644
--- a/Tests/UnitTests/View/DiagnosticsTests.cs
+++ b/Tests/UnitTests/View/DiagnosticsTests.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
-
 namespace UnitTests.ViewBaseTests;
 
 /// <summary>
diff --git a/Tests/UnitTests/View/Draw/ClipTests.cs b/Tests/UnitTests/View/Draw/ClipTests.cs
index 0210aa742d..2e033ea7a9 100644
--- a/Tests/UnitTests/View/Draw/ClipTests.cs
+++ b/Tests/UnitTests/View/Draw/ClipTests.cs
@@ -1,7 +1,5 @@
 #nullable enable
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewBaseTests;
 
diff --git a/Tests/UnitTests/View/Draw/DrawTests.cs b/Tests/UnitTests/View/Draw/DrawTests.cs
index ff5a4e8678..b6be67128e 100644
--- a/Tests/UnitTests/View/Draw/DrawTests.cs
+++ b/Tests/UnitTests/View/Draw/DrawTests.cs
@@ -1,7 +1,5 @@
 #nullable enable
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewBaseTests;
 
diff --git a/Tests/UnitTests/View/Draw/TransparentTests.cs b/Tests/UnitTests/View/Draw/TransparentTests.cs
index 39f966a924..a4929c1cf9 100644
--- a/Tests/UnitTests/View/Draw/TransparentTests.cs
+++ b/Tests/UnitTests/View/Draw/TransparentTests.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewBaseTests;
 
diff --git a/Tests/UnitTests/View/Layout/Dim.Tests.cs b/Tests/UnitTests/View/Layout/Dim.Tests.cs
index 3379c3421c..d25e37e247 100644
--- a/Tests/UnitTests/View/Layout/Dim.Tests.cs
+++ b/Tests/UnitTests/View/Layout/Dim.Tests.cs
@@ -1,7 +1,5 @@
 using System.Globalization;
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 using static Terminal.Gui.ViewBase.Dim;
 
 namespace UnitTests.LayoutTests;
diff --git a/Tests/UnitTests/View/Layout/Pos.ViewTests.cs b/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
index 3edf2733c2..43b66d7542 100644
--- a/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
+++ b/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using JetBrains.Annotations;
-using Xunit.Abstractions;
 
 namespace UnitTests.LayoutTests;
 
diff --git a/Tests/UnitTests/View/SubviewTests.cs b/Tests/UnitTests/View/SubviewTests.cs
index a5241638d3..42f31baacb 100644
--- a/Tests/UnitTests/View/SubviewTests.cs
+++ b/Tests/UnitTests/View/SubviewTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewBaseTests;
+namespace UnitTests.ViewBaseTests;
 
 public class SubViewTests
 {
diff --git a/Tests/UnitTests/View/TextTests.cs b/Tests/UnitTests/View/TextTests.cs
index f63d219e2b..696cde8e3a 100644
--- a/Tests/UnitTests/View/TextTests.cs
+++ b/Tests/UnitTests/View/TextTests.cs
@@ -1,6 +1,4 @@
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewBaseTests;
 
diff --git a/Tests/UnitTests/View/ViewTests.cs b/Tests/UnitTests/View/ViewTests.cs
index 68827d3b57..3836d11311 100644
--- a/Tests/UnitTests/View/ViewTests.cs
+++ b/Tests/UnitTests/View/ViewTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace UnitTests.ViewBaseTests;
 
 public class ViewTests
diff --git a/Tests/UnitTests/Views/AppendAutocompleteTests.cs b/Tests/UnitTests/Views/AppendAutocompleteTests.cs
index 54bec4364f..784cdb4350 100644
--- a/Tests/UnitTests/Views/AppendAutocompleteTests.cs
+++ b/Tests/UnitTests/Views/AppendAutocompleteTests.cs
@@ -1,6 +1,3 @@
-using UnitTests;
-using Xunit.Abstractions;
-
 namespace UnitTests.TextTests;
 
 public class AppendAutocompleteTests (ITestOutputHelper output)
diff --git a/Tests/UnitTests/Views/ButtonTests.cs b/Tests/UnitTests/Views/ButtonTests.cs
index 2b3b64b0df..cd6e5febcb 100644
--- a/Tests/UnitTests/Views/ButtonTests.cs
+++ b/Tests/UnitTests/Views/ButtonTests.cs
@@ -1,7 +1,3 @@
-using TerminalGuiFluentTesting;
-using UnitTests;
-using Xunit.Abstractions;
-
 namespace UnitTests.ViewsTests;
 
 public class ButtonTests (ITestOutputHelper output)
diff --git a/Tests/UnitTests/Views/CheckBoxTests.cs b/Tests/UnitTests/Views/CheckBoxTests.cs
index cb3da5078d..9e23efe706 100644
--- a/Tests/UnitTests/Views/CheckBoxTests.cs
+++ b/Tests/UnitTests/Views/CheckBoxTests.cs
@@ -1,7 +1,3 @@
-using System.ComponentModel;
-using UnitTests;
-using Xunit.Abstractions;
-
 // ReSharper disable AccessToModifiedClosure
 
 namespace UnitTests.ViewsTests;
diff --git a/Tests/UnitTests/Views/FrameViewTests.cs b/Tests/UnitTests/Views/FrameViewTests.cs
index 9e59b48c4b..24ceafe5a0 100644
--- a/Tests/UnitTests/Views/FrameViewTests.cs
+++ b/Tests/UnitTests/Views/FrameViewTests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewsTests;
+namespace UnitTests.ViewsTests;
 
 public class FrameViewTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/Views/GraphViewTests.cs b/Tests/UnitTests/Views/GraphViewTests.cs
index ab3032e355..b57c7c4d7e 100644
--- a/Tests/UnitTests/Views/GraphViewTests.cs
+++ b/Tests/UnitTests/Views/GraphViewTests.cs
@@ -1,6 +1,4 @@
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/LabelTests.cs b/Tests/UnitTests/Views/LabelTests.cs
index d3a9efe50f..25bed7467d 100644
--- a/Tests/UnitTests/Views/LabelTests.cs
+++ b/Tests/UnitTests/Views/LabelTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
@@ -1073,7 +1072,7 @@ public void Label_IsEmpty_False_Minimum_Height ()
 
         Assert.Equal (new (0, 0, 5, 1), label.Frame);
         Assert.Equal (new (5, 1), label.TextFormatter.ConstrainToSize);
-        Exception exception = Record.Exception (() => Assert.Single (label.TextFormatter.GetLines ()));
+        Exception? exception = Record.Exception (() => Assert.Single (label.TextFormatter.GetLines ()));
         Assert.Null (exception);
 
         expected = @"
diff --git a/Tests/UnitTests/Views/MessageBoxTests.cs b/Tests/UnitTests/Views/MessageBoxTests.cs
index a87e915b4f..eb91937ad0 100644
--- a/Tests/UnitTests/Views/MessageBoxTests.cs
+++ b/Tests/UnitTests/Views/MessageBoxTests.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using UICatalog;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTests/Views/ScrollBarTests.cs b/Tests/UnitTests/Views/ScrollBarTests.cs
index 6d489a7cc6..2e050e1934 100644
--- a/Tests/UnitTests/Views/ScrollBarTests.cs
+++ b/Tests/UnitTests/Views/ScrollBarTests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewsTests;
+namespace UnitTests.ViewsTests;
 
 public class ScrollBarTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/Views/SpinnerViewTests.cs b/Tests/UnitTests/Views/SpinnerViewTests.cs
index abcecf4704..240144ca0f 100644
--- a/Tests/UnitTests/Views/SpinnerViewTests.cs
+++ b/Tests/UnitTests/Views/SpinnerViewTests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.ViewsTests;
+namespace UnitTests.ViewsTests;
 
 public class SpinnerViewTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTests/Views/TabViewTests.cs b/Tests/UnitTests/Views/TabViewTests.cs
index dd44227899..80cbbfad8e 100644
--- a/Tests/UnitTests/Views/TabViewTests.cs
+++ b/Tests/UnitTests/Views/TabViewTests.cs
@@ -1,6 +1,4 @@
 using System.Globalization;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/TableViewTests.cs b/Tests/UnitTests/Views/TableViewTests.cs
index 41552cd9d2..2a0dcb14a2 100644
--- a/Tests/UnitTests/Views/TableViewTests.cs
+++ b/Tests/UnitTests/Views/TableViewTests.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Data;
 using System.Globalization;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/TextFieldTests.cs b/Tests/UnitTests/Views/TextFieldTests.cs
index 38255f3a7a..cebe568208 100644
--- a/Tests/UnitTests/Views/TextFieldTests.cs
+++ b/Tests/UnitTests/Views/TextFieldTests.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 using System.Reflection;
-using Xunit.Abstractions;
+using Xunit.v3;
 
 namespace UnitTests.ViewsTests;
 
@@ -1675,21 +1675,21 @@ private TextField GetTextFieldsInView ()
     [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method)]
     public class TextFieldTestsAutoInitShutdown : AutoInitShutdownAttribute
     {
-        public override void After (MethodInfo methodUnderTest)
+        public override void After (MethodInfo methodUnderTest, IXunitTest test)
         {
             _textField.Dispose ();
             _textField = null;
-            base.After (methodUnderTest);
+            base.After (methodUnderTest, test);
         }
 
-        public override void Before (MethodInfo methodUnderTest)
+        public override void Before (MethodInfo methodUnderTest, IXunitTest test)
         {
-            base.Before (methodUnderTest);
+            base.Before (methodUnderTest, test);
 
             //Application.TopRunnable.Scheme = Colors.Schemes ["Base"];
             _textField = new TextField
             {
-                //                1         2         3 
+                //                1         2         3
                 //      01234567890123456789012345678901=32 (Length)
                 Text = "TAB to jump between text fields.", Width = 32, App = ApplicationImpl.Instance
             };
diff --git a/Tests/UnitTests/Views/TextViewTests.History.cs b/Tests/UnitTests/Views/TextViewTests.History.cs
index 332bd801ec..99ff43c485 100644
--- a/Tests/UnitTests/Views/TextViewTests.History.cs
+++ b/Tests/UnitTests/Views/TextViewTests.History.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Text;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/TextViewTests.cs b/Tests/UnitTests/Views/TextViewTests.cs
index 4fbf128cee..91a94337db 100644
--- a/Tests/UnitTests/Views/TextViewTests.cs
+++ b/Tests/UnitTests/Views/TextViewTests.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Text;
-using Xunit.Abstractions;
+using Xunit.v3;
 
 namespace UnitTests.ViewsTests;
 
@@ -3460,17 +3460,17 @@ public class TextViewTestsSetupFakeApplication : SetupFakeApplicationAttribute
     {
         public static string Txt = "TAB to jump between text fields.";
 
-        public override void After (MethodInfo methodUnderTest)
+        public override void After (MethodInfo methodUnderTest, IXunitTest test)
         {
             _textView = null;
-            base.After (methodUnderTest);
+            base.After (methodUnderTest, test);
         }
 
-        public override void Before (MethodInfo methodUnderTest)
+        public override void Before (MethodInfo methodUnderTest, IXunitTest test)
         {
-            base.Before (methodUnderTest);
+            base.Before (methodUnderTest, test);
 
-            //                   1         2         3 
+            //                   1         2         3
             //         01234567890123456789012345678901=32 (Length)
             byte [] buff = Encoding.Unicode.GetBytes (Txt);
             byte [] ms = new MemoryStream (buff).ToArray ();
diff --git a/Tests/UnitTests/Views/TreeTableSourceTests.cs b/Tests/UnitTests/Views/TreeTableSourceTests.cs
index 075d37c046..098f3db392 100644
--- a/Tests/UnitTests/Views/TreeTableSourceTests.cs
+++ b/Tests/UnitTests/Views/TreeTableSourceTests.cs
@@ -1,6 +1,4 @@
 using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/TreeViewTests.cs b/Tests/UnitTests/Views/TreeViewTests.cs
index 01b03986b1..998e42cfaf 100644
--- a/Tests/UnitTests/Views/TreeViewTests.cs
+++ b/Tests/UnitTests/Views/TreeViewTests.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/ViewDisposalTest.cs b/Tests/UnitTests/Views/ViewDisposalTest.cs
index 0d47d6a5af..4390e195e3 100644
--- a/Tests/UnitTests/Views/ViewDisposalTest.cs
+++ b/Tests/UnitTests/Views/ViewDisposalTest.cs
@@ -1,6 +1,4 @@
 using System.Reflection;
-using UnitTests;
-using Xunit.Abstractions;
 
 namespace UnitTests.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/WindowTests.cs b/Tests/UnitTests/Views/WindowTests.cs
index 0f55710fb1..e872d22e13 100644
--- a/Tests/UnitTests/Views/WindowTests.cs
+++ b/Tests/UnitTests/Views/WindowTests.cs
@@ -1,6 +1,3 @@
-using UnitTests;
-using Xunit.Abstractions;
-
 namespace UnitTests.ViewsTests;
 
 public class WindowTests ()
diff --git a/Tests/UnitTestsParallelizable/Application/Application.NavigationTests.cs b/Tests/UnitTestsParallelizable/Application/Application.NavigationTests.cs
index 2085e70a8b..1003e2d761 100644
--- a/Tests/UnitTestsParallelizable/Application/Application.NavigationTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Application.NavigationTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ApplicationTests.Navigation;
+namespace ApplicationTests.Navigation;
 
 public class ApplicationNavigationTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTestsParallelizable/Application/BeginEndTests.cs b/Tests/UnitTestsParallelizable/Application/BeginEndTests.cs
index 5fbea289b4..9c04acb9ed 100644
--- a/Tests/UnitTestsParallelizable/Application/BeginEndTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/BeginEndTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ApplicationTests.BeginEnd;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/CursorTests.cs b/Tests/UnitTestsParallelizable/Application/CursorTests.cs
index e10d4f67b3..190b7c7200 100644
--- a/Tests/UnitTestsParallelizable/Application/CursorTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/CursorTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ApplicationTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/InitTests.cs b/Tests/UnitTestsParallelizable/Application/InitTests.cs
index f2a178971b..7ba5ee7309 100644
--- a/Tests/UnitTestsParallelizable/Application/InitTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/InitTests.cs
@@ -1,5 +1,4 @@
 using Terminal.Gui.Tests;
-using Xunit.Abstractions;
 
 namespace ApplicationTests.Init;
 
diff --git a/Tests/UnitTestsParallelizable/Application/Keyboard/ApplicationKeyboardThreadSafetyTests.cs b/Tests/UnitTestsParallelizable/Application/Keyboard/ApplicationKeyboardThreadSafetyTests.cs
index d71c9b8ab0..2a0affc24c 100644
--- a/Tests/UnitTestsParallelizable/Application/Keyboard/ApplicationKeyboardThreadSafetyTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Keyboard/ApplicationKeyboardThreadSafetyTests.cs
@@ -23,8 +23,7 @@ public void AddCommand_ConcurrentAccess_NoExceptions ()
 
         for (var i = 0; i < NUM_THREADS; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -42,11 +41,12 @@ public void AddCommand_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -88,7 +88,8 @@ public void Dispose_WhileOperationsInProgress_NoExceptions ()
                                                     break;
                                                 }
                                             }
-                                        });
+                                        },
+                                        TestContext.Current.CancellationToken);
 
         // Give operations a chance to start
         Thread.Sleep (10);
@@ -98,7 +99,7 @@ public void Dispose_WhileOperationsInProgress_NoExceptions ()
         continueRunning = false;
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        operationsTask.Wait (TimeSpan.FromSeconds (2));
+        operationsTask.Wait (TimeSpan.FromSeconds (2), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -123,8 +124,7 @@ public void InvokeCommand_ConcurrentAccess_NoExceptions ()
 
         for (var i = 0; i < NUM_THREADS; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -138,11 +138,12 @@ public void InvokeCommand_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -168,8 +169,7 @@ public void InvokeCommandsBoundToKey_ConcurrentAccess_NoExceptions ()
 
         for (var i = 0; i < NUM_THREADS; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -182,11 +182,12 @@ public void InvokeCommandsBoundToKey_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -213,8 +214,7 @@ public void KeyBindings_ConcurrentAdd_NoExceptions ()
         {
             int threadId = i;
 
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -237,11 +237,12 @@ public void KeyBindings_ConcurrentAdd_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -266,8 +267,7 @@ public void KeyDown_Events_ConcurrentSubscription_NoExceptions ()
         // Threads subscribing to events
         for (var i = 0; i < NUM_THREADS; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -276,18 +276,18 @@ public void KeyDown_Events_ConcurrentSubscription_NoExceptions ()
                                              EventHandler<Key> handler = (s, e) => { Interlocked.Increment (ref keyDownCount); };
                                              keyboard.KeyDown += handler;
                                              keyboard.KeyDown -= handler;
-
                                          }
                                          catch (Exception ex)
                                          {
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -314,8 +314,7 @@ public void KeyProperty_Setters_ConcurrentAccess_NoExceptions ()
         {
             int threadId = i;
 
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -328,22 +327,27 @@ public void KeyProperty_Setters_ConcurrentAccess_NoExceptions ()
                                                      keyboard.QuitKey = Key.Q.WithCtrl;
 
                                                      break;
+
                                                  case 1:
                                                      keyboard.ArrangeKey = Key.F6.WithCtrl;
 
                                                      break;
+
                                                  case 2:
                                                      keyboard.NextTabKey = Key.Tab;
 
                                                      break;
+
                                                  case 3:
                                                      keyboard.PrevTabKey = Key.Tab.WithShift;
 
                                                      break;
+
                                                  case 4:
                                                      keyboard.NextTabGroupKey = Key.F6;
 
                                                      break;
+
                                                  case 5:
                                                      keyboard.PrevTabGroupKey = Key.F6.WithShift;
 
@@ -355,11 +359,12 @@ public void KeyProperty_Setters_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -382,8 +387,7 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
         List<Task> tasks = new ();
 
         // Thread 1: Add bindings with unique keys
-        tasks.Add (
-                   Task.Run (() =>
+        tasks.Add (Task.Run (() =>
                              {
                                  for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                  {
@@ -406,11 +410,11 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                          exceptions.Add (ex);
                                      }
                                  }
-                             }));
+                             },
+                             TestContext.Current.CancellationToken));
 
         // Thread 2: Invoke commands
-        tasks.Add (
-                   Task.Run (() =>
+        tasks.Add (Task.Run (() =>
                              {
                                  for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                  {
@@ -423,11 +427,11 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                          exceptions.Add (ex);
                                      }
                                  }
-                             }));
+                             },
+                             TestContext.Current.CancellationToken));
 
         // Thread 3: Read bindings
-        tasks.Add (
-                   Task.Run (() =>
+        tasks.Add (Task.Run (() =>
                              {
                                  for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                  {
@@ -442,11 +446,11 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                          exceptions.Add (ex);
                                      }
                                  }
-                             }));
+                             },
+                             TestContext.Current.CancellationToken));
 
         // Thread 4: Change key properties
-        tasks.Add (
-                   Task.Run (() =>
+        tasks.Add (Task.Run (() =>
                              {
                                  for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                  {
@@ -459,10 +463,11 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                          exceptions.Add (ex);
                                      }
                                  }
-                             }));
+                             },
+                             TestContext.Current.CancellationToken));
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -488,8 +493,7 @@ public void RaiseKeyDownEvent_ConcurrentAccess_NoExceptions ()
 
         for (var i = 0; i < NUM_THREADS; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
                                      {
@@ -502,11 +506,12 @@ public void RaiseKeyDownEvent_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
diff --git a/Tests/UnitTestsParallelizable/Application/LoggingTests.cs b/Tests/UnitTestsParallelizable/Application/LoggingTests.cs
index 58d161afd7..44331f5c43 100644
--- a/Tests/UnitTestsParallelizable/Application/LoggingTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/LoggingTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Terminal.Gui.Tests;
-using Xunit.Abstractions;
 
 namespace ApplicationTests;
 
@@ -85,7 +84,7 @@ public async Task PushLogger_Flows_Across_Async_Boundary ()
 
         using (Logging.PushLogger (scopedLogger))
         {
-            await Task.Run (() => Logging.Trace ("async-message"));
+            await Task.Run (() => Logging.Trace ("async-message"), TestContext.Current.CancellationToken);
         }
 
         Assert.True (scopedLogger.Contains ("async-message"));
@@ -175,7 +174,7 @@ public async Task PushLogger_Isolates_Parallel_Test_Logs (string testId)
             // Each parallel test logs its own ID
             Logging.Information ($"Starting {testId}");
 
-            await Task.Delay (10); // Simulate async work
+            await Task.Delay (10, TestContext.Current.CancellationToken); // Simulate async work
 
             Logging.Information ($"Finishing {testId}");
         }
diff --git a/Tests/UnitTestsParallelizable/Application/MainLoopCoordinatorTests.cs b/Tests/UnitTestsParallelizable/Application/MainLoopCoordinatorTests.cs
index c67359f339..c59dfe0ccd 100644
--- a/Tests/UnitTestsParallelizable/Application/MainLoopCoordinatorTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/MainLoopCoordinatorTests.cs
@@ -155,7 +155,7 @@ public void InputLoop_Throttle_Limits_Poll_Rate ()
         cts.Cancel ();
 
         // Wait for task to complete
-        bool completed = inputTask.Wait (TimeSpan.FromSeconds (10));
+        bool completed = inputTask.Wait (TimeSpan.FromSeconds (10), TestContext.Current.CancellationToken);
         Assert.True (completed, "Input task did not complete within timeout");
 
         // Assert - The key insight: throttle prevents CPU spinning
diff --git a/Tests/UnitTestsParallelizable/Application/Mouse/MouseInterfaceTests.cs b/Tests/UnitTestsParallelizable/Application/Mouse/MouseInterfaceTests.cs
index 7db630b850..6652799984 100644
--- a/Tests/UnitTestsParallelizable/Application/Mouse/MouseInterfaceTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Mouse/MouseInterfaceTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ApplicationTests.MouseTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/Popover/PopoverBaseImplTests.cs b/Tests/UnitTestsParallelizable/Application/Popover/PopoverBaseImplTests.cs
index ce27f41292..ca8bdb02aa 100644
--- a/Tests/UnitTestsParallelizable/Application/Popover/PopoverBaseImplTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Popover/PopoverBaseImplTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ApplicationTests.Popover;
 
diff --git a/Tests/UnitTestsParallelizable/Application/RunTests.cs b/Tests/UnitTestsParallelizable/Application/RunTests.cs
index 70e2e0f416..54a80c0e4e 100644
--- a/Tests/UnitTestsParallelizable/Application/RunTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/RunTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace ApplicationTests;
 
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
index 69ac2fe671..e0bcf869b9 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ApplicationTests.RunnableTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
index 87d17b433a..d2457f70c0 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace ApplicationTests.RunnableTests;
 
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
index 0b2c11e52a..b982ea386d 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableSessionTokenTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableSessionTokenTests.cs
index c33340496d..6f28fbeba8 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableSessionTokenTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableSessionTokenTests.cs
@@ -1,6 +1,3 @@
-using Xunit.Abstractions;
-using Xunit;
-
 namespace ApplicationTests.RunnableTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableTests.cs
index 1ce0dd4e74..24b8b6e871 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableTests.cs
@@ -1,6 +1,3 @@
-using Xunit.Abstractions;
-using Xunit;
-
 namespace ApplicationTests.RunnableTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/ScreeenTests.cs b/Tests/UnitTestsParallelizable/Application/ScreeenTests.cs
index 3336483398..aab3448e98 100644
--- a/Tests/UnitTestsParallelizable/Application/ScreeenTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/ScreeenTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ApplicationTests.Screen;
 
 /// <summary>
@@ -450,8 +448,7 @@ public void Screen_Property_Thread_Safe_Access ()
         // Act - Access Screen property from multiple threads
         for (var i = 0; i < 10; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      try
                                      {
@@ -465,11 +462,12 @@ public void Screen_Property_Thread_Safe_Access ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert - No exceptions should occur
diff --git a/Tests/UnitTestsParallelizable/Application/Timeouts/NestedRunTimeoutTests.cs b/Tests/UnitTestsParallelizable/Application/Timeouts/NestedRunTimeoutTests.cs
index 091b12dee1..ac493ab74f 100644
--- a/Tests/UnitTestsParallelizable/Application/Timeouts/NestedRunTimeoutTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Timeouts/NestedRunTimeoutTests.cs
@@ -1,6 +1,3 @@
-using Xunit.Abstractions;
-using Xunit;
-
 namespace ApplicationTests.Timeout;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Application/Timeouts/TimeoutTests.cs b/Tests/UnitTestsParallelizable/Application/Timeouts/TimeoutTests.cs
index 4221597535..31b735f22a 100644
--- a/Tests/UnitTestsParallelizable/Application/Timeouts/TimeoutTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Timeouts/TimeoutTests.cs
@@ -1,4 +1,3 @@
-
 // ReSharper disable AccessToDisposedClosure
 #pragma warning disable xUnit1031
 
@@ -171,7 +170,8 @@ public void AddTimeout_From_Background_Thread_Fires ()
                                                           return false;
                                                       });
                                   });
-                  });
+                  },
+                  TestContext.Current.CancellationToken);
 
         // Use iteration counter for safety instead of time
         var iterations = 0;
@@ -182,7 +182,7 @@ public void AddTimeout_From_Background_Thread_Fires ()
             app.Run<Runnable> ();
 
             // Defensive: wait with timeout
-            Assert.True (taskCompleted.Wait (TimeSpan.FromSeconds (5)), "Timeout from background thread should have completed");
+            Assert.True (taskCompleted.Wait (TimeSpan.FromSeconds (5), TestContext.Current.CancellationToken), "Timeout from background thread should have completed");
             Assert.True (timeoutFired);
         }
         finally
@@ -774,7 +774,8 @@ public void TimedEvents_Timeouts_Property_Is_Thread_Safe ()
 
                                           tasksCompleted.Signal ();
                                       });
-                      });
+                      },
+                      TestContext.Current.CancellationToken);
         }
 
         // Use iteration counter to stop when all tasks complete
diff --git a/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs b/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs
index 1db3b0fb7c..d19be9a882 100644
--- a/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs
+++ b/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs
@@ -216,18 +216,20 @@ public void Scope_Concurrent_Additions ()
         for (int t = 0; t < threadCount; t++)
         {
             int threadId = t;
+
             tasks.Add (Task.Run (() =>
                                  {
-                                     for (int i = 0; i < itemsPerThread; i++)
+                                     for (var i = 0; i < itemsPerThread; i++)
                                      {
-                                         string key = $"Thread{threadId}_Item{i}";
+                                         var key = $"Thread{threadId}_Item{i}";
                                          scope.TryAdd (key, new ConfigProperty { PropertyValue = i });
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
diff --git a/Tests/UnitTestsParallelizable/Drawing/AlignerTests.cs b/Tests/UnitTestsParallelizable/Drawing/AlignerTests.cs
index 85e2fd0550..2fa2137fb0 100644
--- a/Tests/UnitTestsParallelizable/Drawing/AlignerTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/AlignerTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using System.Text.Json;
-using Xunit.Abstractions;
 
 namespace DrawingTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs
index 35622b3744..033bf2febd 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace DrawingTests.ColorTests;
+namespace DrawingTests.ColorTests;
 
 public class StandardColorNameResolverTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorsTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorsTests.cs
index dfea376539..4486ba6b54 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorsTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorsTests.cs
@@ -77,11 +77,11 @@ public void LazyInitialization_IsThreadSafe ()
                                       IReadOnlyList<string> names = StandardColors.GetColorNames ();
                                       Assert.NotNull (names);
                                       Assert.NotEmpty (names);
-                                  }
-                                 );
+                                  },
+                                  TestContext.Current.CancellationToken);
         }
 
-        Task.WaitAll (tasks);
+        Task.WaitAll (tasks, TestContext.Current.CancellationToken);
     }
 
     [Fact]
diff --git a/Tests/UnitTestsParallelizable/Drawing/Lines/LineCanvasTests.cs b/Tests/UnitTestsParallelizable/Drawing/Lines/LineCanvasTests.cs
index 00aaf3ee7f..3d5dff4558 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Lines/LineCanvasTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Lines/LineCanvasTests.cs
@@ -1,7 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
-
 namespace DrawingTests.Lines;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineExtensionsTests.cs b/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineExtensionsTests.cs
index af547954c4..b86f96e497 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineExtensionsTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineExtensionsTests.cs
@@ -1,6 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
-
 namespace DrawingTests.Lines;
 
 public class StraightLineExtensionsTests (ITestOutputHelper output)
diff --git a/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineTests.cs b/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineTests.cs
index 327c3f2321..439ef1932e 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Lines/StraightLineTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace DrawingTests.Lines;
+namespace DrawingTests.Lines;
 
 public class StraightLineTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTestsParallelizable/Drawing/Region/DrawOuterBoundaryTests.cs b/Tests/UnitTestsParallelizable/Drawing/Region/DrawOuterBoundaryTests.cs
index d399b2b2f8..43b60f4e25 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Region/DrawOuterBoundaryTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Region/DrawOuterBoundaryTests.cs
@@ -1,6 +1,4 @@
 using System.Collections.Concurrent;
-using Xunit.Abstractions;
-
 namespace DrawingTests.RegionTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Drawing/RulerTests.cs b/Tests/UnitTestsParallelizable/Drawing/RulerTests.cs
index 24e691ac43..88a3e6f880 100644
--- a/Tests/UnitTestsParallelizable/Drawing/RulerTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/RulerTests.cs
@@ -1,6 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.Utilities;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DrawingTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drawing/SchemeTests.ColorNoneDerivationTests.cs b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.ColorNoneDerivationTests.cs
index 664187c6a2..f4e27f9c53 100644
--- a/Tests/UnitTestsParallelizable/Drawing/SchemeTests.ColorNoneDerivationTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.ColorNoneDerivationTests.cs
@@ -2,7 +2,6 @@
 
 using System.Collections.Immutable;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DrawingTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drawing/ThicknessTests.cs b/Tests/UnitTestsParallelizable/Drawing/ThicknessTests.cs
index 2f144b4520..049f147181 100644
--- a/Tests/UnitTestsParallelizable/Drawing/ThicknessTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/ThicknessTests.cs
@@ -1,7 +1,5 @@
 using System.Text;
-using Terminal.Gui.Drivers;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DrawingTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/AllDriverTests.cs b/Tests/UnitTestsParallelizable/Drivers/AllDriverTests.cs
index 147a9cb0c5..ca5fa5ced7 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AllDriverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AllDriverTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DriverTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Ansi/AnsiInputOutputTests.cs b/Tests/UnitTestsParallelizable/Drivers/Ansi/AnsiInputOutputTests.cs
index 6b2882bf05..164993dc4b 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Ansi/AnsiInputOutputTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Ansi/AnsiInputOutputTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace DriverTests.AnsiDriver;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/AnsiDriver/AnsiDriverTests.cs b/Tests/UnitTestsParallelizable/Drivers/AnsiDriver/AnsiDriverTests.cs
index ced0e22b9a..71fbe52f2f 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AnsiDriver/AnsiDriverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AnsiDriver/AnsiDriverTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DriverTests.Ansi;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiKeyboardEncoderTests.cs b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiKeyboardEncoderTests.cs
index db28f194ac..2d6f115d45 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiKeyboardEncoderTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiKeyboardEncoderTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace DriverTests.AnsiHandling;
+namespace DriverTests.AnsiHandling;
 
 /// <summary>
 ///     Tests for <see cref="AnsiKeyboardEncoder"/> - verifies Key → ANSI sequence conversion.
diff --git a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiMouseParserDebugTests.cs b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiMouseParserDebugTests.cs
index 5364b5775e..104899fc07 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiMouseParserDebugTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiMouseParserDebugTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace DriverTests.AnsiHandling;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiResponseParserTests.cs b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiResponseParserTests.cs
index 24cbfa07b2..a49cddfcbc 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiResponseParserTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/AnsiResponseParserTests.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Text;
-using Xunit.Abstractions;
 
 namespace DriverTests.AnsiHandling;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/UrlHyperlinkerTests.cs b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/UrlHyperlinkerTests.cs
index ce1355ae03..8c05a959ec 100644
--- a/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/UrlHyperlinkerTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/AnsiHandling/UrlHyperlinkerTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System.Text;
-using Xunit.Abstractions;
 
 namespace DriverTests.AnsiHandling;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Dotnet/NetInputOutputTests.cs b/Tests/UnitTestsParallelizable/Drivers/Dotnet/NetInputOutputTests.cs
index 9eaf9a4da8..8c8c74a887 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Dotnet/NetInputOutputTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Dotnet/NetInputOutputTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System.Collections.Concurrent;
-using Xunit.Abstractions;
 
 namespace DriverTests.DotnetDriver;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Keyboard/KeyCodeTests.cs b/Tests/UnitTestsParallelizable/Drivers/Keyboard/KeyCodeTests.cs
index f35f7f37e4..781fdff581 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Keyboard/KeyCodeTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Keyboard/KeyCodeTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace DriverTests.Keyboard;
+namespace DriverTests.Keyboard;
 
 [Collection ("Driver Tests")]
 public class KeyCodeTests
diff --git a/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseButtonClickTrackerTests.cs b/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseButtonClickTrackerTests.cs
index 67c3c37bdc..3466cc75d9 100644
--- a/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseButtonClickTrackerTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseButtonClickTrackerTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-// ReSharper disable AccessToModifiedClosure
+// ReSharper disable AccessToModifiedClosure
 // ReSharper disable InconsistentNaming
 
 namespace DriverTests.MouseTests;
diff --git a/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseInterpreterExtendedTests.cs b/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseInterpreterExtendedTests.cs
index 6528f13eaa..728f82a506 100644
--- a/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseInterpreterExtendedTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/MouseTests/MouseInterpreterExtendedTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-// ReSharper disable AccessToModifiedClosure
+// ReSharper disable AccessToModifiedClosure
 #pragma warning disable CS9113 // Parameter is unread
 
 namespace DriverTests.MouseTests;
diff --git a/Tests/UnitTestsParallelizable/Drivers/Output/AddRuneTests.cs b/Tests/UnitTestsParallelizable/Drivers/Output/AddRuneTests.cs
index 7097d31d68..d01bd421f5 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Output/AddRuneTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Output/AddRuneTests.cs
@@ -1,7 +1,6 @@
 using System.Buffers;
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DriverTests.Output;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Output/ClipRegionTests.cs b/Tests/UnitTestsParallelizable/Drivers/Output/ClipRegionTests.cs
index 163d25da79..2d21e4162c 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Output/ClipRegionTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Output/ClipRegionTests.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace DriverTests.Output;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Output/ContentsTests.cs b/Tests/UnitTestsParallelizable/Drivers/Output/ContentsTests.cs
index 71ef536770..b9a2d2638b 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Output/ContentsTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Output/ContentsTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/PlatformDetectionTests.cs b/Tests/UnitTestsParallelizable/Drivers/PlatformDetectionTests.cs
index ec4866d449..34f64ba143 100644
--- a/Tests/UnitTestsParallelizable/Drivers/PlatformDetectionTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/PlatformDetectionTests.cs
@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using Xunit.Abstractions;
 
 namespace DriverTests;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Unix/UnixInputOutputTests.cs b/Tests/UnitTestsParallelizable/Drivers/Unix/UnixInputOutputTests.cs
index 4ee3e0a749..f3de24895d 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Unix/UnixInputOutputTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Unix/UnixInputOutputTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace DriverTests.UnixDriver;
 
diff --git a/Tests/UnitTestsParallelizable/Drivers/Windows/WindowsInputOutputTests.cs b/Tests/UnitTestsParallelizable/Drivers/Windows/WindowsInputOutputTests.cs
index 8192064493..6fb72c464b 100644
--- a/Tests/UnitTestsParallelizable/Drivers/Windows/WindowsInputOutputTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/Windows/WindowsInputOutputTests.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Xunit.Abstractions;
 
 namespace DriverTests.WindowsDriver;
 
diff --git a/Tests/UnitTestsParallelizable/Input/InjectMouseEventTests.cs b/Tests/UnitTestsParallelizable/Input/InjectMouseEventTests.cs
index 12765afdf4..028c38bd59 100644
--- a/Tests/UnitTestsParallelizable/Input/InjectMouseEventTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/InjectMouseEventTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using Xunit.Abstractions;
 
 namespace DriverTests.MouseTests;
 
diff --git a/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs b/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs
index e0bb280956..38e735e4eb 100644
--- a/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs
@@ -104,7 +104,8 @@ public void GetAllFromCommands_DuringModification_NoExceptions ()
                                                   // Expected
                                               }
                                           }
-                                      });
+                                      },
+                                      TestContext.Current.CancellationToken);
 
         // Act - Reader threads
         List<Task> readerTasks = new ();
@@ -128,13 +129,14 @@ public void GetAllFromCommands_DuringModification_NoExceptions ()
 
                                                Thread.Sleep (1); // Small delay between iterations
                                            }
-                                       }));
+                                       },
+                                       TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (readerTasks.ToArray ());
+        Task.WaitAll (readerTasks.ToArray (), TestContext.Current.CancellationToken);
         continueRunning = false;
-        modifierTask.Wait (TimeSpan.FromSeconds (5)); // Add timeout to prevent indefinite hang
+        modifierTask.Wait (TimeSpan.FromSeconds (5), TestContext.Current.CancellationToken); // Add timeout to prevent indefinite hang
 #pragma warning restore xUnit1031
 
         // Assert
@@ -183,7 +185,8 @@ public void GetBindings_DuringConcurrentModification_NoExceptions ()
 
                                               Thread.Sleep (1); // Small delay to prevent CPU spinning
                                           }
-                                      });
+                                      },
+                                      TestContext.Current.CancellationToken);
 
         // Act - Start reader threads
         List<Task> readerTasks = new ();
@@ -212,14 +215,15 @@ public void GetBindings_DuringConcurrentModification_NoExceptions ()
 
                                                Thread.Sleep (1); // Small delay between iterations
                                            }
-                                       }));
+                                       },
+                                       TestContext.Current.CancellationToken));
         }
 
         // Wait for readers to complete
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (readerTasks.ToArray ());
+        Task.WaitAll (readerTasks.ToArray (), TestContext.Current.CancellationToken);
         continueRunning = false;
-        modifierTask.Wait (TimeSpan.FromSeconds (5)); // Add timeout to prevent indefinite hang
+        modifierTask.Wait (TimeSpan.FromSeconds (5), TestContext.Current.CancellationToken); // Add timeout to prevent indefinite hang
 #pragma warning restore xUnit1031
 
         // Assert
@@ -265,11 +269,12 @@ public void KeyBindings_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -313,7 +318,8 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
         // Reader threads
@@ -334,7 +340,8 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
         // Remover threads
@@ -355,11 +362,12 @@ public void MixedOperations_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
@@ -405,11 +413,12 @@ public void MouseBindings_ConcurrentAccess_NoExceptions ()
                                              exceptions.Add (ex);
                                          }
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Assert
diff --git a/Tests/UnitTestsParallelizable/Input/InputInjectorTests.cs b/Tests/UnitTestsParallelizable/Input/InputInjectorTests.cs
index b6e317f3cb..243b109c50 100644
--- a/Tests/UnitTestsParallelizable/Input/InputInjectorTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/InputInjectorTests.cs
@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using DriverTests.Input;
-using Xunit.Abstractions;
 
 namespace InputTests;
 
@@ -183,7 +182,7 @@ public async Task InjectKey_Pipeline_AccentedKeys_RaisesAllEvents ()
         injector.InjectKey (new Key ('Õ'), options);
 
         // BUGBUG: This is a hack; we need to figure out how to enable this without delay
-        await Task.Delay (50); // Allow some time for processing
+        await Task.Delay (50, TestContext.Current.CancellationToken); // Allow some time for processing
         injector.ProcessQueue ();
 
         // Assert - Should raise exactly 3 KeyDown events
@@ -252,7 +251,7 @@ public async Task InjectKey_PipelineMode_MultipleKeys_RaisesAllEvents ()
         injector.InjectKey (Key.C, options);
 
         // BUGBUG: This is a hack; we need to figure out how to enable this without delay
-        await Task.Delay (50); // Allow some time for processing
+        await Task.Delay (50, TestContext.Current.CancellationToken); // Allow some time for processing
         injector.ProcessQueue ();
 
         // Assert - Should raise exactly 3 KeyDown events
diff --git a/Tests/UnitTestsParallelizable/Input/InputProcessorImplTests.cs b/Tests/UnitTestsParallelizable/Input/InputProcessorImplTests.cs
index 101c7beb04..0b4b54f324 100644
--- a/Tests/UnitTestsParallelizable/Input/InputProcessorImplTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/InputProcessorImplTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using Xunit.Abstractions;
 
 // ReSharper disable AccessToModifiedClosure
 #pragma warning disable CS9113 // Parameter is unread
@@ -36,7 +35,7 @@ public async Task ProcessQueue_ReleasesStaleEscapeSequences_AfterTimeout ()
         Assert.Empty (receivedKeys); // Should be held by parser
 
         // Wait for timeout (50ms + buffer)
-        await Task.Delay (100);
+        await Task.Delay (100, TestContext.Current.CancellationToken);
 
         // Process again - should release stale ESC
         processor.ProcessQueue ();
@@ -64,7 +63,7 @@ public async Task ProcessQueue_DoesNotReleaseEscape_BeforeTimeout ()
         processor.ProcessQueue ();
 
         // Wait less than timeout (20ms)
-        await Task.Delay (5);
+        await Task.Delay (5, TestContext.Current.CancellationToken);
 
         // Process again - should still be held
         processor.ProcessQueue ();
@@ -293,7 +292,7 @@ public async Task ProcessQueue_ParserInNormalState_DoesNotReleaseKeys ()
         processor.ProcessQueue ();
 
         // Wait past timeout
-        await Task.Delay (100);
+        await Task.Delay (100, TestContext.Current.CancellationToken);
         processor.ProcessQueue ();
 
         // Assert - Should only process the one key from queue, no releases from parser
diff --git a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
index a532814e21..96f28bfb0e 100644
--- a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Xunit.Abstractions;
 
 namespace InputTests;
 
diff --git a/Tests/UnitTestsParallelizable/README.md b/Tests/UnitTestsParallelizable/README.md
index e3e2818b96..e94f2925ad 100644
--- a/Tests/UnitTestsParallelizable/README.md
+++ b/Tests/UnitTestsParallelizable/README.md
@@ -90,7 +90,7 @@ public void Focus_Test ()
 Tests in this project run in parallel automatically. To run them:
 
 ```bash
-dotnet test Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj
+dotnet test --project Tests/UnitTestsParallelizable
 ```
 
 ## See Also
diff --git a/Tests/UnitTestsParallelizable/Resources/ResourceManagerTests.cs b/Tests/UnitTestsParallelizable/Resources/ResourceManagerTests.cs
index 28829ea70d..f64242b5fb 100644
--- a/Tests/UnitTestsParallelizable/Resources/ResourceManagerTests.cs
+++ b/Tests/UnitTestsParallelizable/Resources/ResourceManagerTests.cs
@@ -112,9 +112,11 @@ public void Strings_Always_FallBack_To_Default_For_No_Existent_Culture_File ()
         CultureInfo.CurrentCulture = new (NO_EXISTENT_CULTURE);
         CultureInfo.CurrentUICulture = new (NO_EXISTENT_CULTURE);
 
-        Assert.Equal (NO_TRANSLATED_VALUE, _stringsNoTranslatedKey);
-
+        Assert.Equal (NO_TRANSLATED_VALUE, GlobalResources.GetString (NO_TRANSLATED_KEY, CultureInfo.CurrentCulture));
+        
         ResetCultureInfo ();
+
+        Assert.Equal (NO_TRANSLATED_VALUE, _stringsNoTranslatedKey);
     }
 
     [Fact]
diff --git a/Tests/UnitTestsParallelizable/TestDateAttribute.cs b/Tests/UnitTestsParallelizable/TestDateAttribute.cs
index 32cc41f65f..b5a897909d 100644
--- a/Tests/UnitTestsParallelizable/TestDateAttribute.cs
+++ b/Tests/UnitTestsParallelizable/TestDateAttribute.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 using System.Reflection;
-using Xunit.Sdk;
+using Xunit.v3;
 
 namespace UnitTests_Parallelizable;
 
@@ -10,11 +10,15 @@ public class TestDateAttribute : BeforeAfterTestAttribute
     public TestDateAttribute () => CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
     private readonly CultureInfo _currentCulture = CultureInfo.CurrentCulture;
 
-    public override void After (MethodInfo methodUnderTest)
+    public override void After (MethodInfo methodUnderTest, IXunitTest test)
     {
         CultureInfo.CurrentCulture = _currentCulture;
         Assert.Equal (CultureInfo.CurrentCulture, _currentCulture);
     }
 
-    public override void Before (MethodInfo methodUnderTest) => Assert.Equal (CultureInfo.CurrentCulture, CultureInfo.InvariantCulture);
+    public override void Before (MethodInfo methodUnderTest, IXunitTest test)
+    {
+        CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+        Assert.Equal (CultureInfo.CurrentCulture, CultureInfo.InvariantCulture);
+    }
 }
diff --git a/Tests/UnitTestsParallelizable/Testing/TestLogging.cs b/Tests/UnitTestsParallelizable/Testing/TestLogging.cs
index d002e8a753..ece8bac5ab 100644
--- a/Tests/UnitTestsParallelizable/Testing/TestLogging.cs
+++ b/Tests/UnitTestsParallelizable/Testing/TestLogging.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace Terminal.Gui.Tests;
 
diff --git a/Tests/UnitTestsParallelizable/Text/AutocompleteTests.cs b/Tests/UnitTestsParallelizable/Text/AutocompleteTests.cs
index 3ac7231abf..417897d7b9 100644
--- a/Tests/UnitTestsParallelizable/Text/AutocompleteTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/AutocompleteTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace TextTests;
 
diff --git a/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs b/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
index f998f9ba87..230c69f86d 100644
--- a/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using Moq;
-using Xunit.Abstractions;
 
 namespace TextTests;
 
@@ -470,8 +469,7 @@ public void ThreadSafety_ConcurrentCollectionModification ()
         // Reader tasks
         for (var i = 0; i < numReaders; i++)
         {
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      try
                                      {
@@ -485,7 +483,8 @@ public void ThreadSafety_ConcurrentCollectionModification ()
                                      {
                                          exceptions.Add (ex);
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
         // Writer tasks (change Collection reference)
@@ -493,8 +492,7 @@ public void ThreadSafety_ConcurrentCollectionModification ()
         {
             int writerIndex = i;
 
-            tasks.Add (
-                       Task.Run (() =>
+            tasks.Add (Task.Run (() =>
                                  {
                                      try
                                      {
@@ -509,11 +507,12 @@ public void ThreadSafety_ConcurrentCollectionModification ()
                                      {
                                          exceptions.Add (ex);
                                      }
-                                 }));
+                                 },
+                                 TestContext.Current.CancellationToken));
         }
 
 #pragma warning disable xUnit1031
-        Task.WaitAll (tasks.ToArray ());
+        Task.WaitAll (tasks.ToArray (), TestContext.Current.CancellationToken);
 #pragma warning restore xUnit1031
 
         // Allow some exceptions due to collection being swapped during access
diff --git a/Tests/UnitTestsParallelizable/Text/TextFormatterDrawTests.cs b/Tests/UnitTestsParallelizable/Text/TextFormatterDrawTests.cs
index f415f996bd..cc002bda95 100644
--- a/Tests/UnitTestsParallelizable/Text/TextFormatterDrawTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/TextFormatterDrawTests.cs
@@ -2,7 +2,6 @@
 using System.Text;
 using UICatalog;
 using UnitTests;
-using Xunit.Abstractions;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/Tests/UnitTestsParallelizable/Text/TextFormatterJustificationTests.cs b/Tests/UnitTestsParallelizable/Text/TextFormatterJustificationTests.cs
index f26e7be66c..f662a94080 100644
--- a/Tests/UnitTestsParallelizable/Text/TextFormatterJustificationTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/TextFormatterJustificationTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/Tests/UnitTestsParallelizable/Text/TextFormatterTests.cs b/Tests/UnitTestsParallelizable/Text/TextFormatterTests.cs
index 9c82ee213b..6474947b4c 100644
--- a/Tests/UnitTestsParallelizable/Text/TextFormatterTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/TextFormatterTests.cs
@@ -1,7 +1,6 @@
 #nullable disable
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace TextTests;
 
diff --git a/Tests/UnitTestsParallelizable/Time/VirtualTimeProviderTests.cs b/Tests/UnitTestsParallelizable/Time/VirtualTimeProviderTests.cs
index d9bb5c99ac..46b96f6626 100644
--- a/Tests/UnitTestsParallelizable/Time/VirtualTimeProviderTests.cs
+++ b/Tests/UnitTestsParallelizable/Time/VirtualTimeProviderTests.cs
@@ -58,7 +58,7 @@ public async Task VirtualTimeProvider_Delay_CompletesAfterAdvance ()
         // Copilot - Test that delays complete when time is advanced past their completion time
         VirtualTimeProvider timeProvider = new ();
 
-        Task delayTask = timeProvider.Delay (TimeSpan.FromSeconds (5));
+        Task delayTask = timeProvider.Delay (TimeSpan.FromSeconds (5), TestContext.Current.CancellationToken);
 
         // Delay should not be completed yet
         Assert.False (delayTask.IsCompleted);
diff --git a/Tests/UnitTestsParallelizable/Tracing/ThreadSafeTraceTests.cs b/Tests/UnitTestsParallelizable/Tracing/ThreadSafeTraceTests.cs
index e31a0dec51..fa0ab22014 100644
--- a/Tests/UnitTestsParallelizable/Tracing/ThreadSafeTraceTests.cs
+++ b/Tests/UnitTestsParallelizable/Tracing/ThreadSafeTraceTests.cs
@@ -2,7 +2,6 @@
 
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 #pragma warning disable xUnit1031
 
 namespace ApplicationTests;
@@ -205,12 +204,12 @@ public async Task ParallelTests_IsolatedTracing_Test1 ()
             using (Trace.PushScope (TraceCategory.Command, backend))
             {
                 // Simulate some async work
-                await Task.Delay (10);
+                await Task.Delay (10, TestContext.Current.CancellationToken);
 
                 View view = new () { Id = "parallel-test-1" };
                 Trace.Command (view, Command.Accept, CommandRouting.Direct, "Test1");
 
-                await Task.Delay (10);
+                await Task.Delay (10, TestContext.Current.CancellationToken);
 
 #if DEBUG
                 // This test should only see its own traces
@@ -238,12 +237,12 @@ public async Task ParallelTests_IsolatedTracing_Test2 ()
             using (Trace.PushScope (TraceCategory.Mouse, backend))
             {
                 // Simulate some async work
-                await Task.Delay (10);
+                await Task.Delay (10, TestContext.Current.CancellationToken);
 
                 View view = new () { Id = "parallel-test-2" };
                 Trace.Mouse (view, MouseFlags.LeftButtonClicked, Point.Empty, "Test2");
 
-                await Task.Delay (10);
+                await Task.Delay (10, TestContext.Current.CancellationToken);
 
 #if DEBUG
                 // This test should only see its own traces
@@ -273,15 +272,16 @@ public void EnabledCategories_IsAsyncLocal_IsolatesAcrossExecutionContexts ()
 
             // Task.Run flows ExecutionContext by default, so the async-local value is visible in the task.
             // The key isolation behavior is that changes in the task don't affect the parent context.
-            Task.Run (
-                      () =>
+            Task.Run (() =>
                       {
                           // Task sees parent's value due to ExecutionContext flow
                           capturedCategories = Trace.EnabledCategories;
 
                           // Set different categories in task context
                           Trace.EnabledCategories = TraceCategory.Mouse;
-                      }).Wait ();
+                      },
+                      TestContext.Current.CancellationToken)
+                .Wait (TestContext.Current.CancellationToken);
 
             // Parent context is unchanged despite modifications in the task
             Assert.True (Trace.EnabledCategories.HasFlag (TraceCategory.Command));
@@ -305,14 +305,15 @@ public void Backend_IsAsyncLocal_IsolatedPerExecutionContext ()
             ITraceBackend? capturedBackend = null;
 
             // Use Task.Run which may or may not flow ExecutionContext
-            Task.Run (
-                      () =>
+            Task.Run (() =>
                       {
                           capturedBackend = Trace.Backend;
 
                           // Set different backend in this context
                           Trace.Backend = new ListBackend ();
-                      }).Wait ();
+                      },
+                      TestContext.Current.CancellationToken)
+                .Wait (TestContext.Current.CancellationToken);
 
             // Main thread backend should be unchanged
             Assert.Same (mainBackend, Trace.Backend);
@@ -335,7 +336,7 @@ public async Task AsyncLocal_FlowsAcrossAwait ()
                 Assert.True (Trace.EnabledCategories.HasFlag (TraceCategory.Command));
 
                 // EnabledCategories should flow across await
-                await Task.Delay (1);
+                await Task.Delay (1, TestContext.Current.CancellationToken);
 
                 Assert.True (Trace.EnabledCategories.HasFlag (TraceCategory.Command));
                 Assert.Same (backend, Trace.Backend);
diff --git a/Tests/UnitTestsParallelizable/Tracing/TraceTests.cs b/Tests/UnitTestsParallelizable/Tracing/TraceTests.cs
index ac5025711e..21cd196a8d 100644
--- a/Tests/UnitTestsParallelizable/Tracing/TraceTests.cs
+++ b/Tests/UnitTestsParallelizable/Tracing/TraceTests.cs
@@ -4,7 +4,6 @@
 using System.Text.Json.Serialization;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ApplicationTests;
 
@@ -487,8 +486,7 @@ public void EnabledCategories_FlagsAPI ()
     public async Task Concurrent_Tests_Are_Isolated ()
     {
         // Run multiple tasks concurrently, each with different trace settings
-        Task task1 = Task.Run (
-                               async () =>
+        Task task1 = Task.Run (async () =>
                                {
                                    using (Trace.PushScope (TraceCategory.Command))
                                    {
@@ -497,10 +495,10 @@ public async Task Concurrent_Tests_Are_Isolated ()
                                        Assert.False (Trace.EnabledCategories.HasFlag (TraceCategory.Mouse));
                                        await Task.Delay (10);
                                    }
-                               });
+                               },
+                               TestContext.Current.CancellationToken);
 
-        Task task2 = Task.Run (
-                               async () =>
+        Task task2 = Task.Run (async () =>
                                {
                                    using (Trace.PushScope (TraceCategory.Mouse))
                                    {
@@ -509,10 +507,10 @@ public async Task Concurrent_Tests_Are_Isolated ()
                                        Assert.True (Trace.EnabledCategories.HasFlag (TraceCategory.Mouse));
                                        await Task.Delay (10);
                                    }
-                               });
+                               },
+                               TestContext.Current.CancellationToken);
 
-        Task task3 = Task.Run (
-                               async () =>
+        Task task3 = Task.Run (async () =>
                                {
                                    using (Trace.PushScope (TraceCategory.None))
                                    {
@@ -521,7 +519,8 @@ public async Task Concurrent_Tests_Are_Isolated ()
                                        Assert.False (Trace.EnabledCategories.HasFlag (TraceCategory.Mouse));
                                        await Task.Delay (10);
                                    }
-                               });
+                               },
+                               TestContext.Current.CancellationToken);
 
         // Wait for all tasks - they should all succeed without interfering
         await Task.WhenAll (task1, task2, task3);
diff --git a/Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj b/Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj
index 37906dc42a..6b71159e90 100644
--- a/Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj
+++ b/Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj
@@ -9,6 +9,9 @@
     <InformationalVersion>2.0</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup>
+	  <OutputType>Exe</OutputType>
+	  <UseAppHost>true</UseAppHost>
+	  <IsTestProject>true</IsTestProject>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <UseDataCollector />
@@ -35,16 +38,13 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
     <PackageReference Include="ReportGenerator" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="Xunit.Combinatorial" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -55,7 +55,7 @@
     <ProjectReference Include="..\..\Examples\UICatalog\UICatalog.csproj" />
     <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj">
     </ProjectReference>
-    <ProjectReference Include="..\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
+    <ProjectReference Include="..\AppTestHelpers\AppTestHelpers.csproj" />
     <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/AdornmentSubViewTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/AdornmentSubViewTests.cs
index fac958e422..ee64ff6a1f 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/AdornmentSubViewTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/AdornmentSubViewTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Adornments;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/BorderArrangementTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/BorderArrangementTests.cs
index de162b65bf..1452ed58dc 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/BorderArrangementTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/BorderArrangementTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Adornments;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/MarginTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/MarginTests.cs
index 844755ccd1..dcdf34c3dd 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/MarginTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/MarginTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Adornments;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs
index 99bccdf76a..1f58be4a26 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Adornments;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ToScreenTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ToScreenTests.cs
index e3601920f0..37a0bfd198 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ToScreenTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ToScreenTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ViewBaseTests;
+namespace ViewBaseTests;
 
 /// <summary>
 /// Test the <see cref="Adornment.FrameToScreen"/> and <see cref="View.ViewportToScreen"/> methods.
diff --git a/Tests/UnitTestsParallelizable/ViewBase/ArrangementTests.cs b/Tests/UnitTestsParallelizable/ViewBase/ArrangementTests.cs
index 24945c1362..277a9235d6 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/ArrangementTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/ArrangementTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ViewBaseTests.Adornments;
+namespace ViewBaseTests.Adornments;
 
 
 public class ArrangementTests (ITestOutputHelper output)
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Draw/ClearViewportTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Draw/ClearViewportTests.cs
index 2173e5d42c..032a1ddff8 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Draw/ClearViewportTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Draw/ClearViewportTests.cs
@@ -1,6 +1,5 @@
 using Moq;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Viewport;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawTextAndLineCanvasTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawTextAndLineCanvasTests.cs
index af68f8b8b4..044d77911b 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawTextAndLineCanvasTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawTextAndLineCanvasTests.cs
@@ -1,6 +1,4 @@
-using System.Text;
-using UnitTests;
-using Xunit.Abstractions;
+using UnitTests;
 
 namespace ViewBaseTests.Drawing;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingClippingTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingClippingTests.cs
index dbd0f33b05..8f32819348 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingClippingTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingClippingTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Drawing;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingFlowTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingFlowTests.cs
index fd36f906b6..ed2bae001c 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingFlowTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Draw/ViewDrawingFlowTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Drawing;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/InitTests.cs b/Tests/UnitTestsParallelizable/ViewBase/InitTests.cs
index fc2e48fadc..4fbae5b627 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/InitTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/InitTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ViewBaseTests;
+namespace ViewBaseTests;
 
 /// <summary>Tests View BeginInit/EndInit/Initialized functionality.</summary>
 public class InitTests
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/AutoHotKeyAssignmentTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/AutoHotKeyAssignmentTests.cs
index 7cded6210c..35d7b685aa 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/AutoHotKeyAssignmentTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/AutoHotKeyAssignmentTests.cs
@@ -1,3 +1,5 @@
+using System.Globalization;
+
 namespace ViewBaseTests.Keyboard;
 
 /// <summary>
@@ -251,6 +253,8 @@ public void AssignHotKeysToSubViews_SkipsViewsWithEmptyTitle ()
     [Fact]
     public void AssignHotKeys_HandlesConflictingExistingHotKey ()
     {
+        Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; // Ensure consistent test results
+
         View superView = new () { AssignHotKeys = true };
 
         View button1 = new () { Title = Strings.cmdSave }; // Uses 'S'
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyboardEventTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyboardEventTests.cs
index ccc745c0ec..5e474a576f 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyboardEventTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyboardEventTests.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using UnitTests;
-using Xunit.Abstractions;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/ContentSizeTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/ContentSizeTests.cs
index 75201552b1..07782c6a15 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/ContentSizeTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/ContentSizeTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ViewBaseTests.Layout;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.AutoTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.AutoTests.cs
index 322d77cb6c..ab7c44318a 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.AutoTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.AutoTests.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Xunit.Abstractions;
 using static Terminal.Gui.ViewBase.Dim;
 
 namespace ViewBaseTests.Layout;
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.CombineTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.CombineTests.cs
index 9671b8f402..8790ff2bd1 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.CombineTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.CombineTests.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Layout;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FillTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FillTests.cs
index 6d804e34f3..cd7a5c5fc6 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FillTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FillTests.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Layout;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FuncTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FuncTests.cs
index e8ff416d3f..18d1b21e60 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FuncTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Dim.FuncTests.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using Xunit.Abstractions;
 using static Terminal.Gui.ViewBase.Dim;
 
 namespace ViewBaseTests.Layout;
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.AbsoluteTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.AbsoluteTests.cs
index 318a144085..dc1e488c23 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.AbsoluteTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.AbsoluteTests.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Layout;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CenterTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CenterTests.cs
index 711ca078e0..6662d85f02 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CenterTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CenterTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 using static Terminal.Gui.ViewBase.Pos;
 
 namespace ViewBaseTests.Layout;
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CombineTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CombineTests.cs
index 10747422c8..66511093b9 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CombineTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.CombineTests.cs
@@ -1,6 +1,5 @@
 #nullable disable
 
-using Xunit.Abstractions;
 using static Terminal.Gui.ViewBase.Dim;
 using static Terminal.Gui.ViewBase.Pos;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.FuncTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.FuncTests.cs
index 082deac75f..d07cc5adf3 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.FuncTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.FuncTests.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Layout;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.PercentTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.PercentTests.cs
index c3528ed9e9..9c93e012b3 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.PercentTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/Pos.PercentTests.cs
@@ -1,5 +1,4 @@
-using Xunit.Abstractions;
-using static Terminal.Gui.ViewBase.Pos;
+using static Terminal.Gui.ViewBase.Pos;
 
 namespace ViewBaseTests.Layout;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/TopologicalSortTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/TopologicalSortTests.cs
index edae0dde78..a040a05d52 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/TopologicalSortTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/TopologicalSortTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ViewBaseTests.Layout;
+namespace ViewBaseTests.Layout;
 
 public class TopologicalSortTests (ITestOutputHelper output)
 {
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Layout/ViewportTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Layout/ViewportTests.cs
index 0b0e4c0ab2..b74a3ccf98 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Layout/ViewportTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Layout/ViewportTests.cs
@@ -1,6 +1,4 @@
-using Xunit.Abstractions;
-
-namespace ViewBaseTests.Viewport;
+namespace ViewBaseTests.Viewport;
 
 /// <summary>
 ///     Test the <see cref="View.Viewport"/>.
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/DefaultActivationTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/DefaultActivationTests.cs
index 6ac5a46357..2e5141d466 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/DefaultActivationTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/DefaultActivationTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ViewBaseTests.MouseTests;
 
 // Claude - Opus 4.5
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/HighlightStatesTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/HighlightStatesTests.cs
index 320d17b20d..1f82aaf054 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/HighlightStatesTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/HighlightStatesTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.MouseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
index 050f03bc81..d8b3480163 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
@@ -1,5 +1,4 @@
 using Terminal.Gui.App;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.MouseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseHoldRepeatTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseHoldRepeatTests.cs
index 2dcc7272a4..203a55a9f7 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseHoldRepeatTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseHoldRepeatTests.cs
@@ -1,5 +1,4 @@
-using Xunit.Abstractions;
-using Timeout = Terminal.Gui.App.Timeout;
+using Timeout = Terminal.Gui.App.Timeout;
 
 namespace ViewBaseTests.MouseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseReleasedBindingTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseReleasedBindingTests.cs
index ad75c62699..1f172b3141 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseReleasedBindingTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseReleasedBindingTests.cs
@@ -1,5 +1,3 @@
-using Xunit.Abstractions;
-
 namespace ViewBaseTests.MouseTests;
 
 // Claude - Opus 4.5
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
index a93e90ba5f..3dadd6b55f 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.MouseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Navigation/AllViewsNavigationTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Navigation/AllViewsNavigationTests.cs
index 183bc70e7a..9c30a9b6a6 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Navigation/AllViewsNavigationTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Navigation/AllViewsNavigationTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Navigation;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Navigation/RestoreFocusTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Navigation/RestoreFocusTests.cs
index 0887c9e47e..1f149f3b0c 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Navigation/RestoreFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Navigation/RestoreFocusTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Navigation;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Navigation/VisibleTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Navigation/VisibleTests.cs
index 4e2fa13648..aa90888807 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Navigation/VisibleTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Navigation/VisibleTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/TextTests.cs b/Tests/UnitTestsParallelizable/ViewBase/TextTests.cs
index 90c01d7a54..3174404ea1 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/TextTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/TextTests.cs
@@ -1,6 +1,5 @@
 using System.Runtime.CompilerServices;
 using System.Text;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests;
 
diff --git a/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs b/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
index 01c6a88475..4730e1d96a 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ViewBaseTests.Commands;
 
diff --git a/Tests/UnitTestsParallelizable/Views/AllViewsDrawTests.cs b/Tests/UnitTestsParallelizable/Views/AllViewsDrawTests.cs
index c8957c5142..ee83aa547b 100644
--- a/Tests/UnitTestsParallelizable/Views/AllViewsDrawTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/AllViewsDrawTests.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
index 99d3b5e0b3..403bbbbe03 100644
--- a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System.Reflection;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/DialogTests.cs b/Tests/UnitTestsParallelizable/Views/DialogTests.cs
index 5c631334b4..5c64f21083 100644
--- a/Tests/UnitTestsParallelizable/Views/DialogTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/DialogTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/IListDataSourceTests.cs b/Tests/UnitTestsParallelizable/Views/IListDataSourceTests.cs
index ce79cd69e2..a2a0c5f9ab 100644
--- a/Tests/UnitTestsParallelizable/Views/IListDataSourceTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/IListDataSourceTests.cs
@@ -3,7 +3,6 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Text;
-using Xunit.Abstractions;
 
 // ReSharper disable InconsistentNaming
 
diff --git a/Tests/UnitTestsParallelizable/Views/LabelTests.cs b/Tests/UnitTestsParallelizable/Views/LabelTests.cs
index 9632de1829..fa702159f4 100644
--- a/Tests/UnitTestsParallelizable/Views/LabelTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/LabelTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/ListViewTests.cs b/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
index 549d7188e0..c9e5d4374c 100644
--- a/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using Moq;
 using UnitTests;
-using Xunit.Abstractions;
 
 // ReSharper disable AccessToModifiedClosure
 
@@ -1240,7 +1239,7 @@ public void SourceChanged_Event_Not_Raised_IfSetSourceWithSameSource (Observable
         Assert.Equal (0, changed);
     }
 
-    public static TheoryData<ObservableCollection<string>?> GetSources () => [null, [], ["Item1", "Item2"]];
+    public static TheoryData<ObservableCollection<string>?> GetSources () => new (null, [], ["Item1", "Item2"]);
 
     [Fact]
     public void CollectionChanged_Event ()
diff --git a/Tests/UnitTestsParallelizable/Views/MenuBarShowItemTests.cs b/Tests/UnitTestsParallelizable/Views/MenuBarShowItemTests.cs
index 877eccdbfb..20c7473760 100644
--- a/Tests/UnitTestsParallelizable/Views/MenuBarShowItemTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MenuBarShowItemTests.cs
@@ -1,7 +1,5 @@
 // Claude - Opus 4.5
 
-using Xunit.Abstractions;
-
 namespace ViewsTests;
 
 /// <summary>
diff --git a/Tests/UnitTestsParallelizable/Views/MenuBarTests.cs b/Tests/UnitTestsParallelizable/Views/MenuBarTests.cs
index 61ae994ab1..bb71ca3a56 100644
--- a/Tests/UnitTestsParallelizable/Views/MenuBarTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MenuBarTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/MenuItemTests.cs b/Tests/UnitTestsParallelizable/Views/MenuItemTests.cs
index 0eb5f037a3..16947196ca 100644
--- a/Tests/UnitTestsParallelizable/Views/MenuItemTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MenuItemTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/MenuTests.cs b/Tests/UnitTestsParallelizable/Views/MenuTests.cs
index 0ad0f7936e..5e4c4c259a 100644
--- a/Tests/UnitTestsParallelizable/Views/MenuTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MenuTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/PopoverMenuTests.cs b/Tests/UnitTestsParallelizable/Views/PopoverMenuTests.cs
index 1501f23880..6c254cdabf 100644
--- a/Tests/UnitTestsParallelizable/Views/PopoverMenuTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/PopoverMenuTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui.Tests;
 using Terminal.Gui.Tracing;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs b/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
index 074747a60a..be93f43740 100644
--- a/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
index 76a48d53f0..c2bc2486ca 100644
--- a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
@@ -1,7 +1,5 @@
 using System.Text;
 using JetBrains.Annotations;
-using Terminal.Gui.Tests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs b/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
index 51c45c05cd..26f7520232 100644
--- a/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/TextModelTests.cs b/Tests/UnitTestsParallelizable/Views/TextModelTests.cs
index f24b27ed07..6d7dce91df 100644
--- a/Tests/UnitTestsParallelizable/Views/TextModelTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextModelTests.cs
@@ -1,6 +1,5 @@
 // CoPilot - Claude 3.5 Sonnet
 using System.Text;
-using Xunit.Abstractions;
 
 namespace TextTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/TextView.AutocompleteTests.cs b/Tests/UnitTestsParallelizable/Views/TextView.AutocompleteTests.cs
index 39aa7e9357..a0aae1fc26 100644
--- a/Tests/UnitTestsParallelizable/Views/TextView.AutocompleteTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextView.AutocompleteTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests.TextViewTests;
 
diff --git a/Tests/UnitTestsParallelizable/Views/TextView.EventsTests.cs b/Tests/UnitTestsParallelizable/Views/TextView.EventsTests.cs
index ada27559be..27d3fec2eb 100644
--- a/Tests/UnitTestsParallelizable/Views/TextView.EventsTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextView.EventsTests.cs
@@ -1,5 +1,4 @@
 using UnitTests;
-using Xunit.Abstractions;
 
 namespace ViewsTests.TextViewTests;
 
diff --git a/global.json b/global.json
index a68b32ef1b..f823b7afc1 100644
--- a/global.json
+++ b/global.json
@@ -2,5 +2,8 @@
   "sdk": {
     "version": "10.0.0",
     "rollForward": "latestMinor"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }