diff --git a/tests/WinUIGallery.UITests/AxeHelper.cs b/tests/WinUIGallery.UITests/AxeHelper.cs
index d9967e7bc..6b30a43be 100644
--- a/tests/WinUIGallery.UITests/AxeHelper.cs
+++ b/tests/WinUIGallery.UITests/AxeHelper.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Axe.Windows.Automation;
 using Axe.Windows.Core.Enums;
@@ -40,16 +27,16 @@ public static void AssertNoAccessibilityErrors()
     {
         // Bug 1474: Disabling Rules NameReasonableLength and BoundingRectangleNotNull temporarily
         var testResult = AccessibilityScanner.Scan(null).WindowScanOutputs.SelectMany(output => output.Errors)
-                .Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
-                .Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
-                .Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
-                .Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable)
-                .Where(rule => rule.Rule.ID != RuleId.NameReasonableLength)
-                .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNull)
-                .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullListViewXAML)
-                .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullTextBlockXAML)
-                .Where(rule => rule.Rule.ID != RuleId.NameNotNull)
-                .Where(rule => rule.Rule.ID != RuleId.ChromiumComponentsShouldUseWebScanner);
+            .Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
+            .Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
+            .Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
+            .Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable)
+            .Where(rule => rule.Rule.ID != RuleId.NameReasonableLength)
+            .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNull)
+            .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullListViewXAML)
+            .Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullTextBlockXAML)
+            .Where(rule => rule.Rule.ID != RuleId.NameNotNull)
+            .Where(rule => rule.Rule.ID != RuleId.ChromiumComponentsShouldUseWebScanner);
 
         if (testResult.Any())
         {
diff --git a/tests/WinUIGallery.UITests/README.md b/tests/WinUIGallery.UITests/README.md
index ec4527910..cd6a5e222 100644
--- a/tests/WinUIGallery.UITests/README.md
+++ b/tests/WinUIGallery.UITests/README.md
@@ -80,4 +80,3 @@ Please follow the guidelines below to maintain test reliability and reduce test
 
 1. Provide a complete set of interactions (if applicable) for each new control
 1. Aim for simple and reliable scenario using the least amount of test steps
-
diff --git a/tests/WinUIGallery.UITests/SampleTestTemplate.cs b/tests/WinUIGallery.UITests/SampleTestTemplate.cs
index d9d02b327..89144cd40 100644
--- a/tests/WinUIGallery.UITests/SampleTestTemplate.cs
+++ b/tests/WinUIGallery.UITests/SampleTestTemplate.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/tests/WinUIGallery.UITests/SessionManager.cs b/tests/WinUIGallery.UITests/SessionManager.cs
index d08294423..5d3572fbc 100644
--- a/tests/WinUIGallery.UITests/SessionManager.cs
+++ b/tests/WinUIGallery.UITests/SessionManager.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
@@ -230,4 +217,3 @@ private static void TryInitializeSession()
         }
     }
 }
-
diff --git a/tests/WinUIGallery.UITests/TestBase.cs b/tests/WinUIGallery.UITests/TestBase.cs
index 2bd1ba978..ca34ae5b9 100644
--- a/tests/WinUIGallery.UITests/TestBase.cs
+++ b/tests/WinUIGallery.UITests/TestBase.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
@@ -49,6 +36,7 @@ public static WindowsElement GetElementByName(string name)
         }
         return null;
     }
+
     private static WindowsElement WaitForPageHeader(string name)
     {
         for (int i = 0; i < 100; i++)
diff --git a/tests/WinUIGallery.UITests/Tests/AxeScanAllTests.cs b/tests/WinUIGallery.UITests/Tests/AxeScanAllTests.cs
index af4c8bf8a..7bfb0436f 100644
--- a/tests/WinUIGallery.UITests/Tests/AxeScanAllTests.cs
+++ b/tests/WinUIGallery.UITests/Tests/AxeScanAllTests.cs
@@ -1,4 +1,7 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
 using System;
 using System.Linq;
diff --git a/tests/WinUIGallery.UITests/Tests/Button.cs b/tests/WinUIGallery.UITests/Tests/Button.cs
index 2abca1e70..2e1f7aa67 100644
--- a/tests/WinUIGallery.UITests/Tests/Button.cs
+++ b/tests/WinUIGallery.UITests/Tests/Button.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/CheckBox.cs b/tests/WinUIGallery.UITests/Tests/CheckBox.cs
index ed5438c7e..a177b3ae9 100644
--- a/tests/WinUIGallery.UITests/Tests/CheckBox.cs
+++ b/tests/WinUIGallery.UITests/Tests/CheckBox.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/ComboBox.cs b/tests/WinUIGallery.UITests/Tests/ComboBox.cs
index 102299f31..74cd6a41d 100644
--- a/tests/WinUIGallery.UITests/Tests/ComboBox.cs
+++ b/tests/WinUIGallery.UITests/Tests/ComboBox.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
diff --git a/tests/WinUIGallery.UITests/Tests/DatePicker.cs b/tests/WinUIGallery.UITests/Tests/DatePicker.cs
index 37e74b0dc..abe9ee102 100644
--- a/tests/WinUIGallery.UITests/Tests/DatePicker.cs
+++ b/tests/WinUIGallery.UITests/Tests/DatePicker.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/MediaPlayerElement.cs b/tests/WinUIGallery.UITests/Tests/MediaPlayerElement.cs
index 5c49d754a..defa6eab4 100644
--- a/tests/WinUIGallery.UITests/Tests/MediaPlayerElement.cs
+++ b/tests/WinUIGallery.UITests/Tests/MediaPlayerElement.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/PersonPicture.cs b/tests/WinUIGallery.UITests/Tests/PersonPicture.cs
index 14ba0658b..129f1e913 100644
--- a/tests/WinUIGallery.UITests/Tests/PersonPicture.cs
+++ b/tests/WinUIGallery.UITests/Tests/PersonPicture.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
diff --git a/tests/WinUIGallery.UITests/Tests/ProgressBar.cs b/tests/WinUIGallery.UITests/Tests/ProgressBar.cs
index 84af371c9..fefdba4b6 100644
--- a/tests/WinUIGallery.UITests/Tests/ProgressBar.cs
+++ b/tests/WinUIGallery.UITests/Tests/ProgressBar.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/RadioButton.cs b/tests/WinUIGallery.UITests/Tests/RadioButton.cs
index 12fbed121..f98f4e97a 100644
--- a/tests/WinUIGallery.UITests/Tests/RadioButton.cs
+++ b/tests/WinUIGallery.UITests/Tests/RadioButton.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/SearchResults.cs b/tests/WinUIGallery.UITests/Tests/SearchResults.cs
index 520803376..ad6b818d5 100644
--- a/tests/WinUIGallery.UITests/Tests/SearchResults.cs
+++ b/tests/WinUIGallery.UITests/Tests/SearchResults.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
diff --git a/tests/WinUIGallery.UITests/Tests/Slider.cs b/tests/WinUIGallery.UITests/Tests/Slider.cs
index 74b9ae5bc..231c347d8 100644
--- a/tests/WinUIGallery.UITests/Tests/Slider.cs
+++ b/tests/WinUIGallery.UITests/Tests/Slider.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
diff --git a/tests/WinUIGallery.UITests/Tests/TextBlock.cs b/tests/WinUIGallery.UITests/Tests/TextBlock.cs
index 1336f4982..364ee6823 100644
--- a/tests/WinUIGallery.UITests/Tests/TextBlock.cs
+++ b/tests/WinUIGallery.UITests/Tests/TextBlock.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/TextBox.cs b/tests/WinUIGallery.UITests/Tests/TextBox.cs
index 5eb8dd7f0..e597b340b 100644
--- a/tests/WinUIGallery.UITests/Tests/TextBox.cs
+++ b/tests/WinUIGallery.UITests/Tests/TextBox.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
diff --git a/tests/WinUIGallery.UITests/Tests/ToggleButton.cs b/tests/WinUIGallery.UITests/Tests/ToggleButton.cs
index 8eb8b8bc2..87c60f3c3 100644
--- a/tests/WinUIGallery.UITests/Tests/ToggleButton.cs
+++ b/tests/WinUIGallery.UITests/Tests/ToggleButton.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/Tests/ToggleSwitch.cs b/tests/WinUIGallery.UITests/Tests/ToggleSwitch.cs
index 5310fb462..1f84b100b 100644
--- a/tests/WinUIGallery.UITests/Tests/ToggleSwitch.cs
+++ b/tests/WinUIGallery.UITests/Tests/ToggleSwitch.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
diff --git a/tests/WinUIGallery.UITests/WinUIGallery.UITests.csproj b/tests/WinUIGallery.UITests/WinUIGallery.UITests.csproj
index 4d433aa58..0c6a704ed 100644
--- a/tests/WinUIGallery.UITests/WinUIGallery.UITests.csproj
+++ b/tests/WinUIGallery.UITests/WinUIGallery.UITests.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<!--  Copyright (c) Microsoft Corporation. Licensed under the MIT License.  -->
+<Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>WinUIGallery.UITests</RootNamespace>
@@ -18,9 +20,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Include="$(MSBuildThisFileDirectory)..\..\WinUIGallery\Samples\Data\ControlInfoData.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
+        <None Include="$(MSBuildThisFileDirectory)..\..\WinUIGallery\Samples\Data\ControlInfoData.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/WinUIGallery.UnitTests/Package.appxmanifest b/tests/WinUIGallery.UnitTests/Package.appxmanifest
index ead397b44..a01a4782d 100644
--- a/tests/WinUIGallery.UnitTests/Package.appxmanifest
+++ b/tests/WinUIGallery.UnitTests/Package.appxmanifest
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<!--  Copyright (c) Microsoft Corporation. Licensed under the MIT License.  -->
 <Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="WinUIGallery.UnitTests"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" 
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="3a75d49b-f769-4a7b-91ae-850b7cd79d2d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>WinUIGallery.UnitTests</DisplayName>
-    <PublisherDisplayName>kmahone</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="WinUIGallery.UnitTests"
-        Description="WinUIGallery.UnitTests"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
+    xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+    xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+    xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+    xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+    IgnorableNamespaces="uap rescap">
+
+    <Identity
+        Name="WinUIGallery.UnitTests"
+        Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+        Version="1.0.0.0" />
+
+    <mp:PhoneIdentity PhoneProductId="3a75d49b-f769-4a7b-91ae-850b7cd79d2d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+    <Properties>
+        <DisplayName>WinUIGallery.UnitTests</DisplayName>
+        <PublisherDisplayName>kmahone</PublisherDisplayName>
+        <Logo>Assets\StoreLogo.png</Logo>
+    </Properties>
+
+    <Dependencies>
+        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    </Dependencies>
+
+    <Resources>
+        <Resource Language="x-generate"/>
+    </Resources>
+
+    <Applications>
+        <Application Id="App"
+            Executable="$targetnametoken$.exe"
+            EntryPoint="$targetentrypoint$">
+            <uap:VisualElements
+                DisplayName="WinUIGallery.UnitTests"
+                Description="WinUIGallery.UnitTests"
+                BackgroundColor="transparent"
+                Square150x150Logo="Assets\Square150x150Logo.png"
+                Square44x44Logo="Assets\Square44x44Logo.png">
+                <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+                <uap:SplashScreen Image="Assets\SplashScreen.png" />
+            </uap:VisualElements>
+        </Application>
+    </Applications>
+
+    <Capabilities>
+        <rescap:Capability Name="runFullTrust" />
+    </Capabilities>
+
 </Package>
diff --git a/tests/WinUIGallery.UnitTests/UnitTestApp.xaml b/tests/WinUIGallery.UnitTests/UnitTestApp.xaml
index 580964045..f3e7880c2 100644
--- a/tests/WinUIGallery.UnitTests/UnitTestApp.xaml
+++ b/tests/WinUIGallery.UnitTests/UnitTestApp.xaml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (c) Microsoft Corporation. Licensed under the MIT License.  -->
 <Application
     x:Class="WinUIGallery.UnitTests.UnitTestApp"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WinUIGallery.UnitTests">
+
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
+                <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
+
 </Application>
diff --git a/tests/WinUIGallery.UnitTests/UnitTestApp.xaml.cs b/tests/WinUIGallery.UnitTests/UnitTestApp.xaml.cs
index ec08edf82..2e4875e3a 100644
--- a/tests/WinUIGallery.UnitTests/UnitTestApp.xaml.cs
+++ b/tests/WinUIGallery.UnitTests/UnitTestApp.xaml.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 using System;
 
diff --git a/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml b/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml
index 9f82b5570..dfb9a6fb8 100644
--- a/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml
+++ b/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (c) Microsoft Corporation. Licensed under the MIT License.  -->
 <Window
     x:Class="WinUIGallery.UnitTests.UnitTestAppWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WinUIGallery.UnitTests"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:WinUIGallery.UnitTests"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid x:Name="rootGrid">
+    <Grid x:Name="rootGrid" />
 
-    </Grid>
 </Window>
diff --git a/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml.cs b/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml.cs
index ed735537a..e9b804139 100644
--- a/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml.cs
+++ b/tests/WinUIGallery.UnitTests/UnitTestAppWindow.xaml.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
diff --git a/tests/WinUIGallery.UnitTests/UnitTests.cs b/tests/WinUIGallery.UnitTests/UnitTests.cs
index baf15aec0..2e20e6ab3 100644
--- a/tests/WinUIGallery.UnitTests/UnitTests.cs
+++ b/tests/WinUIGallery.UnitTests/UnitTests.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 using Microsoft.UI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
diff --git a/tests/WinUIGallery.UnitTests/WinUIGallery.UnitTests.csproj b/tests/WinUIGallery.UnitTests/WinUIGallery.UnitTests.csproj
index 1cf63b21c..682a04598 100644
--- a/tests/WinUIGallery.UnitTests/WinUIGallery.UnitTests.csproj
+++ b/tests/WinUIGallery.UnitTests/WinUIGallery.UnitTests.csproj
@@ -1,65 +1,47 @@
+<!--  Copyright (c) Microsoft Corporation. Licensed under the MIT License.  -->
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>$(SamplesTargetFrameworkMoniker)</TargetFramework>
-    <TargetPlatformVersion>$(WindowsSdkTargetPlatformVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>$(WindowsAppSdkTargetPlatformVersion)</TargetPlatformMinVersion>
-    <RootNamespace>WinUIGallery.UnitTests</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;ARM64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
-    <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <Page Remove="UnitTestApp.xaml" />
-    <ApplicationDefinition Include="UnitTestApp.xaml" />
-    <ProjectCapability Include="TestContainer" />
-  </ItemGroup>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>$(SamplesTargetFrameworkMoniker)</TargetFramework>
+        <TargetPlatformVersion>$(WindowsSdkTargetPlatformVersion)</TargetPlatformVersion>
+        <TargetPlatformMinVersion>$(WindowsAppSdkTargetPlatformVersion)</TargetPlatformMinVersion>
+        <RootNamespace>WinUIGallery.UnitTests</RootNamespace>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <Platforms>x86;x64;ARM64</Platforms>
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+        <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+        <UseWinUI>true</UseWinUI>
+        <EnableMsixTooling>true</EnableMsixTooling>
+        <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+        <SelfContained>true</SelfContained>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
+    <ItemGroup>
+        <Page Remove="UnitTestApp.xaml" />
+        <ApplicationDefinition Include="UnitTestApp.xaml" />
+        <ProjectCapability Include="TestContainer" />
+        <Content Include="Assets\*.png" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.7.2">
-      <ExcludeAssets>build</ExcludeAssets>
-    </PackageReference>
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\WinUIGallery\WinUIGallery.csproj" />
+    </ItemGroup>
 
-  <!-- 
-    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-    Tools extension to be activated for this project even if the Windows App SDK Nuget
-    package has not yet been restored.
-  -->
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\WinUIGallery\WinUIGallery.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" />
+        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+        <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.7.2" ExcludeAssets="build" />
+        <Manifest Include="$(ApplicationManifest)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+        <ProjectCapability Include="Msix" />
+    </ItemGroup>
+    <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+        <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+    </PropertyGroup>
 
-  <!-- 
-    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution 
-    Explorer "Package and Publish" context menu entry to be enabled for this project even if 
-    the Windows App SDK Nuget package has not yet been restored.
-  -->
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-  </PropertyGroup>
 </Project>
diff --git a/tests/WinUIGallery.UnitTests/app.manifest b/tests/WinUIGallery.UnitTests/app.manifest
index 7113fe2d2..b8c004446 100644
--- a/tests/WinUIGallery.UnitTests/app.manifest
+++ b/tests/WinUIGallery.UnitTests/app.manifest
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="WinUIGallery.UnitTests.app"/>
+    <assemblyIdentity version="1.0.0.0" name="WinUIGallery.UnitTests.app"/>
 
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+
+            <!--
+                The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+                It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+                For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest
+            -->
+
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+        </application>
+    </compatibility>
+
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </windowsSettings>
     </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
\ No newline at end of file
+
+</assembly>