diff --git a/examples/Demo/Shared/Components/NotificationCenter.razor b/examples/Demo/Shared/Components/NotificationCenter.razor
index a266526736..d8311e829c 100644
--- a/examples/Demo/Shared/Components/NotificationCenter.razor
+++ b/examples/Demo/Shared/Components/NotificationCenter.razor
@@ -2,7 +2,7 @@
 @inject IDialogService DialogService
 @inject IMessageService MessageService
 
-<FluentButton BackgroundColor="var(--neutral-layer-4)" OnClick="OpenNotificationCenterAsync">
+<FluentButton BackgroundColor="var(--neutral-layer-4)" OnClick="OpenNotificationCenterAsync" Title="Notification center">
 @if (MessageService.Count(App.MESSAGES_NOTIFICATION_CENTER) > 0)
 {
     <FluentCounterBadge Count="@MessageService.Count(App.MESSAGES_NOTIFICATION_CENTER)"
diff --git a/examples/Demo/Shared/Components/SiteSettings.razor b/examples/Demo/Shared/Components/SiteSettings.razor
index 46106532a1..2c03460a4f 100644
--- a/examples/Demo/Shared/Components/SiteSettings.razor
+++ b/examples/Demo/Shared/Components/SiteSettings.razor
@@ -1,5 +1,5 @@
 @inject IDialogService DialogService
 
-<FluentButton BackgroundColor="var(--neutral-layer-4)" OnClick="OpenSiteSettingsAsync">
+<FluentButton BackgroundColor="var(--neutral-layer-4)" OnClick="OpenSiteSettingsAsync" Title="Site settings">
     <FluentIcon Icon="Icons.Regular.Size20.Settings" Color="Color.Neutral" Title="Site settings" />
 </FluentButton>
\ No newline at end of file
diff --git a/src/Core/Components/Button/FluentButton.razor b/src/Core/Components/Button/FluentButton.razor
index 9ab7309014..d275959903 100644
--- a/src/Core/Components/Button/FluentButton.razor
+++ b/src/Core/Components/Button/FluentButton.razor
@@ -42,6 +42,7 @@ else
                disabled=@(Disabled || Loading)
                name=@Name
                required=@Required
+               aria-label=@Title
                title=@Title
                appearance=@Appearance.ToAttributeValue()
                custom-id="@CustomId"
diff --git a/src/Core/Components/NavMenu/FluentNavGroup.razor b/src/Core/Components/NavMenu/FluentNavGroup.razor
index baac263994..561808d6a0 100644
--- a/src/Core/Components/NavMenu/FluentNavGroup.razor
+++ b/src/Core/Components/NavMenu/FluentNavGroup.razor
@@ -6,7 +6,7 @@
 
 @if (NavMenuExpanded || HasIcon)
 {
-    <div id="@Id" @ref="@Element" @attributes="AdditionalAttributes" class="@ClassValue" disabled="@Disabled" style="@StyleValue">
+    <div id="@Id" @ref="@Element" @attributes="AdditionalAttributes" class="@ClassValue" disabled="@Disabled" style="@StyleValue" role="menuitem">
         <div class="positioning-region">
             <div class="content-region">
                 @if (!string.IsNullOrEmpty(Href))
@@ -58,7 +58,7 @@
         {
             <div aria-hidden="true"
                  class="@ButtonClassValue"
-                 tabindex="0"
+                 tabindex="-1"
                  @onclick="ToggleExpandedAsync"
                  @onclick:stopPropagation="true"
                  @onkeydown="@HandleExpanderKeyDownAsync">
diff --git a/src/Core/Components/NavMenu/FluentNavLink.razor b/src/Core/Components/NavMenu/FluentNavLink.razor
index 49381059ba..1b8d17dd3f 100644
--- a/src/Core/Components/NavMenu/FluentNavLink.razor
+++ b/src/Core/Components/NavMenu/FluentNavLink.razor
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Components.Rendering
 @using Microsoft.AspNetCore.Components.Routing
 
-<div @attributes="AdditionalAttributes" class="@ClassValue" disabled="@Disabled" style="@Style">
+<div @attributes="AdditionalAttributes" class="@ClassValue" disabled="@Disabled" style="@Style" role="menuitem">
     <div class="positioning-region">
         <div class="content-region">
             @if (!OnClick.HasDelegate && !string.IsNullOrEmpty(Href))
diff --git a/src/Core/Components/NavMenu/FluentNavMenu.razor b/src/Core/Components/NavMenu/FluentNavMenu.razor
index 2fd23c6f52..5c5f779359 100644
--- a/src/Core/Components/NavMenu/FluentNavMenu.razor
+++ b/src/Core/Components/NavMenu/FluentNavMenu.razor
@@ -1,12 +1,13 @@
 @namespace Microsoft.Fast.Components.FluentUI
 @inherits FluentComponentBase
 
-<div id="@Id" @ref="@Element" @attributes="AdditionalAttributes" class="@ClassValue" style="@StyleValue" aria-label="@(Collapsible ? null : @Title)">
+<div id="@Id" @ref="@Element" @attributes="AdditionalAttributes" class="@ClassValue" style="@StyleValue" aria-label="@(Collapsible ? null : @Title)" role="menu" aria-expanded="@Expanded">
     <CascadingValue Value="@Expanded" Name="NavMenuExpanded">
         @if (Collapsible)
         {
             <div aria-label="@Title"
                  aria-expanded="@(Expanded.ToAttributeValue())"
+                 role="menuitem"
                  class="fluent-nav-item"
                  tabindex="0"
                  @onclick="@ToggleExpandedAsync"
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Default.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Default.verified.html
index 91478a34cb..11b59a4b52 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Default.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Default.verified.html
@@ -1,13 +1,13 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
         <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
         <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
-            Group title
+          Group title
         </div>
-        <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
           <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
             <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
           </svg>
@@ -16,6 +16,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Disabled.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Disabled.verified.html
index 39c558143d..5faff5bde9 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Disabled.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Disabled.verified.html
@@ -1,20 +1,21 @@
 
-<div class="fluent-nav-item disabled fluent-nav-group" disabled="" b-5zjpev3f1l="" blazor:elementreference="xxx">
-    <div class="positioning-region" b-5zjpev3f1l="">
-        <div class="content-region" b-5zjpev3f1l="">
-            <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
-                <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
-                <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">Group title
-                </div>
-                <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
-                    <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-stroke-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
-                        <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
-                    </svg>
-                </div>
-            </div>
+<div class="fluent-nav-item disabled fluent-nav-group" disabled="" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
+  <div class="positioning-region" b-5zjpev3f1l="">
+    <div class="content-region" b-5zjpev3f1l="">
+      <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
+        <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
+        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
+          Group title
         </div>
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+          <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-stroke-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
+            <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
+          </svg>
+        </div>
+      </div>
     </div>
-    <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-        <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
-    </div>
+  </div>
+  <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Empty.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Empty.verified.html
index 469d4b508d..1c571320d5 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Empty.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Empty.verified.html
@@ -1,20 +1,20 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
-    <div class="positioning-region" b-5zjpev3f1l="">
-        <div class="content-region" b-5zjpev3f1l="">
-            <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
-                <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
-                <div class="fluent-nav-text" b-5zjpev3f1l="">
-                </div>
-                <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
-                    <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
-                        <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
-                    </svg>
-                </div>
-            </div>
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
+  <div class="positioning-region" b-5zjpev3f1l="">
+    <div class="content-region" b-5zjpev3f1l="">
+      <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
+        <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
+        <div class="fluent-nav-text" b-5zjpev3f1l="">
         </div>
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+          <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
+            <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
+          </svg>
+        </div>
+      </div>
     </div>
-    <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-        <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx"></div>
-    </div>
+  </div>
+  <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx"></div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Gap.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Gap.verified.html
index 3e6730937b..c2b57be108 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Gap.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Gap.verified.html
@@ -1,12 +1,13 @@
 
-<div class="fluent-nav-item fluent-nav-group" style="margin: 20px 0;" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" style="margin: 20px 0;" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
         <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
-        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">Group title
+        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
+          Group title
         </div>
-        <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
           <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
             <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
           </svg>
@@ -15,6 +16,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_HideExpander.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_HideExpander.verified.html
index 705d4cd30e..3b1472fc52 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_HideExpander.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_HideExpander.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
@@ -10,6 +10,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Href.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Href.verified.html
index 52b6fd2bdd..323403aebf 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Href.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Href.verified.html
@@ -1,13 +1,14 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <a href="/NavMenu" rel="" class="fluent-nav-link">
         <span class="fluent-nav-icon" style="min-width: 20px;" b-5zjpev3f1l=""></span>
-        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">Group title
+        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
+          Group title
         </div>
       </a>
-      <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="1" blazor:onclick:stoppropagation="" blazor:onkeydown="2" b-5zjpev3f1l="">
+      <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="1" blazor:onclick:stoppropagation="" blazor:onkeydown="2" b-5zjpev3f1l="">
         <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="3">
           <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
         </svg>
@@ -15,6 +16,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Icon.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Icon.verified.html
index 0ff11a7609..f3b5cb2e02 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Icon.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_Icon.verified.html
@@ -1,14 +1,15 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
         <svg class="fluent-nav-icon" style="width: 20px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="5">
           <path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm0 8.25a1 1 0 0 0-1 .88v5.74a1 1 0 0 0 2 0v-5.62l-.01-.12a1 1 0 0 0-1-.88Zm0-3.75A1.25 1.25 0 1 0 12 9a1.25 1.25 0 0 0 0-2.5Z"></path>
         </svg>
-        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">Group title
+        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
+          Group title
         </div>
-        <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
           <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="6">
             <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
           </svg>
@@ -17,6 +18,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_IconAndIconColor.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_IconAndIconColor.verified.html
index 1e7bc5b5ae..8a6e26280c 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_IconAndIconColor.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_IconAndIconColor.verified.html
@@ -1,14 +1,15 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
         <svg class="fluent-nav-icon" style="width: 20px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="5">
           <path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm0 8.25a1 1 0 0 0-1 .88v5.74a1 1 0 0 0 2 0v-5.62l-.01-.12a1 1 0 0 0-1-.88Zm0-3.75A1.25 1.25 0 1 0 12 9a1.25 1.25 0 0 0 0-2.5Z"></path>
         </svg>
-        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">Group title
+        <div class="fluent-nav-text" title="Group title" b-5zjpev3f1l="">
+          Group title
         </div>
-        <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
           <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="6">
             <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
           </svg>
@@ -17,6 +18,6 @@
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_TitleTemplate.verified.html b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_TitleTemplate.verified.html
index 91d63a0657..8bfb43d609 100644
--- a/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_TitleTemplate.verified.html
+++ b/tests/Core/NavMenu/FluentNavGroupTests.FluentNavGroup_TitleTemplate.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item fluent-nav-group" b-5zjpev3f1l="" blazor:elementreference="xxx">
+<div class="fluent-nav-item fluent-nav-group" role="menuitem" b-5zjpev3f1l="" blazor:elementreference="xxx">
   <div class="positioning-region" b-5zjpev3f1l="">
     <div class="content-region" b-5zjpev3f1l="">
       <div class="fluent-nav-link notactive" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-5zjpev3f1l="">
@@ -7,7 +7,7 @@
         <div class="fluent-nav-text" b-5zjpev3f1l="">
           <h2>Group title</h2>
         </div>
-        <div aria-hidden="true" class="expand-collapse-button" tabindex="0" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
+        <div aria-hidden="true" class="expand-collapse-button" tabindex="-1" blazor:onclick="3" blazor:onclick:stoppropagation="" blazor:onkeydown="4" b-5zjpev3f1l="">
           <svg class="fluent-nav-expand-icon" style="width: 12px; fill: var(--neutral-foreground-rest);" focusable="false" viewBox="0 0 12 12" aria-hidden="true" blazor:onclick="5">
             <path d="M4.65 2.15a.5.5 0 0 0 0 .7L7.79 6 4.65 9.15a.5.5 0 1 0 .7.7l3.5-3.5a.5.5 0 0 0 0-.7l-3.5-3.5a.5.5 0 0 0-.7 0Z"></path>
           </svg>
@@ -16,6 +16,6 @@ <h2>Group title</h2>
     </div>
   </div>
   <div role="group" class="fluent-collapsible-region-container items" style="height: 0;" b-2esy53gizz="">
-    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
+    <div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Default.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Default.verified.html
index 17d77eeee3..dd8671fb3e 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Default.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Default.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <div class="fluent-nav-link" blazor:onclick="1" b-95x3e3vb5e="">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ExtendedTtitle.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ExtendedTtitle.verified.html
index 3b7ccb8f99..04c437312a 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ExtendedTtitle.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ExtendedTtitle.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <div class="fluent-nav-link" blazor:onclick="1" b-95x3e3vb5e="">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ForceLoad.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ForceLoad.verified.html
index 08d6cf5258..227875dcac 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ForceLoad.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_ForceLoad.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <a href="/NavMenu" rel="" class="fluent-nav-link">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Href.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Href.verified.html
index 08d6cf5258..227875dcac 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Href.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Href.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <a href="/NavMenu" rel="" class="fluent-nav-link">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Icon.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Icon.verified.html
index 61c7275191..77f54ceb34 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Icon.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Icon.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <div class="fluent-nav-link" blazor:onclick="1" b-95x3e3vb5e="">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_IconAndIconColor.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_IconAndIconColor.verified.html
index d891dbbbb2..5da5a9c66f 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_IconAndIconColor.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_IconAndIconColor.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <div class="fluent-nav-link" blazor:onclick="1" b-95x3e3vb5e="">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Match.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Match.verified.html
index 08d6cf5258..227875dcac 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Match.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Match.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <a href="/NavMenu" rel="" class="fluent-nav-link">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_OnClick.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_OnClick.verified.html
index 17d77eeee3..dd8671fb3e 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_OnClick.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_OnClick.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <div class="fluent-nav-link" blazor:onclick="1" b-95x3e3vb5e="">
diff --git a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Target.verified.html b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Target.verified.html
index 2d91ef5729..2e2f28b249 100644
--- a/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Target.verified.html
+++ b/tests/Core/NavMenu/FluentNavLinkTests.FluentNavLink_Target.verified.html
@@ -1,5 +1,5 @@
 
-<div class="fluent-nav-item" b-95x3e3vb5e="">
+<div class="fluent-nav-item" role="menuitem" b-95x3e3vb5e="">
   <div class="positioning-region" b-95x3e3vb5e="">
     <div class="content-region" b-95x3e3vb5e="">
       <a href="/NavMenu" target="_blank" rel="noopener noreferrer" class="fluent-nav-link">
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Collapsible.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Collapsible.verified.html
index c4a556086e..3a5b781afb 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Collapsible.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Collapsible.verified.html
@@ -1,6 +1,6 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 100%;" b-dpnvrc1pyz="">
-  <div aria-label="Navigation menu" aria-expanded="true" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
+<div id="xxx" class="fluent-nav-menu" style="width: 100%;" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">
+  <div aria-label="Navigation menu" aria-expanded="true" role="menuitem" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
     <div class="positioning-region" b-dpnvrc1pyz="">
       <div class="content-region" b-dpnvrc1pyz="">
         <svg style="width: 20px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">
@@ -8,4 +8,5 @@
         </svg>
       </div>
     </div>
-  </div>NavGroups and NavLinks here</div>
\ No newline at end of file
+  </div>NavGroups and NavLinks here
+</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CollapsibleCustomTitle.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CollapsibleCustomTitle.verified.html
index d6b657561e..43c5ffaa94 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CollapsibleCustomTitle.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CollapsibleCustomTitle.verified.html
@@ -1,6 +1,6 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 100%;" b-dpnvrc1pyz="">
-  <div aria-label="Custom title" aria-expanded="true" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
+<div id="xxx" class="fluent-nav-menu" style="width: 100%;" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">
+  <div aria-label="Custom title" aria-expanded="true" role="menuitem" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
     <div class="positioning-region" b-dpnvrc1pyz="">
       <div class="content-region" b-dpnvrc1pyz="">
         <svg style="width: 20px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">
@@ -8,4 +8,5 @@
         </svg>
       </div>
     </div>
-  </div>NavGroups and NavLinks here</div>
\ No newline at end of file
+  </div>NavGroups and NavLinks here
+</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CustomTitle.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CustomTitle.verified.html
index 39ec9a18d1..b60667ff99 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CustomTitle.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_CustomTitle.verified.html
@@ -1,2 +1,2 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Custom title" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
\ No newline at end of file
+<div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Custom title" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Default.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Default.verified.html
index bbf9fd18df..d29cc3f357 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Default.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Default.verified.html
@@ -1,2 +1,2 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
\ No newline at end of file
+<div id="xxx" class="fluent-nav-menu" style="width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_ExpanderContent.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_ExpanderContent.verified.html
index ab9e5b4c22..e1bc74056a 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_ExpanderContent.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_ExpanderContent.verified.html
@@ -1,6 +1,6 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 100%;" b-dpnvrc1pyz="">
-  <div aria-label="Navigation menu" aria-expanded="true" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
+<div id="xxx" class="fluent-nav-menu" style="width: 100%;" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">
+  <div aria-label="Navigation menu" aria-expanded="true" role="menuitem" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
     <div class="positioning-region" b-dpnvrc1pyz="">
       <div class="content-region" b-dpnvrc1pyz="">
         <div>custom expander</div>
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Margin.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Margin.verified.html
index a3874c3e52..86e397a7e9 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Margin.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Margin.verified.html
@@ -1,2 +1,2 @@
 
-<div id="xxx" class="fluent-nav-menu" style="margin: 5px 15px; width: 100%;" aria-label="Navigation menu" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
\ No newline at end of file
+<div id="xxx" class="fluent-nav-menu" style="margin: 5px 15px; width: 100%;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_NotExpanded.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_NotExpanded.verified.html
index 40aabf93c6..3825330db9 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_NotExpanded.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_NotExpanded.verified.html
@@ -1,2 +1,2 @@
 
-<div id="xxx" class="collapsed fluent-nav-menu" style="width: 40px; min-width: 40px;" aria-label="Navigation menu" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
\ No newline at end of file
+<div id="xxx" class="collapsed fluent-nav-menu" style="width: 40px; min-width: 40px;" aria-label="Navigation menu" role="menu" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
\ No newline at end of file
diff --git a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Width.verified.html b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Width.verified.html
index f1c083ae5b..7906f8fad5 100644
--- a/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Width.verified.html
+++ b/tests/Core/NavMenu/FluentNavMenuTests.FluentNavMenu_Width.verified.html
@@ -1,2 +1,2 @@
 
-<div id="xxx" class="fluent-nav-menu" style="width: 300px;" aria-label="Navigation menu" b-dpnvrc1pyz="">NavGroups and NavLinks here</div>
\ No newline at end of file
+<div id="xxx" class="fluent-nav-menu" style="width: 300px;" aria-label="Navigation menu" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">NavGroups and NavLinks here</div>
\ No newline at end of file
diff --git a/tests/Core/_ToDo/MainLayout/FluentMainLayoutTests.FluentMainLayout_Default.verified.html b/tests/Core/_ToDo/MainLayout/FluentMainLayoutTests.FluentMainLayout_Default.verified.html
index ebab5e96b2..bbc4040704 100644
--- a/tests/Core/_ToDo/MainLayout/FluentMainLayoutTests.FluentMainLayout_Default.verified.html
+++ b/tests/Core/_ToDo/MainLayout/FluentMainLayoutTests.FluentMainLayout_Default.verified.html
@@ -7,8 +7,8 @@
   </header>
   <b>render me</b>
   <div class="stack-horizontal" style="justify-content: start; align-items: start; column-gap: 0px; row-gap: 10px; width: 100%; height:calc(100% - var(--header-height));" b-rm53amj1yp="">
-    <div id="xxx" class="main-layout-navmenu fluent-nav-menu" style="width: 200px;" b-dpnvrc1pyz="" blazor:elementreference="xxx">
-      <div aria-expanded="true" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
+    <div id="xxx" class="main-layout-navmenu fluent-nav-menu" style="width: 200px;" role="menu" aria-expanded="" b-dpnvrc1pyz="" blazor:elementreference="xxx">
+      <div aria-expanded="true" role="menuitem" class="fluent-nav-item" tabindex="0" blazor:onclick="1" blazor:onkeydown="2" b-dpnvrc1pyz="">
         <div class="positioning-region" b-dpnvrc1pyz="">
           <div class="content-region" b-dpnvrc1pyz="">
             <svg style="width: 20px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">