diff --git a/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor b/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor
index 289487c1f5..5ab8973935 100644
--- a/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor
+++ b/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor
@@ -85,7 +85,11 @@
 
 <DemoSection Component="typeof(SortableListDragHandles)" Title="Drag Handles">
     <Description>
-        Drag handles are specified by the `Handle` property which specifies which CSS class denotes the drag handle. In the example below, the items can only be sorted using the drag handle itself.
+        When setting the <code>Handle</code> parameter to true, the items can only be sorted using the drag handle itself. The following CSS classes can be used to split the drag functionality from the content:
+        <ul>
+            <li>sortable-grab: the grabable part of the dragable item</li>
+            <li>sortable-item-content: the content part of the draggable item</li>
+        </ul>
     </Description>
 </DemoSection>
 
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_NotExpanded.verified.html b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Collapsed.verified.razor.html
similarity index 58%
rename from tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_NotExpanded.verified.html
rename to tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Collapsed.verified.razor.html
index 6695b4d509..74e258a747 100644
--- a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_NotExpanded.verified.html
+++ b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Collapsed.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: 0;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
\ No newline at end of file
+<div class="fluent-collapsible-region-container" style="height: 0;" b-hk0m26j2or="">Content</div>
\ No newline at end of file
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Default.verified.html b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Expanded.verified.razor.html
similarity index 57%
rename from tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Default.verified.html
rename to tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Expanded.verified.razor.html
index d66d71b4dc..b4a93141a2 100644
--- a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Default.verified.html
+++ b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_Expanded.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: auto;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
\ No newline at end of file
+<div class="fluent-collapsible-region-container" style="height: auto;" b-hk0m26j2or="">Content</div>
\ No newline at end of file
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.html b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.razor.html
similarity index 57%
rename from tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.html
rename to tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.razor.html
index d66d71b4dc..b4a93141a2 100644
--- a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.html
+++ b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_ExpandedChanged.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: auto;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
\ No newline at end of file
+<div class="fluent-collapsible-region-container" style="height: auto;" b-hk0m26j2or="">Content</div>
\ No newline at end of file
diff --git a/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.razor.html b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.razor.html
new file mode 100644
index 0000000000..45cd8b86e9
--- /dev/null
+++ b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.razor.html
@@ -0,0 +1,2 @@
+
+<div class="fluent-collapsible-region-container" style="max-height: 200px; height: 0;" b-hk0m26j2or="">Content</div>
\ No newline at end of file
diff --git a/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.razor b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.razor
new file mode 100644
index 0000000000..dffd5ffbd8
--- /dev/null
+++ b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.razor
@@ -0,0 +1,51 @@
+@using Xunit;
+@inherits TestContext
+@code
+{
+    [Fact]
+    public void FluentCollapsibleRegion_Expanded()
+    {
+        // Arrange && Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="true">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_Collapsed()
+    {
+        // Arrange && Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="false">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_MaxHeight()
+    {
+        // Arrange
+        var maxHeight = "200px";
+
+        // Act
+        var cut = Render(@<FluentCollapsibleRegion MaxHeight="@maxHeight">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_ExpandedChanged()
+    {
+        // Arrange
+        var value = false;
+        Action<bool> expandedChanged = (e) => { value = e; };
+
+        // Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="true" ExpandedChanged="expandedChanged">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+}
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.html b/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.html
deleted file mode 100644
index ec29f91e7c..0000000000
--- a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<div class="fluent-collapsible-region-container" style="max-height: 666px; height: auto;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
\ No newline at end of file
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.cs b/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.cs
deleted file mode 100644
index 9b5849bd93..0000000000
--- a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Bunit;
-using Xunit;
-
-namespace Microsoft.FluentUI.AspNetCore.Components.Tests.CollapsibleRegion;
-public class FluentCollapsibleRegionTests : TestBase
-{
-    [Fact]
-    public void FluentCollapsibleRegion_Default()
-    {
-        //Arrange
-        var childContent = "<b>render me</b>";
-
-        var cut = TestContext.RenderComponent<FluentCollapsibleRegion>(parameters => parameters
-            .Add(p => p.Expanded, true)
-            .AddChildContent(childContent)
-        );
-        //Act
-
-        //Assert
-        cut.Verify();
-    }
-
-    [Fact]
-    public void FluentCollapsibleRegion_NotExpanded()
-    {
-        //Arrange
-        var childContent = "<b>render me</b>";
-        Action<bool> expandedChanged = _ => { };
-        var cut = TestContext.RenderComponent<FluentCollapsibleRegion>(parameters => parameters
-            .Add(p => p.Expanded, false)
-            .AddChildContent(childContent)
-        );
-        //Act
-
-        //Assert
-        cut.Verify();
-    }
-
-    [Fact]
-    public void FluentCollapsibleRegion_MaxHeight()
-    {
-        //Arrange
-        var childContent = "<b>render me</b>";
-        var cut = TestContext.RenderComponent<FluentCollapsibleRegion>(parameters => parameters
-            .Add(p => p.Expanded, true)
-            .Add(p => p.MaxHeight, "666px")
-            .AddChildContent(childContent)
-        );
-        //Act
-
-        //Assert
-        cut.Verify();
-    }
-
-    [Fact]
-    public void FluentCollapsibleRegion_ExpandedChanged()
-    {
-        //Arrange
-        var value = false;
-        var childContent = "<b>render me</b>";
-        Action<bool> expandedChanged = (e) => { value = e; };
-        var cut = TestContext.RenderComponent<FluentCollapsibleRegion>(parameters => parameters
-            .Add(p => p.Expanded, true)
-            .Add(p => p.ExpandedChanged, expandedChanged)
-            .AddChildContent(childContent)
-        );
-        //Act
-
-        //Assert
-        cut.Verify();
-    }
-}
-
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj
index 39261191f8..1229a1b856 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-da823711-18da-48b3-8509-abef0515630f</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-d2fb3a59-b7c2-4f16-b8fa-2fd124e6bfd1</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json
index c99f72cebe..80efa04ee3 100644
--- a/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:16962",
-        "sslPort": 44395
+        "applicationUrl": "http://localhost:12503",
+        "sslPort": 44388
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5128",
+        "applicationUrl": "http://localhost:5225",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7127;http://localhost:5128",
+        "applicationUrl": "https://localhost:7287;http://localhost:5225",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj
index 593209a70f..ebaa66c731 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-872fa7db-498e-4557-922b-9a86831b2831</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-1775dc8f-f41e-4334-9c4b-5b36ba013869</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json
index 23548b5366..a11c996254 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:3162",
-        "sslPort": 44312
+        "applicationUrl": "http://localhost:1887",
+        "sslPort": 44376
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5208",
+        "applicationUrl": "http://localhost:5240",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7121;http://localhost:5208",
+        "applicationUrl": "https://localhost:7253;http://localhost:5240",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/FluentUI.TemplateValidation.csproj
index 9ef07fe3d4..93c4c9a4a0 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-1be5b846-0525-4b32-bc79-8c84121812dd</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-8603a5dc-22ce-45e4-9442-a3ade2f55a2c</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +21,4 @@
 	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.*-* " />
     <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.*-* " />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Core\Microsoft.FluentUI.AspNetCore.Components.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Properties/launchSettings.json
index 8681f22201..90e62dc11c 100644
--- a/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/B-Server/PerPage/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:9276",
-        "sslPort": 44390
+        "applicationUrl": "http://localhost:32057",
+        "sslPort": 44368
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5018",
+        "applicationUrl": "http://localhost:5211",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7094;http://localhost:5018",
+        "applicationUrl": "https://localhost:7112;http://localhost:5211",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.sln
index a6692cd66b..dc7a443b97 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{1FE97105-F7FB-4E33-903D-5829B6C89350}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{D82B6E3A-F507-4A31-8634-9101942107E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{820B86A7-F405-4B61-9779-5C4040A27F9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|x64.Build.0 = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Debug|x86.Build.0 = Debug|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|x64.ActiveCfg = Release|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|x64.Build.0 = Release|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{D82B6E3A-F507-4A31-8634-9101942107E6}.Release|x86.Build.0 = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|x64.Build.0 = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{B0E2ECC2-E86D-4EE6-8E1E-BEC1188A63A1}.Release|x86.Build.0 = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|x64.Build.0 = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Debug|x86.Build.0 = Debug|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|x64.ActiveCfg = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|x64.Build.0 = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|x86.ActiveCfg = Release|Any CPU
+		{820B86A7-F405-4B61-9779-5C4040A27F9A}.Release|x86.Build.0 = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|x64.Build.0 = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Debug|x86.Build.0 = Debug|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|x64.Build.0 = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|x86.ActiveCfg = Release|Any CPU
+		{1FE97105-F7FB-4E33-903D-5829B6C89350}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C4368CBF-566C-41D1-BDFC-8AD19BA64E16}
+		SolutionGuid = {E6631DC4-935B-464A-B2D4-79A412450BA6}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
index 49d779f855..9451e0adb9 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-9ad720db-26df-4b7d-8daa-3e5e9c51b61b</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-28022ea6-027e-4de0-b478-6f8702ccc661</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Core\Microsoft.FluentUI.AspNetCore.Components.csproj" />
     <ProjectReference Include="..\FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.*-*" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*-*" />
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
index a4c316f4ca..1d3b259736 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:4653",
-        "sslPort": 44354
+        "applicationUrl": "http://localhost:49334",
+        "sslPort": 44342
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5009",
+        "applicationUrl": "http://localhost:5270",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7280;http://localhost:5009",
+        "applicationUrl": "https://localhost:7022;http://localhost:5270",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
index acabd15770..8884e6da45 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{14999A25-11BC-4C56-864C-4D128E41B098}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{33EB9054-3076-438C-9D1A-D91C0C7632B0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|x64.Build.0 = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Debug|x86.Build.0 = Debug|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|x64.ActiveCfg = Release|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|x64.Build.0 = Release|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA7492FC-3F79-44BD-900A-CA1EBA1C8B33}.Release|x86.Build.0 = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|x64.Build.0 = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Debug|x86.Build.0 = Debug|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|x64.ActiveCfg = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|x64.Build.0 = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|x86.ActiveCfg = Release|Any CPU
-		{14999A25-11BC-4C56-864C-4D128E41B098}.Release|x86.Build.0 = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|x64.Build.0 = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Debug|x86.Build.0 = Debug|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|x64.ActiveCfg = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|x64.Build.0 = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|x86.ActiveCfg = Release|Any CPU
+		{33EB9054-3076-438C-9D1A-D91C0C7632B0}.Release|x86.Build.0 = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|x64.Build.0 = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5BEFA44-5971-4DC0-98C1-8EC34DEFE8B2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6AF66F65-2AF4-4F39-B388-0FFB6296CE45}
+		SolutionGuid = {1EA87996-1040-48D8-82E5-01CBA79E0A3E}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
index 980c70877f..fa1d302643 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-bb9e3c61-fd10-48ed-bc3a-572813093d75</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-8213d4e8-a827-4594-8f86-5171cf1d451f</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
index f6545ad24b..88aa5ab415 100644
--- a/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:63398",
-        "sslPort": 44338
+        "applicationUrl": "http://localhost:11013",
+        "sslPort": 44339
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5025",
+        "applicationUrl": "http://localhost:5208",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7231;http://localhost:5025",
+        "applicationUrl": "https://localhost:7285;http://localhost:5208",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.sln
index ef1695d763..7fa38703a8 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{359C19C0-7915-49F9-B12D-3D0A4427880E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{4413AD0F-0689-4118-86AC-BD096063396C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{4D6F681A-C02A-4F13-9282-FB83D7258D21}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{90838E44-B757-44B0-828F-4E3130D2A759}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|x64.Build.0 = Release|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D6F681A-C02A-4F13-9282-FB83D7258D21}.Release|x86.Build.0 = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|x64.Build.0 = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Debug|x86.Build.0 = Debug|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|x64.ActiveCfg = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|x64.Build.0 = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|x86.ActiveCfg = Release|Any CPU
-		{359C19C0-7915-49F9-B12D-3D0A4427880E}.Release|x86.Build.0 = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|x64.Build.0 = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Debug|x86.Build.0 = Debug|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|x64.ActiveCfg = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|x64.Build.0 = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|x86.ActiveCfg = Release|Any CPU
+		{90838E44-B757-44B0-828F-4E3130D2A759}.Release|x86.Build.0 = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|x64.Build.0 = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Debug|x86.Build.0 = Debug|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|x64.ActiveCfg = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|x64.Build.0 = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4413AD0F-0689-4118-86AC-BD096063396C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6E381978-832A-4B45-A54A-C91DFF85B215}
+		SolutionGuid = {1DCCB487-6325-43CB-8C04-ACF09CF5CA7A}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
index 9c7f11ac00..958241ed62 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-37e3228c-8463-4453-a4ff-2d1dbae5fea7</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-40a575d1-2c82-4c4d-9b04-37901f4da9e2</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
index 777d0e2a6b..c5abd47638 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:38657",
-        "sslPort": 44330
+        "applicationUrl": "http://localhost:43194",
+        "sslPort": 44301
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5291",
+        "applicationUrl": "http://localhost:5234",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7089;http://localhost:5291",
+        "applicationUrl": "https://localhost:7268;http://localhost:5234",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation.sln
index 054aacedce..4694253674 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{458040D6-E855-4B38-A66E-9E52926CA84C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{FC14101C-5E56-419C-83F0-D5634DEC4DA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{54EFE11A-F265-43C1-B364-F2031B265BD9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|x64.Build.0 = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Debug|x86.Build.0 = Debug|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|x64.ActiveCfg = Release|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|x64.Build.0 = Release|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|x86.ActiveCfg = Release|Any CPU
-		{54EFE11A-F265-43C1-B364-F2031B265BD9}.Release|x86.Build.0 = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|x64.Build.0 = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Debug|x86.Build.0 = Debug|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|x64.ActiveCfg = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|x64.Build.0 = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|x86.ActiveCfg = Release|Any CPU
-		{458040D6-E855-4B38-A66E-9E52926CA84C}.Release|x86.Build.0 = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|x64.Build.0 = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Debug|x86.Build.0 = Debug|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|x64.ActiveCfg = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|x64.Build.0 = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|x86.ActiveCfg = Release|Any CPU
+		{52BD2FA4-A750-4EBD-BF17-CCAF3BFB5BB0}.Release|x86.Build.0 = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|x64.Build.0 = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Debug|x86.Build.0 = Debug|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|x64.ActiveCfg = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|x64.Build.0 = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|x86.ActiveCfg = Release|Any CPU
+		{FC14101C-5E56-419C-83F0-D5634DEC4DA6}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0A06CB91-C38C-4442-860A-FA6075E501C2}
+		SolutionGuid = {4380F9D1-2B74-4ABC-8E78-A8248C19321C}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
index 4fa56c6786..025936dab9 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-53aa9c8e-4463-437c-a9e8-9d89ad083a82</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-b5e306b9-e396-44c8-80f6-4805fe794b92</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Properties/launchSettings.json
index b6614f6ce8..693ec1a255 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/NoSamplePages/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:44321",
-        "sslPort": 44316
+        "applicationUrl": "http://localhost:64049",
+        "sslPort": 44317
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5013",
+        "applicationUrl": "http://localhost:5009",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7259;http://localhost:5013",
+        "applicationUrl": "https://localhost:7129;http://localhost:5009",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation.sln
index bc88b7e3ef..46ac6d236a 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{14D4BB7B-21D0-4E10-9082-48D20B935BA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{59D29D6E-52DD-4842-83A5-F96E23649520}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|x64.Build.0 = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Debug|x86.Build.0 = Debug|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|x64.Build.0 = Release|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F01DA26-7AC6-4A90-9810-1D9A5CB1964F}.Release|x86.Build.0 = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|x64.Build.0 = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Debug|x86.Build.0 = Debug|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|x64.ActiveCfg = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|x64.Build.0 = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|x86.ActiveCfg = Release|Any CPU
-		{767BDCA4-AF43-41F9-AC82-ABE2D45396CC}.Release|x86.Build.0 = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|x64.Build.0 = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Debug|x86.Build.0 = Debug|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|x64.ActiveCfg = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|x64.Build.0 = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|x86.ActiveCfg = Release|Any CPU
+		{59D29D6E-52DD-4842-83A5-F96E23649520}.Release|x86.Build.0 = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|x64.Build.0 = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|x64.Build.0 = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{14D4BB7B-21D0-4E10-9082-48D20B935BA9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E449D763-3207-45B8-BC4C-494D1904C2C4}
+		SolutionGuid = {650ACEA5-B2DE-4F21-B34A-B0AFC1538FD5}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 170614e2c5..5f2c537bba 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
index 77fda26a2d..fc7ab7ec87 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
index 4449f8e526..f21c1dec46 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
index d683acdd21..cbc51ca066 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-17798005-71ff-412d-a7f5-a30d8aded8f9</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-fac34d84-0780-417c-b4d6-5a175d6e7c47</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
index 91ae43c060..12ecfcf3d0 100644
--- a/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/IndividualAccounts/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:45758",
-        "sslPort": 44391
+        "applicationUrl": "http://localhost:33129",
+        "sslPort": 44348
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5196",
+        "applicationUrl": "http://localhost:5203",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7136;http://localhost:5196",
+        "applicationUrl": "https://localhost:7236;http://localhost:5203",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/A-SSR/Components/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/A-SSR/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/NoAuthentication/A-SSR/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/A-SSR/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/A-SSR/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/A-SSR/Properties/launchSettings.json
index c9a6faac55..feb2b6d40f 100644
--- a/tests/TemplateValidation/NoAuthentication/A-SSR/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/A-SSR/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:9977",
-        "sslPort": 44385
+        "applicationUrl": "http://localhost:6520",
+        "sslPort": 44336
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5025",
+        "applicationUrl": "http://localhost:5093",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7244;http://localhost:5025",
+        "applicationUrl": "https://localhost:7084;http://localhost:5093",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/B-Server/Global/Components/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/B-Server/Global/Components/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/NoAuthentication/B-Server/Global/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/B-Server/Global/Components/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/B-Server/Global/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/B-Server/Global/Properties/launchSettings.json
index b1623938aa..1e75ef71a1 100644
--- a/tests/TemplateValidation/NoAuthentication/B-Server/Global/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/B-Server/Global/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:1464",
-        "sslPort": 44344
+        "applicationUrl": "http://localhost:54272",
+        "sslPort": 44336
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5094",
+        "applicationUrl": "http://localhost:5164",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7178;http://localhost:5094",
+        "applicationUrl": "https://localhost:7168;http://localhost:5164",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Components/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Properties/launchSettings.json
index ee527f06f4..225c2ea9b3 100644
--- a/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/B-Server/PerPage/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:18391",
-        "sslPort": 44368
+        "applicationUrl": "http://localhost:47611",
+        "sslPort": 44372
       }
     },
     "profiles": {
@@ -13,7 +13,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5270",
+        "applicationUrl": "http://localhost:5104",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7099;http://localhost:5270",
+        "applicationUrl": "https://localhost:7057;http://localhost:5104",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.sln
index dfa7ffa925..e4c75ba02e 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{84F945A1-179D-4344-8905-46D1EFA84F40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{363A994E-1B08-4D26-AB99-7FE64EBE6440}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{4BE1317D-4038-4B87-AD9C-040F17C4EF32}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|x64.Build.0 = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Debug|x86.Build.0 = Debug|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|Any CPU.Build.0 = Release|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|x64.ActiveCfg = Release|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|x64.Build.0 = Release|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|x86.ActiveCfg = Release|Any CPU
-		{363A994E-1B08-4D26-AB99-7FE64EBE6440}.Release|x86.Build.0 = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|x64.Build.0 = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Debug|x86.Build.0 = Debug|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|x64.ActiveCfg = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|x64.Build.0 = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|x86.ActiveCfg = Release|Any CPU
-		{84F945A1-179D-4344-8905-46D1EFA84F40}.Release|x86.Build.0 = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|x64.Build.0 = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BE1317D-4038-4B87-AD9C-040F17C4EF32}.Release|x86.Build.0 = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|x64.Build.0 = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Debug|x86.Build.0 = Debug|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|x64.ActiveCfg = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|x64.Build.0 = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|x86.ActiveCfg = Release|Any CPU
+		{5771AA5C-F6ED-4F02-BF2E-475E40D33F39}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {457C846A-FE7B-4484-AFFF-47723A0A6DA6}
+		SolutionGuid = {5DD75808-933B-49CF-9F30-41A6E31E393F}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
index f26f83d62b..b4a305251d 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:62930",
-        "sslPort": 44361
+        "applicationUrl": "http://localhost:24455",
+        "sslPort": 44302
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5064",
+        "applicationUrl": "http://localhost:5091",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7295;http://localhost:5064",
+        "applicationUrl": "https://localhost:7215;http://localhost:5091",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
index 9f994ed4ec..4ae10a0c75 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{580F6C3D-0588-4D65-9CAC-D21477420574}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{D53F5A37-9B46-442D-806B-BA89E71AAC99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{E488D06D-EF93-426F-8C0F-E962FB744FF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Debug|x86.Build.0 = Debug|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|x64.Build.0 = Release|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{E488D06D-EF93-426F-8C0F-E962FB744FF0}.Release|x86.Build.0 = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|x64.Build.0 = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Debug|x86.Build.0 = Debug|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|Any CPU.Build.0 = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|x64.ActiveCfg = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|x64.Build.0 = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|x86.ActiveCfg = Release|Any CPU
-		{580F6C3D-0588-4D65-9CAC-D21477420574}.Release|x86.Build.0 = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|x64.Build.0 = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E3C57F6-0408-4922-B7E6-AFC586BC5B34}.Release|x86.Build.0 = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|x64.Build.0 = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Debug|x86.Build.0 = Debug|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|x64.ActiveCfg = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|x64.Build.0 = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|x86.ActiveCfg = Release|Any CPU
+		{D53F5A37-9B46-442D-806B-BA89E71AAC99}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {333462F1-5790-40BA-90B5-A4FE99225ADB}
+		SolutionGuid = {5BCC81DE-1D55-47DC-B7D7-B4679A7DB9F0}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
index 491f0c1f6d..c8c3e48fb5 100644
--- a/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/C-Wasm/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:56421",
-        "sslPort": 44337
+        "applicationUrl": "http://localhost:42623",
+        "sslPort": 44356
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5228",
+        "applicationUrl": "http://localhost:5237",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7035;http://localhost:5228",
+        "applicationUrl": "https://localhost:7295;http://localhost:5237",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
index f402f9de47..46eed4d150 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.Client/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.sln
index 9136b75f54..602aa7d138 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{5362ADAC-3C29-482B-B783-AF34D9F71108}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{DC10B65D-605D-4DC4-8817-26D9B06DAD54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|x64.Build.0 = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Debug|x86.Build.0 = Debug|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|x64.ActiveCfg = Release|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|x64.Build.0 = Release|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|x86.ActiveCfg = Release|Any CPU
-		{CD4A419F-BEDE-435F-B960-7ED116FA0ECA}.Release|x86.Build.0 = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|x64.Build.0 = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Debug|x86.Build.0 = Debug|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|x64.ActiveCfg = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|x64.Build.0 = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|x86.ActiveCfg = Release|Any CPU
-		{5362ADAC-3C29-482B-B783-AF34D9F71108}.Release|x86.Build.0 = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|x64.Build.0 = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC10B65D-605D-4DC4-8817-26D9B06DAD54}.Release|x86.Build.0 = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|x64.Build.0 = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BDF8A1A-9D0C-491D-9662-352E3E4249D3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8C2F90A3-DFE9-4907-A2B3-F2966D6D2D85}
+		SolutionGuid = {BA15471B-EFF3-4507-86C1-D98E82784D98}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
index 54fca4197e..462fcdbdd3 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/Global/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:39561",
-        "sslPort": 44375
+        "applicationUrl": "http://localhost:47764",
+        "sslPort": 44368
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5159",
+        "applicationUrl": "http://localhost:5169",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7108;http://localhost:5159",
+        "applicationUrl": "https://localhost:7176;http://localhost:5169",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto.sln b/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto.sln
index ea68272fe9..09b382400c 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto.sln
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Auto", "FluentUI.TemplateValidation.Auto\FluentUI.TemplateValidation.Auto.csproj", "{4D1BC276-29FA-4674-9802-9846F0E44933}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Auto", "FluentUI.TemplateValidation.Auto\FluentUI.TemplateValidation.Auto.csproj", "{01B783E8-FC18-4A63-9C52-52E54A17E57C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Auto.Client", "FluentUI.TemplateValidation.Auto.Client\FluentUI.TemplateValidation.Auto.Client.csproj", "{50719C91-46B3-410B-A3E0-D93A32770575}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Auto.Client", "FluentUI.TemplateValidation.Auto.Client\FluentUI.TemplateValidation.Auto.Client.csproj", "{E668876B-43FD-46E0-BAF4-1946EEB1267E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|x64.Build.0 = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Debug|x86.Build.0 = Debug|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|x64.ActiveCfg = Release|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|x64.Build.0 = Release|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|x86.ActiveCfg = Release|Any CPU
-		{50719C91-46B3-410B-A3E0-D93A32770575}.Release|x86.Build.0 = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|x64.Build.0 = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D1BC276-29FA-4674-9802-9846F0E44933}.Release|x86.Build.0 = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|x64.Build.0 = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E668876B-43FD-46E0-BAF4-1946EEB1267E}.Release|x86.Build.0 = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|x64.Build.0 = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Debug|x86.Build.0 = Debug|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|x64.ActiveCfg = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|x64.Build.0 = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|x86.ActiveCfg = Release|Any CPU
+		{01B783E8-FC18-4A63-9C52-52E54A17E57C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1CB33E52-7580-44D8-BAF1-5F74DFF894BF}
+		SolutionGuid = {E061A39D-E481-49A6-84FE-0AB8D336B941}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto/Properties/launchSettings.json
index 2e63de5ef1..19ebff7923 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/NoSamplePages/FluentUI.TemplateValidation.Auto/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:17650",
-        "sslPort": 44378
+        "applicationUrl": "http://localhost:22270",
+        "sslPort": 44359
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5135",
+        "applicationUrl": "http://localhost:5020",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7140;http://localhost:5135",
+        "applicationUrl": "https://localhost:7263;http://localhost:5020",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation.sln b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation.sln
index 4f63b9ed4b..f692ec1ba4 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation.sln
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation", "FluentUI.TemplateValidation\FluentUI.TemplateValidation.csproj", "{807488D6-2B36-4298-9C74-29F348FA83F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{22E85F1B-B816-4719-80F3-3781BFF235B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.TemplateValidation.Client", "FluentUI.TemplateValidation.Client\FluentUI.TemplateValidation.Client.csproj", "{2E2FEE19-9B27-431F-834C-ADCB77154BD4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,35 +16,35 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|x64.Build.0 = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Debug|x86.Build.0 = Debug|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|x64.ActiveCfg = Release|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|x64.Build.0 = Release|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{22E85F1B-B816-4719-80F3-3781BFF235B3}.Release|x86.Build.0 = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|x64.Build.0 = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|x64.ActiveCfg = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|x64.Build.0 = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{D591CD94-1BB1-4CD4-9E03-B5F96750F6EF}.Release|x86.Build.0 = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|x64.Build.0 = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|x64.ActiveCfg = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|x64.Build.0 = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E2FEE19-9B27-431F-834C-ADCB77154BD4}.Release|x86.Build.0 = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|x64.Build.0 = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{807488D6-2B36-4298-9C74-29F348FA83F1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EC82A479-9856-4BF5-9717-458C1A1816DD}
+		SolutionGuid = {CE9EE92D-2705-4739-AAD6-7034B958FFC7}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
index acfa551be7..5ba105c91d 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
index 83a27d9017..aad044a406 100644
--- a/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
+++ b/tests/TemplateValidation/NoAuthentication/D-Auto/PerPage/FluentUI.TemplateValidation/Properties/launchSettings.json
@@ -4,8 +4,8 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:32736",
-        "sslPort": 44339
+        "applicationUrl": "http://localhost:12453",
+        "sslPort": 44364
       }
     },
     "profiles": {
@@ -14,7 +14,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5262",
+        "applicationUrl": "http://localhost:5129",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -24,7 +24,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7187;http://localhost:5262",
+        "applicationUrl": "https://localhost:7138;http://localhost:5129",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Pages/Weather.razor b/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Pages/Weather.razor
index ae179f86bb..edce179854 100644
--- a/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Pages/Weather.razor
+++ b/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Pages/Weather.razor
@@ -14,10 +14,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Properties/launchSettings.json b/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Properties/launchSettings.json
index 9648fa0f9e..fd86e37567 100644
--- a/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Properties/launchSettings.json
+++ b/tests/TemplateValidation/WasmStandalone/IndividualAccounts/Properties/launchSettings.json
@@ -4,8 +4,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:60819",
-      "sslPort": 44353
+      "applicationUrl": "http://localhost:12315",
+      "sslPort": 44331
     }
   },
   "profiles": {
@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7182;http://localhost:5220",
+      "applicationUrl": "https://localhost:7033;http://localhost:5189",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Layout/MainLayout.razor b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Layout/MainLayout.razor
index d1f719da8b..fde635e550 100644
--- a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Layout/MainLayout.razor
+++ b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Layout/MainLayout.razor
@@ -5,7 +5,7 @@
     </FluentHeader>
     <FluentStack Class="main" Orientation="Orientation.Horizontal" Width="100%">
         <NavMenu />
-        <FluentBodyContent  Class="body-content">
+        <FluentBodyContent Class="body-content">
             <ErrorBoundary>
                 <ChildContent>
                     <div class="content">
diff --git a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Pages/Weather.razor b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Pages/Weather.razor
index ae179f86bb..edce179854 100644
--- a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Pages/Weather.razor
+++ b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Pages/Weather.razor
@@ -14,10 +14,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 
diff --git a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Properties/launchSettings.json b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Properties/launchSettings.json
index 7d0ffa97d0..de2d4894b4 100644
--- a/tests/TemplateValidation/WasmStandalone/NoAuthentication/Properties/launchSettings.json
+++ b/tests/TemplateValidation/WasmStandalone/NoAuthentication/Properties/launchSettings.json
@@ -4,8 +4,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:58007",
-      "sslPort": 44351
+      "applicationUrl": "http://localhost:45893",
+      "sslPort": 44365
     }
   },
   "profiles": {
@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5030",
+      "applicationUrl": "http://localhost:5106",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -24,7 +24,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7228;http://localhost:5030",
+      "applicationUrl": "https://localhost:7150;http://localhost:5106",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/tests/TemplateValidation/WasmStandalone/NoSamplePages/Properties/launchSettings.json b/tests/TemplateValidation/WasmStandalone/NoSamplePages/Properties/launchSettings.json
index 959b6494d6..17b2f08090 100644
--- a/tests/TemplateValidation/WasmStandalone/NoSamplePages/Properties/launchSettings.json
+++ b/tests/TemplateValidation/WasmStandalone/NoSamplePages/Properties/launchSettings.json
@@ -4,8 +4,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:51904",
-      "sslPort": 44350
+      "applicationUrl": "http://localhost:38202",
+      "sslPort": 44331
     }
   },
   "profiles": {
@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5278",
+      "applicationUrl": "http://localhost:5119",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -24,7 +24,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7159;http://localhost:5278",
+      "applicationUrl": "https://localhost:7147;http://localhost:5119",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }