diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 291ee5c76ad..b060dd32c9f 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -15,7 +15,7 @@
     <!-- MSTest -->
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <!-- Microsoft.UI.Xaml MSTest Extension -->
     <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.4" />
     <!-- System packages -->
diff --git a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
index 2e002b16083..81af94a489d 100644
--- a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
+++ b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
   </ItemGroup>
 
   <!-- .NET Core 2.1 doesn't have the Unsafe type -->
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
index fcf28c49033..51c0f95d1a1 100644
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
+++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
@@ -148,6 +148,7 @@
     <PackageReference Include="MSTest.TestFramework">
       <Version>2.1.2</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
       <Version>5.0.0</Version>
     </PackageReference>
diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index 3f7353455ff..c5bcf7a5da4 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
   </ItemGroup>
 
   <!-- Workaround for the .NET Core 2.1 binary not resolving the Unsafe assembly properly -->
diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
index 18a400e4adb..0af83573b18 100644
--- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
+++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
   </ItemGroup>
 
   <Import Project="..\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems" Label="Shared" />
diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
index a97ae435d52..35fa9601fd3 100644
--- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
+++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
@@ -122,6 +122,7 @@
     <PackageReference Include="MSTest.TestFramework">
       <Version>2.1.2</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
diff --git a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj b/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
index 6b580aa0997..6fe4ab2d352 100644
--- a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
+++ b/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0-1.final" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
   </ItemGroup>
diff --git a/UnitTests/UnitTests.UWP/App.xaml b/UnitTests/UnitTests.UWP/App.xaml
new file mode 100644
index 00000000000..2ba86d0d78a
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/App.xaml
@@ -0,0 +1,59 @@
+<Application x:Class="UnitTests.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+             xmlns:helpers="using:UnitTests.Extensions.Helpers"
+             xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+             xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+             xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+             xmlns:unitTestExtensions="using:UnitTests.Extensions"
+             RequestedTheme="Light">
+    <Application.Resources>
+        <muxc:XamlControlsResources>
+            <muxc:XamlControlsResources.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--  Workarounds for .NET Native issue in unit tests  -->
+                    <ui:EnumValuesExtension x:Key="DummyExtension" />
+
+                    <unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
+
+                    <CommandBar x:Key="DummyCommandBar">
+                        <AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}" />
+                        <AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" />
+                    </CommandBar>
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
+                                                      IconSource="{ui:FontIconSource Glyph=&#xE10B;}" />
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
+                                                      IconSource="{ui:SymbolIconSource Symbol=Play}" />
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
+                                                      IconSource="{ui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
+
+                    <Button x:Key="DummyButton">
+                        <Button.Flyout>
+                            <MenuFlyout>
+                                <MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/StoreLogo.png}" />
+                            </MenuFlyout>
+                        </Button.Flyout>
+                    </Button>
+
+                    <TextBox x:Key="DummyTextBox">
+                        <interactivity:Interaction.Behaviors>
+                            <behaviors:AutoSelectBehavior />
+                        </interactivity:Interaction.Behaviors>
+                    </TextBox>
+
+                    <controls:ConstrainedBox x:Key="TestConstrainedBox" />
+                    <controls:UniformGrid x:Key="TestUniformGrid" />
+                    <controls:WrapPanel x:Key="TestWrapPanel" />
+                    <ui:NullableBoolExtension x:Key="nullableBool" />
+
+                    <helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
+                </ResourceDictionary>
+            </muxc:XamlControlsResources.MergedDictionaries>
+        </muxc:XamlControlsResources>
+    </Application.Resources>
+</Application>
diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml.cs b/UnitTests/UnitTests.UWP/App.xaml.cs
similarity index 89%
rename from UnitTests/UnitTests.UWP/UnitTestApp.xaml.cs
rename to UnitTests/UnitTests.UWP/App.xaml.cs
index 992b1531ea9..f070ba9d2fe 100644
--- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml.cs
+++ b/UnitTests/UnitTests.UWP/App.xaml.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 using System;
 using UnitTests.Extensions;
 using Windows.ApplicationModel;
@@ -90,6 +91,17 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                     // TODO: Load state from previously suspended application
                 }
 
+                Logger.LogMessage("Looking for DefaultRichEditBoxStyle...");
+                if (!Resources.TryGetValue("DefaultRichEditBoxStyle", out var value))
+                {
+                    Logger.LogMessage("ERROR: Couldn't find DefaultRichEditBoxStyle in WinUI!");
+                    throw new ApplicationException("Couldn't find DefaultRichEditBoxStyle resource.");
+                }
+                else
+                {
+                    Logger.LogMessage("FOUND!");
+                }
+
                 // Place the frame in the current Window
                 Window.Current.Content = rootFrame;
             }
diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
deleted file mode 100644
index 87f176b9a0f..00000000000
--- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Application x:Class="UnitTests.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
-             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-             xmlns:helpers="using:UnitTests.Extensions.Helpers"
-             xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-             xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
-             xmlns:unitTestExtensions="using:UnitTests.Extensions"
-             RequestedTheme="Light">
-    <Application.Resources>
-
-        <!--  Workarounds for .NET Native issue in unit tests  -->
-        <ui:EnumValuesExtension x:Key="DummyExtension" />
-
-        <unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
-
-        <CommandBar x:Key="DummyCommandBar">
-            <AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}" />
-            <AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" />
-        </CommandBar>
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
-                                          IconSource="{ui:FontIconSource Glyph=&#xE10B;}" />
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
-                                          IconSource="{ui:SymbolIconSource Symbol=Play}" />
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
-                                          IconSource="{ui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
-
-        <Button x:Key="DummyButton">
-            <Button.Flyout>
-                <MenuFlyout>
-                    <MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/StoreLogo.png}" />
-                </MenuFlyout>
-            </Button.Flyout>
-        </Button>
-
-        <TextBox x:Key="DummyTextBox">
-            <interactivity:Interaction.Behaviors>
-                <behaviors:AutoSelectBehavior />
-            </interactivity:Interaction.Behaviors>
-        </TextBox>
-
-        <controls:ConstrainedBox x:Key="TestConstrainedBox" />
-        <controls:UniformGrid x:Key="TestUniformGrid" />
-        <controls:WrapPanel x:Key="TestWrapPanel" />
-        <ui:NullableBoolExtension x:Key="nullableBool" />
-
-        <helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
-
-    </Application.Resources>
-</Application>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 895d2b161b5..1659951ec88 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -120,7 +120,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>3.1.5</Version>
+      <Version>5.0.2</Version>
     </PackageReference>
     <PackageReference Include="FluentAssertions">
       <Version>5.10.3</Version>
@@ -128,12 +128,16 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.6.1</Version>
+    </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
       <Version>2.1.2</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>10.0.3</Version>
       <!-- DO NOT UPGRADE THIS PACKAGE FROM 10.0.3, this is used for upgrade testing between 6.1.1 and 7.0.0 for the Object Serializers -->
@@ -149,6 +153,9 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Behaviors\Test_AutoSelectBehavior.cs" />
     <Compile Include="Converters\Test_AdaptiveHeightValueConverter.cs" />
     <Compile Include="Converters\Test_TaskResultConverter.cs" />
@@ -243,17 +250,8 @@
     <Compile Include="UI\Extensions\Test_VisualExtensions.cs" />
     <Compile Include="UI\Person.cs" />
     <Compile Include="UI\Test_AdvancedCollectionView.cs" />
-    <Compile Include="UnitTestApp.xaml.cs">
-      <DependentUpon>UnitTestApp.xaml</DependentUpon>
-    </Compile>
     <Compile Include="VisualUITestBase.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="UnitTestApp.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-  </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
@@ -343,7 +341,12 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
   <Import Project="..\UnitTests.Shared\UnitTests.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 55651aaeaab..c8bee2bdaed 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -163,7 +163,7 @@
       <Version>6.1.2</Version>
     </PackageReference>
     <!-- Ignored for now, until it supports Xaml Islands
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     -->