From 85ce26f0d558ab17cd2c436c40ad87eef31d0d7f Mon Sep 17 00:00:00 2001
From: Howard Edwards <howarde.edwards@gmail.com>
Date: Fri, 4 Feb 2022 10:50:37 -0500
Subject: [PATCH 1/4] generate-and-commit-files.yml change to account for
 deeper commit history and using source branch of PR for ref

---
 .github/workflows/generate-and-commit-files.yml | 12 ++++--------
 .github/workflows/js-lint.yml                   |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/generate-and-commit-files.yml b/.github/workflows/generate-and-commit-files.yml
index 865b37ac8..f566e87ba 100644
--- a/.github/workflows/generate-and-commit-files.yml
+++ b/.github/workflows/generate-and-commit-files.yml
@@ -12,7 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ github.head_ref }}
+          ref: refs/pull/${{ github.event.pull_request.number }}/head
+          fetch-depth: 0
 
       - name: Use Node.js
         uses: actions/setup-node@v1
@@ -22,12 +23,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      # - name: Generate test files
-      #   run: npm run create-all-tests
-
-      # - name: Generate review files
-      #   run: npm run review-tests
-
       - name: Generate test and review files
         run: npm run build
 
@@ -41,7 +36,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ github.head_ref }}
+          ref: refs/pull/${{ github.event.pull_request.number }}/head
+          fetch-depth: 0
 
       - name: Use Node.js
         uses: actions/setup-node@v1
diff --git a/.github/workflows/js-lint.yml b/.github/workflows/js-lint.yml
index d0d6e6f6b..86097ff6d 100644
--- a/.github/workflows/js-lint.yml
+++ b/.github/workflows/js-lint.yml
@@ -29,5 +29,5 @@ jobs:
     - name: Install dependencies
       run: npm ci
 
-    - name: Generate test files
+    - name: Run linter
       run: npm run lint

From 4933a79c8d3bdbd377d3d519a6270bb937c95341 Mon Sep 17 00:00:00 2001
From: howard-e <howard-e@users.noreply.github.com>
Date: Mon, 7 Feb 2022 13:17:13 +0000
Subject: [PATCH 2/4] Generate test and review files automatically

---
 build/index.html                              | 311 +++++++++---------
 build/review/alert.html                       |  52 +--
 build/review/banner.html                      | 116 +++----
 build/review/breadcrumb.html                  |  68 ++--
 build/review/checkbox-tri-state.html          | 108 +++---
 build/review/checkbox.html                    | 114 +++----
 .../combobox-autocomplete-both-updated.html   | 284 +++++++---------
 build/review/combobox-select-only.html        | 202 +++++-------
 build/review/command-button.html              |  68 ++--
 build/review/complementary.html               | 100 ++----
 build/review/contentinfo.html                 |  84 ++---
 build/review/datepicker-spin-button.html      |  92 ++----
 build/review/disclosure-faq.html              | 114 +++----
 build/review/disclosure-navigation.html       | 164 ++++-----
 build/review/form.html                        | 100 ++----
 build/review/horizontal-slider.html           |  92 ++----
 build/review/main.html                        |  88 ++---
 ...menu-button-actions-active-descendant.html | 104 +++---
 build/review/menu-button-actions.html         | 104 +++---
 build/review/menubar-editor.html              | 144 ++++----
 build/review/meter.html                       |  70 ++--
 build/review/minimal-data-grid.html           | 261 +++++++--------
 build/review/modal-dialog.html                | 120 +++----
 .../radiogroup-aria-activedescendant.html     | 140 ++++----
 build/review/radiogroup-roving-tabindex.html  | 140 ++++----
 build/review/rating-slider.html               |  92 ++----
 build/review/seek-slider.html                 |  92 ++----
 build/review/switch.html                      | 108 +++---
 build/review/tabs-manual-activation.html      | 116 +++----
 build/review/toggle-button.html               | 108 +++---
 build/review/vertical-temperature-slider.html |  92 ++----
 31 files changed, 1510 insertions(+), 2338 deletions(-)

diff --git a/build/index.html b/build/index.html
index 7b8afdd2f..6c67bb876 100644
--- a/build/index.html
+++ b/build/index.html
@@ -21,15 +21,6 @@
         padding: .5em;
       }
 
-      td > p {
-        margin: 0;
-      }
-
-      tr:not(:first-of-type) th {
-        padding: .5em;
-        text-align: left;
-      }
-
     </style>
   </head>
   <body>
@@ -41,247 +32,247 @@ <h1>Test Patterns for Review</h1>
         <th>Pattern</th>
         <th>Index Page</th>
         <th>Review Page</th>
-        <th>Number of Tests</th>
+        <th># of Tests</th>
         <th>Commit of Last Change</th>
       </tr>
           <tr>
-            <th>alert</th>
-            <td><a href="./tests/alert/index.html" aria-label="Index: alert">Index</a></td>
-            <td><a href="./review/alert.html" aria-label="Review: alert">Review</a></td>
-            <td><p aria-label="Number of Tests: 3">3</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>alert</td>
+            <td><a href="./tests/alert/index.html">Index</a></td>
+            <td><a href="./review/alert.html">Review</a></td>
+            <td>3</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/9ccc7888" target="_blank">9ccc7888 Add Alert and Breadcrumb test plan titles (#529)
 </a></td>
           </tr>
           <tr>
-            <th>banner</th>
-            <td><a href="./tests/banner/index.html" aria-label="Index: banner">Index</a></td>
-            <td><a href="./review/banner.html" aria-label="Review: banner">Review</a></td>
-            <td><p aria-label="Number of Tests: 26">26</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>banner</td>
+            <td><a href="./tests/banner/index.html">Index</a></td>
+            <td><a href="./review/banner.html">Review</a></td>
+            <td>26</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/0c61f715" target="_blank">0c61f715 Revert &quot;Update JAWS commands for banner landmark tests, in line with JAWS 2022 updates&quot; (#602)
 </a></td>
           </tr>
           <tr>
-            <th>breadcrumb</th>
-            <td><a href="./tests/breadcrumb/index.html" aria-label="Index: breadcrumb">Index</a></td>
-            <td><a href="./review/breadcrumb.html" aria-label="Review: breadcrumb">Review</a></td>
-            <td><p aria-label="Number of Tests: 9">9</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>breadcrumb</td>
+            <td><a href="./tests/breadcrumb/index.html">Index</a></td>
+            <td><a href="./review/breadcrumb.html">Review</a></td>
+            <td>9</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/a2434b1e" target="_blank">a2434b1e Breadcrumb: fix misquoted strings in commands.csv (#540)
 </a></td>
           </tr>
           <tr>
-            <th>checkbox</th>
-            <td><a href="./tests/checkbox/index.html" aria-label="Index: checkbox">Index</a></td>
-            <td><a href="./review/checkbox.html" aria-label="Review: checkbox">Review</a></td>
-            <td><p aria-label="Number of Tests: 26">26</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>checkbox</td>
+            <td><a href="./tests/checkbox/index.html">Index</a></td>
+            <td><a href="./review/checkbox.html">Review</a></td>
+            <td>26</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/c2df595d" target="_blank">c2df595d Move test plan titles for app from support.json to references.csv (#473)
 </a></td>
           </tr>
           <tr>
-            <th>checkbox-tri-state</th>
-            <td><a href="./tests/checkbox-tri-state/index.html" aria-label="Index: checkbox-tri-state">Index</a></td>
-            <td><a href="./review/checkbox-tri-state.html" aria-label="Review: checkbox-tri-state">Review</a></td>
-            <td><p aria-label="Number of Tests: 24">24</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>checkbox-tri-state</td>
+            <td><a href="./tests/checkbox-tri-state/index.html">Index</a></td>
+            <td><a href="./review/checkbox-tri-state.html">Review</a></td>
+            <td>24</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>combobox-autocomplete-both-updated</th>
-            <td><a href="./tests/combobox-autocomplete-both-updated/index.html" aria-label="Index: combobox-autocomplete-both-updated">Index</a></td>
-            <td><a href="./review/combobox-autocomplete-both-updated.html" aria-label="Review: combobox-autocomplete-both-updated">Review</a></td>
-            <td><p aria-label="Number of Tests: 76">76</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>combobox-autocomplete-both-updated</td>
+            <td><a href="./tests/combobox-autocomplete-both-updated/index.html">Index</a></td>
+            <td><a href="./review/combobox-autocomplete-both-updated.html">Review</a></td>
+            <td>76</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>combobox-select-only</th>
-            <td><a href="./tests/combobox-select-only/index.html" aria-label="Index: combobox-select-only">Index</a></td>
-            <td><a href="./review/combobox-select-only.html" aria-label="Review: combobox-select-only">Review</a></td>
-            <td><p aria-label="Number of Tests: 38">38</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>combobox-select-only</td>
+            <td><a href="./tests/combobox-select-only/index.html">Index</a></td>
+            <td><a href="./review/combobox-select-only.html">Review</a></td>
+            <td>38</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>command-button</th>
-            <td><a href="./tests/command-button/index.html" aria-label="Index: command-button">Index</a></td>
-            <td><a href="./review/command-button.html" aria-label="Review: command-button">Review</a></td>
-            <td><p aria-label="Number of Tests: 9">9</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>command-button</td>
+            <td><a href="./tests/command-button/index.html">Index</a></td>
+            <td><a href="./review/command-button.html">Review</a></td>
+            <td>9</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>complementary</th>
-            <td><a href="./tests/complementary/index.html" aria-label="Index: complementary">Index</a></td>
-            <td><a href="./review/complementary.html" aria-label="Review: complementary">Review</a></td>
-            <td><p aria-label="Number of Tests: 20">20</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>complementary</td>
+            <td><a href="./tests/complementary/index.html">Index</a></td>
+            <td><a href="./review/complementary.html">Review</a></td>
+            <td>20</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/03b8747f" target="_blank">03b8747f Create tests for APG design pattern example: Contentinfo Landmark (#549)
 </a></td>
           </tr>
           <tr>
-            <th>contentinfo</th>
-            <td><a href="./tests/contentinfo/index.html" aria-label="Index: contentinfo">Index</a></td>
-            <td><a href="./review/contentinfo.html" aria-label="Review: contentinfo">Review</a></td>
-            <td><p aria-label="Number of Tests: 16">16</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>contentinfo</td>
+            <td><a href="./tests/contentinfo/index.html">Index</a></td>
+            <td><a href="./review/contentinfo.html">Review</a></td>
+            <td>16</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/03b8747f" target="_blank">03b8747f Create tests for APG design pattern example: Contentinfo Landmark (#549)
 </a></td>
           </tr>
           <tr>
-            <th>datepicker-spin-button</th>
-            <td><a href="./tests/datepicker-spin-button/index.html" aria-label="Index: datepicker-spin-button">Index</a></td>
-            <td><a href="./review/datepicker-spin-button.html" aria-label="Review: datepicker-spin-button">Review</a></td>
-            <td><p aria-label="Number of Tests: 21">21</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>datepicker-spin-button</td>
+            <td><a href="./tests/datepicker-spin-button/index.html">Index</a></td>
+            <td><a href="./review/datepicker-spin-button.html">Review</a></td>
+            <td>21</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/0483d7ea" target="_blank">0483d7ea Create tests for APG design pattern example: Date Picker Spin Button (#411)
 </a></td>
           </tr>
           <tr>
-            <th>disclosure-faq</th>
-            <td><a href="./tests/disclosure-faq/index.html" aria-label="Index: disclosure-faq">Index</a></td>
-            <td><a href="./review/disclosure-faq.html" aria-label="Review: disclosure-faq">Review</a></td>
-            <td><p aria-label="Number of Tests: 26">26</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>disclosure-faq</td>
+            <td><a href="./tests/disclosure-faq/index.html">Index</a></td>
+            <td><a href="./review/disclosure-faq.html">Review</a></td>
+            <td>26</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>disclosure-navigation</th>
-            <td><a href="./tests/disclosure-navigation/index.html" aria-label="Index: disclosure-navigation">Index</a></td>
-            <td><a href="./review/disclosure-navigation.html" aria-label="Review: disclosure-navigation">Review</a></td>
-            <td><p aria-label="Number of Tests: 46">46</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>disclosure-navigation</td>
+            <td><a href="./tests/disclosure-navigation/index.html">Index</a></td>
+            <td><a href="./review/disclosure-navigation.html">Review</a></td>
+            <td>46</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/b2ceec70" target="_blank">b2ceec70 Remove Space from tests 45 and 46 in disclosure navigation test plan (#585)
 </a></td>
           </tr>
           <tr>
-            <th>form</th>
-            <td><a href="./tests/form/index.html" aria-label="Index: form">Index</a></td>
-            <td><a href="./review/form.html" aria-label="Review: form">Review</a></td>
-            <td><p aria-label="Number of Tests: 20">20</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>form</td>
+            <td><a href="./tests/form/index.html">Index</a></td>
+            <td><a href="./review/form.html">Review</a></td>
+            <td>20</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/53792c23" target="_blank">53792c23 Create tests for APG design pattern example: Form Landmark (#551)
 </a></td>
           </tr>
           <tr>
-            <th>horizontal-slider</th>
-            <td><a href="./tests/horizontal-slider/index.html" aria-label="Index: horizontal-slider">Index</a></td>
-            <td><a href="./review/horizontal-slider.html" aria-label="Review: horizontal-slider">Review</a></td>
-            <td><p aria-label="Number of Tests: 21">21</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>horizontal-slider</td>
+            <td><a href="./tests/horizontal-slider/index.html">Index</a></td>
+            <td><a href="./review/horizontal-slider.html">Review</a></td>
+            <td>21</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/49e2a000" target="_blank">49e2a000 Create tests for APG design pattern example: Color Viewer Slider (#414)
 </a></td>
           </tr>
           <tr>
-            <th>main</th>
-            <td><a href="./tests/main/index.html" aria-label="Index: main">Index</a></td>
-            <td><a href="./review/main.html" aria-label="Review: main">Review</a></td>
-            <td><p aria-label="Number of Tests: 16">16</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>main</td>
+            <td><a href="./tests/main/index.html">Index</a></td>
+            <td><a href="./review/main.html">Review</a></td>
+            <td>16</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/4ed847af" target="_blank">4ed847af Create tests for APG design pattern example: Main Landmark (#553)
 </a></td>
           </tr>
           <tr>
-            <th>menu-button-actions</th>
-            <td><a href="./tests/menu-button-actions/index.html" aria-label="Index: menu-button-actions">Index</a></td>
-            <td><a href="./review/menu-button-actions.html" aria-label="Review: menu-button-actions">Review</a></td>
-            <td><p aria-label="Number of Tests: 26">26</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>menu-button-actions</td>
+            <td><a href="./tests/menu-button-actions/index.html">Index</a></td>
+            <td><a href="./review/menu-button-actions.html">Review</a></td>
+            <td>26</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>menu-button-actions-active-descendant</th>
-            <td><a href="./tests/menu-button-actions-active-descendant/index.html" aria-label="Index: menu-button-actions-active-descendant">Index</a></td>
-            <td><a href="./review/menu-button-actions-active-descendant.html" aria-label="Review: menu-button-actions-active-descendant">Review</a></td>
-            <td><p aria-label="Number of Tests: 26">26</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>menu-button-actions-active-descendant</td>
+            <td><a href="./tests/menu-button-actions-active-descendant/index.html">Index</a></td>
+            <td><a href="./review/menu-button-actions-active-descendant.html">Review</a></td>
+            <td>26</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>menubar-editor</th>
-            <td><a href="./tests/menubar-editor/index.html" aria-label="Index: menubar-editor">Index</a></td>
-            <td><a href="./review/menubar-editor.html" aria-label="Review: menubar-editor">Review</a></td>
-            <td><p aria-label="Number of Tests: 40">40</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>menubar-editor</td>
+            <td><a href="./tests/menubar-editor/index.html">Index</a></td>
+            <td><a href="./review/menubar-editor.html">Review</a></td>
+            <td>40</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/05c4cf59" target="_blank">05c4cf59 Standardize code style (#484)
 </a></td>
           </tr>
           <tr>
-            <th>meter</th>
-            <td><a href="./tests/meter/index.html" aria-label="Index: meter">Index</a></td>
-            <td><a href="./review/meter.html" aria-label="Review: meter">Review</a></td>
-            <td><p aria-label="Number of Tests: 9">9</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>meter</td>
+            <td><a href="./tests/meter/index.html">Index</a></td>
+            <td><a href="./review/meter.html">Review</a></td>
+            <td>9</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/0177f9e7" target="_blank">0177f9e7 Create tests for APG design pattern example: meter (#571)
 </a></td>
           </tr>
           <tr>
-            <th>minimal-data-grid</th>
-            <td><a href="./tests/minimal-data-grid/index.html" aria-label="Index: minimal-data-grid">Index</a></td>
-            <td><a href="./review/minimal-data-grid.html" aria-label="Review: minimal-data-grid">Review</a></td>
-            <td><p aria-label="Number of Tests: 55">55</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>minimal-data-grid</td>
+            <td><a href="./tests/minimal-data-grid/index.html">Index</a></td>
+            <td><a href="./review/minimal-data-grid.html">Review</a></td>
+            <td>55</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>modal-dialog</th>
-            <td><a href="./tests/modal-dialog/index.html" aria-label="Index: modal-dialog">Index</a></td>
-            <td><a href="./review/modal-dialog.html" aria-label="Review: modal-dialog">Review</a></td>
-            <td><p aria-label="Number of Tests: 29">29</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>modal-dialog</td>
+            <td><a href="./tests/modal-dialog/index.html">Index</a></td>
+            <td><a href="./review/modal-dialog.html">Review</a></td>
+            <td>29</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/04ed13d5" target="_blank">04ed13d5 Fix typo in modal-dialog metadata (#527)
 </a></td>
           </tr>
           <tr>
-            <th>radiogroup-aria-activedescendant</th>
-            <td><a href="./tests/radiogroup-aria-activedescendant/index.html" aria-label="Index: radiogroup-aria-activedescendant">Index</a></td>
-            <td><a href="./review/radiogroup-aria-activedescendant.html" aria-label="Review: radiogroup-aria-activedescendant">Review</a></td>
-            <td><p aria-label="Number of Tests: 39">39</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>radiogroup-aria-activedescendant</td>
+            <td><a href="./tests/radiogroup-aria-activedescendant/index.html">Index</a></td>
+            <td><a href="./review/radiogroup-aria-activedescendant.html">Review</a></td>
+            <td>39</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>radiogroup-roving-tabindex</th>
-            <td><a href="./tests/radiogroup-roving-tabindex/index.html" aria-label="Index: radiogroup-roving-tabindex">Index</a></td>
-            <td><a href="./review/radiogroup-roving-tabindex.html" aria-label="Review: radiogroup-roving-tabindex">Review</a></td>
-            <td><p aria-label="Number of Tests: 39">39</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>radiogroup-roving-tabindex</td>
+            <td><a href="./tests/radiogroup-roving-tabindex/index.html">Index</a></td>
+            <td><a href="./review/radiogroup-roving-tabindex.html">Review</a></td>
+            <td>39</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>rating-slider</th>
-            <td><a href="./tests/rating-slider/index.html" aria-label="Index: rating-slider">Index</a></td>
-            <td><a href="./review/rating-slider.html" aria-label="Review: rating-slider">Review</a></td>
-            <td><p aria-label="Number of Tests: 21">21</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>rating-slider</td>
+            <td><a href="./tests/rating-slider/index.html">Index</a></td>
+            <td><a href="./review/rating-slider.html">Review</a></td>
+            <td>21</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/b5c67ace" target="_blank">b5c67ace Create tests for APG design pattern example: Vertical Temperature Slider (#487)
 </a></td>
           </tr>
           <tr>
-            <th>seek-slider</th>
-            <td><a href="./tests/seek-slider/index.html" aria-label="Index: seek-slider">Index</a></td>
-            <td><a href="./review/seek-slider.html" aria-label="Review: seek-slider">Review</a></td>
-            <td><p aria-label="Number of Tests: 21">21</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>seek-slider</td>
+            <td><a href="./tests/seek-slider/index.html">Index</a></td>
+            <td><a href="./review/seek-slider.html">Review</a></td>
+            <td>21</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/22c9895b" target="_blank">22c9895b Create tests for APG design pattern example: Media Seek Slider (#488)
 </a></td>
           </tr>
           <tr>
-            <th>switch</th>
-            <td><a href="./tests/switch/index.html" aria-label="Index: switch">Index</a></td>
-            <td><a href="./review/switch.html" aria-label="Review: switch">Review</a></td>
-            <td><p aria-label="Number of Tests: 24">24</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>switch</td>
+            <td><a href="./tests/switch/index.html">Index</a></td>
+            <td><a href="./review/switch.html">Review</a></td>
+            <td>24</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/d3b62389" target="_blank">d3b62389 Create tests for APG design pattern example: Switch (#543)
 </a></td>
           </tr>
           <tr>
-            <th>tabs-manual-activation</th>
-            <td><a href="./tests/tabs-manual-activation/index.html" aria-label="Index: tabs-manual-activation">Index</a></td>
-            <td><a href="./review/tabs-manual-activation.html" aria-label="Review: tabs-manual-activation">Review</a></td>
-            <td><p aria-label="Number of Tests: 29">29</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>tabs-manual-activation</td>
+            <td><a href="./tests/tabs-manual-activation/index.html">Index</a></td>
+            <td><a href="./review/tabs-manual-activation.html">Review</a></td>
+            <td>29</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
-            <th>toggle-button</th>
-            <td><a href="./tests/toggle-button/index.html" aria-label="Index: toggle-button">Index</a></td>
-            <td><a href="./review/toggle-button.html" aria-label="Review: toggle-button">Review</a></td>
-            <td><p aria-label="Number of Tests: 24">24</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>toggle-button</td>
+            <td><a href="./tests/toggle-button/index.html">Index</a></td>
+            <td><a href="./review/toggle-button.html">Review</a></td>
+            <td>24</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/acc6cb13" target="_blank">acc6cb13 Toggle Button: fix setup scripts to set state of button to &#39;pressed&#39; in some cases which were previously not accounted for (#532)
 </a></td>
           </tr>
           <tr>
-            <th>vertical-temperature-slider</th>
-            <td><a href="./tests/vertical-temperature-slider/index.html" aria-label="Index: vertical-temperature-slider">Index</a></td>
-            <td><a href="./review/vertical-temperature-slider.html" aria-label="Review: vertical-temperature-slider">Review</a></td>
-            <td><p aria-label="Number of Tests: 21">21</p></td>
-            <td><a href="https://github.com/w3c/aria-at/commit/73f3498" target="_blank">73f3498 Generate test and review files automatically
+            <td>vertical-temperature-slider</td>
+            <td><a href="./tests/vertical-temperature-slider/index.html">Index</a></td>
+            <td><a href="./review/vertical-temperature-slider.html">Review</a></td>
+            <td>21</td>
+            <td><a href="https://github.com/w3c/aria-at/commit/b5c67ace" target="_blank">b5c67ace Create tests for APG design pattern example: Vertical Temperature Slider (#487)
 </a></td>
           </tr>
     </table>
diff --git a/build/review/alert.html b/build/review/alert.html
index ce380e134..8974d4462 100644
--- a/build/review/alert.html
+++ b/build/review/alert.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: alert (3 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Trigger an alert in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Trigger an alert in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 14:44:12 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/alert/test-01-trigger-alert-reading.html?at=jaws">jaws</a></li>
@@ -924,7 +896,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Trigger Alert&#39; button, activate the button to trigger the alert. using the following commands:
                <ul>
                    <li>Space</li>
@@ -945,7 +917,7 @@ <h2 class="jaws nvda">Test 2: Trigger an alert in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 14:44:12 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/alert/test-02-trigger-alert-interaction.html?at=jaws">jaws</a></li>
@@ -1020,7 +992,7 @@ <h2 class="voiceover_macos">Test 3: Trigger an alert</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 14:44:12 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/alert/test-03-trigger-alert-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/banner.html b/build/review/banner.html
index 6ed9a0e3b..a613d2651 100644
--- a/build/review/banner.html
+++ b/build/review/banner.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: banner (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a banner landmark in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards into a banner landmark in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-01-navigate-forwards-into-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -952,7 +924,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards into a banner landmark in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-02-navigate-forwards-into-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1027,7 +999,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards into a banner landmark</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-03-navigate-forwards-into-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1076,7 +1048,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards into a banner landmark in readi
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-04-navigate-backwards-into-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1132,7 +1104,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1156,7 +1128,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards into a banner landmark in inter
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-05-navigate-backwards-into-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1231,7 +1203,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards into a banner landmark</h
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-06-navigate-backwards-into-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1280,7 +1252,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards out of a banner landmark in read
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-07-navigate-forwards-out-of-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1335,7 +1307,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1358,7 +1330,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards out of a banner landmark in inte
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-08-navigate-forwards-out-of-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1433,7 +1405,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards out of a banner landmark</
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-09-navigate-forwards-out-of-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1482,7 +1454,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards out of a banner landmark in re
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-10-navigate-backwards-out-of-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1537,7 +1509,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1560,7 +1532,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards out of a banner landmark in in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-11-navigate-backwards-out-of-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1635,7 +1607,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards out of a banner landmark
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-12-navigate-backwards-out-of-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1684,7 +1656,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a button inside a banner lan
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-13-navigate-forwards-to-a-button-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1744,7 +1716,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Skip To Content&#39; button. using the following commands:
                <ul>
                    <li>B</li>
@@ -1769,7 +1741,7 @@ <h2 class="jaws nvda">Test 14: Navigate forwards to a button inside a banner lan
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-14-navigate-forwards-to-a-button-inside-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1850,7 +1822,7 @@ <h2 class="voiceover_macos">Test 15: Navigate forwards to a button inside a bann
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 18:09:54 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-15-navigate-forwards-to-a-button-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1904,7 +1876,7 @@ <h2 class="jaws nvda">Test 16: Navigate backwards to a button inside a banner la
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-16-navigate-backwards-to-a-button-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1962,7 +1934,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Show Headings&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1986,7 +1958,7 @@ <h2 class="jaws nvda">Test 17: Navigate backwards to a button inside a banner la
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-17-navigate-backwards-to-a-button-inside-a-banner-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -2064,7 +2036,7 @@ <h2 class="voiceover_macos">Test 18: Navigate backwards to a button inside a ban
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 17:43:41 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-18-navigate-backwards-to-a-button-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2116,7 +2088,7 @@ <h2 class="jaws nvda">Test 19: Navigate forwards to an image inside a banner lan
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-19-navigate-forwards-to-an-image-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2170,7 +2142,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;W3C Logo&#39; image. using the following commands:
                <ul>
                    <li>G</li>
@@ -2191,7 +2163,7 @@ <h2 class="voiceover_macos">Test 20: Navigate forwards to an image inside a bann
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-20-navigate-forwards-to-an-image-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2239,7 +2211,7 @@ <h2 class="jaws nvda">Test 21: Navigate backwards to an image inside a banner la
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-21-navigate-backwards-to-an-image-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2293,7 +2265,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;W3C Logo&#39; image. using the following commands:
                <ul>
                    <li>Shift+G</li>
@@ -2314,7 +2286,7 @@ <h2 class="voiceover_macos">Test 22: Navigate backwards to an image inside a ban
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-22-navigate-backwards-to-an-image-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2362,7 +2334,7 @@ <h2 class="jaws nvda">Test 23: Navigate forwards to a heading inside a banner la
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-23-navigate-forwards-to-a-heading-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2418,7 +2390,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;ARIA Landmarks Example&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -2441,7 +2413,7 @@ <h2 class="voiceover_macos">Test 24: Navigate forwards to a heading inside a ban
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-24-navigate-forwards-to-a-heading-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2490,7 +2462,7 @@ <h2 class="jaws nvda">Test 25: Navigate backwards to a heading inside a banner l
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-25-navigate-backwards-to-a-heading-inside-a-banner-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2546,7 +2518,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;ARIA Landmarks Example&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
@@ -2569,7 +2541,7 @@ <h2 class="voiceover_macos">Test 26: Navigate backwards to a heading inside a ba
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 15:33:20 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/banner/test-26-navigate-backwards-to-a-heading-inside-a-banner-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/breadcrumb.html b/build/review/breadcrumb.html
index 23bd5bd03..2f3b8578c 100644
--- a/build/review/breadcrumb.html
+++ b/build/review/breadcrumb.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: breadcrumb (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first breadcrumb link in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate to the first breadcrumb link in reading m
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-01-navigate-to-first-breadcrumb-link-reading.html?at=jaws">jaws</a></li>
@@ -930,7 +902,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;WAI-ARIA Authoring Practices&#39; link. using the following commands:
                <ul>
                    <li>U</li>
@@ -959,7 +931,7 @@ <h2 class="jaws nvda">Test 2: Navigate to the last breadcrumb link in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-02-navigate-to-last-breadcrumb-link-reading.html?at=jaws">jaws</a></li>
@@ -1021,7 +993,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Breadcrumb Example&#39; link. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -1051,7 +1023,7 @@ <h2 class="jaws nvda">Test 3: Navigate to the first breadcrumb link in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-03-navigate-to-first-breadcrumb-link-interaction.html?at=jaws">jaws</a></li>
@@ -1132,7 +1104,7 @@ <h2 class="jaws nvda">Test 4: Navigate to the last breadcrumb link in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-04-navigate-to-last-breadcrumb-link-interaction.html?at=jaws">jaws</a></li>
@@ -1216,7 +1188,7 @@ <h2 class="voiceover_macos">Test 5: Navigate to the first breadcrumb link</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-05-navigate-to-first-breadcrumb-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1268,7 +1240,7 @@ <h2 class="voiceover_macos">Test 6: Navigate to the last breadcrumb link</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 22 14:54:44 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-06-navigate-to-last-breadcrumb-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1322,7 +1294,7 @@ <h2 class="jaws nvda">Test 7: Read information about a breadcrumb link in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 16:23:29 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-07-read-information-about-breadcrumb-link-reading.html?at=jaws">jaws</a></li>
@@ -1378,7 +1350,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Breadcrumb Example&#39; link, read information about the link. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1400,7 +1372,7 @@ <h2 class="jaws nvda">Test 8: Read information about a breadcrumb link in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 16:23:29 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-08-read-information-about-breadcrumb-link-interaction.html?at=jaws">jaws</a></li>
@@ -1478,7 +1450,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a breadcrumb link</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 15 16:23:29 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/breadcrumb/test-09-read-information-about-breadcrumb-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/checkbox-tri-state.html b/build/review/checkbox-tri-state.html
index 2879bda20..a477c6c71 100644
--- a/build/review/checkbox-tri-state.html
+++ b/build/review/checkbox-tri-state.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: checkbox-tri-state (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a partially checked checkbox in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a partially checked checkbox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -928,7 +900,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the partially checked state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the checkbox. using the following commands:
                <ul>
                    <li>X</li>
@@ -952,7 +924,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a partially checked checkbox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1010,7 +982,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the partially checked state. using the following commands:
                <ul>
                    <li>Shift+X</li>
@@ -1034,7 +1006,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a partially checked checkbox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1110,7 +1082,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a partially checked checkbox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1186,7 +1158,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a partially checked che
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1237,7 +1209,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a partially checked ch
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1288,7 +1260,7 @@ <h2 class="jaws nvda">Test 7: Operate a partially checked checkbox in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1340,7 +1312,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Check the first checkbox. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1359,7 +1331,7 @@ <h2 class="jaws nvda">Test 8: Operate a partially checked checkbox in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1430,7 +1402,7 @@ <h2 class="voiceover_macos">Test 9: Operate a partially checked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1477,7 +1449,7 @@ <h2 class="jaws nvda">Test 10: Operate an unchecked checkbox in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1530,7 +1502,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Partially check the first checkbox. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1549,7 +1521,7 @@ <h2 class="jaws nvda">Test 11: Operate an unchecked checkbox in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1621,7 +1593,7 @@ <h2 class="voiceover_macos">Test 12: Operate an unchecked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1669,7 +1641,7 @@ <h2 class="jaws nvda">Test 13: Read a partially checked checkbox in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1725,7 +1697,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox. Note: it should be in the partially checked state. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1747,7 +1719,7 @@ <h2 class="jaws nvda">Test 14: Read a partially checked checkbox in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1825,7 +1797,7 @@ <h2 class="voiceover_macos">Test 15: Read a partially checked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1875,7 +1847,7 @@ <h2 class="jaws nvda">Test 16: Read grouping information of a grouped, partially
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1927,7 +1899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When reading cursor is on the first checkbox, read its grouping information. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1947,7 +1919,7 @@ <h2 class="jaws nvda">Test 17: Read grouping information of a grouped, partially
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2019,7 +1991,7 @@ <h2 class="voiceover_macos">Test 18: Read grouping information of a grouped, par
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2066,7 +2038,7 @@ <h2 class="jaws nvda">Test 19: Navigate forwards into a checkbox group in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2121,7 +2093,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate forwards into the checkbox group. using the following commands:
                <ul>
                    <li>X</li>
@@ -2144,7 +2116,7 @@ <h2 class="jaws nvda">Test 20: Navigate backwards out of a checkbox group in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2197,7 +2169,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate backwards out of the checkbox group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -2218,7 +2190,7 @@ <h2 class="jaws nvda">Test 21: Navigate forwards into a checkbox group in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2292,7 +2264,7 @@ <h2 class="jaws nvda">Test 22: Navigate backwards out of a checkbox group in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2366,7 +2338,7 @@ <h2 class="voiceover_macos">Test 23: Navigate forwards into a checkbox group</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2413,7 +2385,7 @@ <h2 class="voiceover_macos">Test 24: Navigate backwards out of a checkbox group<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/checkbox.html b/build/review/checkbox.html
index c4802e648..c8c0617e7 100644
--- a/build/review/checkbox.html
+++ b/build/review/checkbox.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: checkbox (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to an unchecked checkbox in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate to an unchecked checkbox in reading mode<
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -919,7 +891,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the unchecked state. using the following commands:
                <ul>
                    <li>X &#x2F; Shift+X</li>
@@ -943,7 +915,7 @@ <h2 class="jaws nvda">Test 2: Navigate to an unchecked checkbox in interaction m
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1009,7 +981,7 @@ <h2 class="voiceover_macos">Test 3: Navigate to an unchecked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1055,7 +1027,7 @@ <h2 class="jaws nvda">Test 4: Navigate to a checked checkbox in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1114,7 +1086,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the checked state. using the following commands:
                <ul>
                    <li>X &#x2F; Shift+X</li>
@@ -1138,7 +1110,7 @@ <h2 class="jaws nvda">Test 5: Navigate to a checked checkbox in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1214,7 +1186,7 @@ <h2 class="voiceover_macos">Test 6: Navigate to a checked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1265,7 +1237,7 @@ <h2 class="jaws nvda">Test 7: Operate a checkbox in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-07-operate-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1308,7 +1280,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Check and uncheck the first checkbox. using the following commands:
                <ul>
                    <li>Enter</li>
@@ -1328,7 +1300,7 @@ <h2 class="jaws nvda">Test 8: Operate a checkbox in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-08-operate-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1389,7 +1361,7 @@ <h2 class="voiceover_macos">Test 9: Operate a checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-09-operate-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1431,7 +1403,7 @@ <h2 class="jaws nvda">Test 10: Read an unchecked checkbox in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-10-read-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1487,7 +1459,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1509,7 +1481,7 @@ <h2 class="jaws nvda">Test 11: Read an unchecked checkbox in interaction mode</h
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-11-read-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1587,7 +1559,7 @@ <h2 class="voiceover_macos">Test 12: Read an unchecked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-12-read-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1637,7 +1609,7 @@ <h2 class="jaws nvda">Test 13: Read a checked checkbox in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-13-read-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1693,7 +1665,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox.  Note: it should be in the checked state. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1715,7 +1687,7 @@ <h2 class="jaws nvda">Test 14: Read a checked checkbox in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-14-read-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1793,7 +1765,7 @@ <h2 class="voiceover_macos">Test 15: Read a checked checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-15-read-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1843,7 +1815,7 @@ <h2 class="jaws nvda">Test 16: Read grouping information of a grouped checkbox i
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1887,7 +1859,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When reading cursor is on a checkbox, read its grouping information using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1907,7 +1879,7 @@ <h2 class="jaws nvda">Test 17: Read grouping information of a grouped checkbox i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1971,7 +1943,7 @@ <h2 class="voiceover_macos">Test 18: Read grouping information of a grouped chec
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2015,7 +1987,7 @@ <h2 class="jaws nvda">Test 19: Navigate sequentially through a checkbox group in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2062,7 +2034,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate both forward and backward into and out of  the checkbox group. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -2084,7 +2056,7 @@ <h2 class="voiceover_macos">Test 20: Navigate sequentially through a checkbox gr
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-20-navigate-sequentially-through-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2130,7 +2102,7 @@ <h2 class="jaws nvda">Test 21: Navigate into a checkbox group in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-21-navigate-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2181,7 +2153,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate from outside the checkbox group to a checkbox inside the group. Test both navigating forward into the start and backward into the end. using the following commands:
                <ul>
                    <li>X</li>
@@ -2207,7 +2179,7 @@ <h2 class="jaws nvda">Test 22: Navigate into a checkbox group in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2276,7 +2248,7 @@ <h2 class="voiceover_macos">Test 23: Navigate into a checkbox group</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2326,7 +2298,7 @@ <h2 class="jaws nvda">Test 24: Navigate out of a checkbox group  in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2373,7 +2345,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate from a checkbox inside the checkbox group to an element outside the checkbox group. Test both navigating forward out of the end and backward out of the start. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -2395,7 +2367,7 @@ <h2 class="jaws nvda">Test 25: Navigate out of a checkbox group in interaction m
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2464,7 +2436,7 @@ <h2 class="voiceover_macos">Test 26: Navigate out of a checkbox group</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/combobox-autocomplete-both-updated.html b/build/review/combobox-autocomplete-both-updated.html
index 5db3937f1..fb84fcd2d 100644
--- a/build/review/combobox-autocomplete-both-updated.html
+++ b/build/review/combobox-autocomplete-both-updated.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: combobox-autocomplete-both-updated (76 tests)<
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to an empty, collapsed combobox in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -901,13 +873,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow, then Down Arrow</li>
+                   <li>Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -932,14 +904,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow, then Down Arrow</li>
+                   <li>Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -959,7 +931,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -990,13 +962,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1021,14 +993,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1048,7 +1020,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1079,7 +1051,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1107,7 +1079,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1129,7 +1101,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1160,7 +1132,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1188,7 +1160,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1210,7 +1182,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to an empty, collapsed com
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1240,9 +1212,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right, then Control+Option+Right</li>
+                   <li>Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1264,7 +1236,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to an empty, collapsed co
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1294,9 +1266,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -1318,7 +1290,7 @@ <h2 class="jaws nvda">Test 7: Read information about an empty, collapsed combobo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1377,7 +1349,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1401,7 +1373,7 @@ <h2 class="jaws nvda">Test 8: Read information about an empty, collapsed combobo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1482,7 +1454,7 @@ <h2 class="voiceover_macos">Test 9: Read information about an empty, collapsed c
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1535,7 +1507,7 @@ <h2 class="jaws nvda">Test 10: Navigate forwards to a filled in, collapsed combo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1566,13 +1538,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow, then Down Arrow</li>
+                   <li>Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1599,14 +1571,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow, then Down Arrow</li>
+                   <li>Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1628,7 +1600,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards to a filled in, collapsed comb
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1659,13 +1631,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1692,14 +1664,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1721,7 +1693,7 @@ <h2 class="jaws nvda">Test 12: Navigate forwards to a filled in, collapsed combo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1752,7 +1724,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1782,7 +1754,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1806,7 +1778,7 @@ <h2 class="jaws nvda">Test 13: Navigate backwards to a filled in, collapsed comb
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1837,7 +1809,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1867,7 +1839,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1891,7 +1863,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a filled in, collapsed
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1921,9 +1893,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right, then Control+Option+Right</li>
+                   <li>Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1947,7 +1919,7 @@ <h2 class="voiceover_macos">Test 15: Navigate backwards to a filled in, collapse
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1977,9 +1949,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -2003,7 +1975,7 @@ <h2 class="jaws nvda">Test 16: Read information about a filled in, collapsed com
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2064,7 +2036,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2090,7 +2062,7 @@ <h2 class="jaws nvda">Test 17: Read information about a filled in, collapsed com
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2175,7 +2147,7 @@ <h2 class="voiceover_macos">Test 18: Read information about a filled in, collaps
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2230,7 +2202,7 @@ <h2 class="jaws nvda">Test 19: Open an empty, collapsed combobox in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2283,7 +2255,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox without moving into the listbox popup. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -2303,7 +2275,7 @@ <h2 class="jaws nvda">Test 20: Open an empty, collapsed combobox in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2376,7 +2348,7 @@ <h2 class="voiceover_macos">Test 21: Open an empty, collapsed combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2423,7 +2395,7 @@ <h2 class="jaws nvda">Test 22: Open a filled in, collapsed combobox in reading m
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2476,7 +2448,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox without moving into the listbox popup. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -2496,7 +2468,7 @@ <h2 class="jaws nvda">Test 23: Open a filled in, collapsed combobox in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2569,7 +2541,7 @@ <h2 class="voiceover_macos">Test 24: Open a filled in, collapsed combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2616,7 +2588,7 @@ <h2 class="jaws nvda">Test 25: Open an empty, collapsed combobox by typing a cha
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2691,7 +2663,7 @@ <h2 class="voiceover_macos">Test 26: Open an empty, collapsed combobox by typing
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2739,7 +2711,7 @@ <h2 class="jaws nvda">Test 27: Open a filled in, collapsed combobox by typing a
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2814,7 +2786,7 @@ <h2 class="voiceover_macos">Test 28: Open a filled in, collapsed combobox by typ
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2862,7 +2834,7 @@ <h2 class="jaws nvda">Test 29: Read information about an empty, expanded combobo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2921,7 +2893,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2945,7 +2917,7 @@ <h2 class="jaws nvda">Test 30: Read information about an empty, expanded combobo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3026,7 +2998,7 @@ <h2 class="voiceover_macos">Test 31: Read information about an empty, expanded c
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3079,7 +3051,7 @@ <h2 class="jaws nvda">Test 32: Read information about a filled in, expanded comb
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html?at=jaws">jaws</a></li>
@@ -3140,7 +3112,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3166,7 +3138,7 @@ <h2 class="jaws nvda">Test 33: Read information about a filled in, expanded comb
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3251,7 +3223,7 @@ <h2 class="voiceover_macos">Test 34: Read information about a filled in, expande
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3306,7 +3278,7 @@ <h2 class="jaws nvda">Test 35: Narrow down the matching options in an empty, exp
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3378,7 +3350,7 @@ <h2 class="voiceover_macos">Test 36: Narrow down the matching options in an empt
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3424,7 +3396,7 @@ <h2 class="jaws nvda">Test 37: Narrow down the matching options in a filled in,
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3496,7 +3468,7 @@ <h2 class="voiceover_macos">Test 38: Narrow down the matching options in a fille
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3542,7 +3514,7 @@ <h2 class="jaws nvda">Test 39: Close an empty combobox in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html?at=jaws">jaws</a></li>
@@ -3594,7 +3566,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, close the combobox. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -3613,7 +3585,7 @@ <h2 class="jaws nvda">Test 40: Close an empty combobox in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3686,7 +3658,7 @@ <h2 class="voiceover_macos">Test 41: Close an empty combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3733,7 +3705,7 @@ <h2 class="jaws nvda">Test 42: Close a filled in combobox in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html?at=jaws">jaws</a></li>
@@ -3785,7 +3757,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, close the combobox. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -3804,7 +3776,7 @@ <h2 class="jaws nvda">Test 43: Close a filled in combobox in interaction mode</h
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3877,7 +3849,7 @@ <h2 class="voiceover_macos">Test 44: Close a filled in combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3924,7 +3896,7 @@ <h2 class="jaws nvda">Test 45: Navigate from an empty, collapsed combobox to the
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4011,7 +3983,7 @@ <h2 class="voiceover_macos">Test 46: Navigate from an empty, collapsed combobox
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4067,7 +4039,7 @@ <h2 class="jaws nvda">Test 47: Navigate from an empty, collapsed combobox to the
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4152,7 +4124,7 @@ <h2 class="voiceover_macos">Test 48: Navigate from an empty, collapsed combobox
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4207,7 +4179,7 @@ <h2 class="jaws nvda">Test 49: Navigate from a filled in, collapsed combobox to
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4294,7 +4266,7 @@ <h2 class="voiceover_macos">Test 50: Navigate from a filled in, collapsed combob
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4350,7 +4322,7 @@ <h2 class="jaws nvda">Test 51: Navigate from a filled in, collapsed combobox to
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4437,7 +4409,7 @@ <h2 class="voiceover_macos">Test 52: Navigate from a filled in, collapsed combob
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4493,7 +4465,7 @@ <h2 class="jaws nvda">Test 53: Navigate from an empty, expanded combobox to the
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4578,7 +4550,7 @@ <h2 class="voiceover_macos">Test 54: Navigate from an empty, expanded combobox t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4633,7 +4605,7 @@ <h2 class="jaws nvda">Test 55: Navigate from an empty, expanded combobox to the
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4718,7 +4690,7 @@ <h2 class="voiceover_macos">Test 56: Navigate from an empty, expanded combobox t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4773,7 +4745,7 @@ <h2 class="jaws nvda">Test 57: Navigate from a filled in, expanded combobox to t
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4858,7 +4830,7 @@ <h2 class="voiceover_macos">Test 58: Navigate from a filled in, expanded combobo
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4913,7 +4885,7 @@ <h2 class="jaws nvda">Test 59: Navigate from a filled in, expanded combobox to t
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4998,7 +4970,7 @@ <h2 class="voiceover_macos">Test 60: Navigate from a filled in, expanded combobo
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5053,7 +5025,7 @@ <h2 class="jaws nvda">Test 61: Navigate to the next option in a listbox popup in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5140,7 +5112,7 @@ <h2 class="voiceover_macos">Test 62: Navigate to the next option in a listbox po
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5197,7 +5169,7 @@ <h2 class="jaws nvda">Test 63: Navigate to the  previous option in a listbox pop
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5284,7 +5256,7 @@ <h2 class="voiceover_macos">Test 64: Navigate to the  previous option in a listb
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5341,7 +5313,7 @@ <h2 class="jaws nvda">Test 65: Read information about a listbox popup in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5425,7 +5397,7 @@ <h2 class="voiceover_macos">Test 66: Read information about a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5480,7 +5452,7 @@ <h2 class="jaws nvda">Test 67: Navigate out of a listbox popup by moving the edi
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html?at=jaws">jaws</a></li>
@@ -5565,7 +5537,7 @@ <h2 class="jaws nvda">Test 68: Navigate out of a listbox popup by moving the edi
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html?at=jaws">jaws</a></li>
@@ -5650,7 +5622,7 @@ <h2 class="voiceover_macos">Test 69: Navigate out of a listbox popup by moving t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5704,7 +5676,7 @@ <h2 class="voiceover_macos">Test 70: Navigate out of a listbox popup by moving t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5758,7 +5730,7 @@ <h2 class="jaws nvda">Test 71: Navigate out of a listbox popup by moving the edi
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html?at=jaws">jaws</a></li>
@@ -5843,7 +5815,7 @@ <h2 class="jaws nvda">Test 72: Navigate out of a listbox popup by moving the edi
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html?at=jaws">jaws</a></li>
@@ -5928,7 +5900,7 @@ <h2 class="voiceover_macos">Test 73: Navigate out of a listbox popup by moving t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5982,7 +5954,7 @@ <h2 class="voiceover_macos">Test 74: Navigate out of a listbox popup by moving t
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -6036,7 +6008,7 @@ <h2 class="jaws nvda">Test 75: Select an option in a listbox popup in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -6122,7 +6094,7 @@ <h2 class="voiceover_macos">Test 76: Select an option in a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/combobox-select-only.html b/build/review/combobox-select-only.html
index 3b240aac1..525562ff4 100644
--- a/build/review/combobox-select-only.html
+++ b/build/review/combobox-select-only.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: combobox-select-only (38 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed select-only combobox in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed select-only combo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -901,12 +873,12 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow, then Down Arrow, then Down Arrow</li>
+                   <li>Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -930,8 +902,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>C</li>
@@ -955,7 +927,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a collapsed select-only comb
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -986,12 +958,12 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1015,13 +987,13 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow, then Up Arrow</li>
+                   <li>Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1040,7 +1012,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a collapsed select-only combo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1071,7 +1043,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1098,7 +1070,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1119,7 +1091,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a collapsed select-only comb
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1150,7 +1122,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1177,7 +1149,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1198,7 +1170,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a collapsed select-only
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1228,9 +1200,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right, then Control+Option+Right</li>
+                   <li>Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1251,7 +1223,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a collapsed select-onl
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1281,9 +1253,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
+             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left Arrow) multiple times to hear all information relating to the combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -1304,7 +1276,7 @@ <h2 class="jaws nvda">Test 7: Read information about a collapsed select-only com
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1335,7 +1307,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
+             <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                    <li>Insert+Up</li>
@@ -1362,8 +1334,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                    <li>Insert+Up</li>
@@ -1385,7 +1357,7 @@ <h2 class="jaws nvda">Test 8: Read information about a collapsed select-only com
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1416,7 +1388,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
+             <li>With focus on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                </ul>
@@ -1443,7 +1415,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
+             <li>With focus on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                </ul>
@@ -1464,7 +1436,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a collapsed select-on
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1494,7 +1466,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
+             <li>With focus on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Control+Option+F3</li>
                    <li>Control+Option+F4</li>
@@ -1516,7 +1488,7 @@ <h2 class="jaws nvda">Test 10: Open a collapsed select-only combobox in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1562,7 +1534,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>State of the combobox (expanded) is conveyed</td></tr>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
-            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is not conveyed</td></tr>
+            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
             <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
@@ -1578,7 +1550,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -1592,7 +1564,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>State of the combobox (expanded) is conveyed</td></tr>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
-            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is not conveyed</td></tr>
+            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
             <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
@@ -1603,7 +1575,7 @@ <h2 class="jaws nvda">Test 11: Open a collapsed select-only combobox in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1654,7 +1626,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1688,7 +1660,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1698,7 +1670,7 @@ <h2 class="voiceover_macos">Test 12: Open a collapsed select-only combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1749,7 +1721,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1759,7 +1731,7 @@ <h2 class="jaws nvda">Test 13: Open a collapsed select-only combobox to the firs
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=jaws">jaws</a></li>
@@ -1806,7 +1778,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1836,7 +1808,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1846,7 +1818,7 @@ <h2 class="voiceover_macos">Test 14: Open a collapsed select-only combobox to th
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1892,7 +1864,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1902,7 +1874,7 @@ <h2 class="jaws nvda">Test 15: Open a collapsed select-only combobox to a specif
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html?at=jaws">jaws</a></li>
@@ -1989,7 +1961,7 @@ <h2 class="voiceover_macos">Test 16: Open a collapsed select-only combobox to a
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2045,7 +2017,7 @@ <h2 class="jaws nvda">Test 17: Open a collapsed select-only combobox to the last
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html?at=jaws">jaws</a></li>
@@ -2132,7 +2104,7 @@ <h2 class="voiceover_macos">Test 18: Open a collapsed select-only combobox to th
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2188,7 +2160,7 @@ <h2 class="jaws nvda">Test 19: Read information about a listbox popup in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2233,7 +2205,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2262,7 +2234,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2272,7 +2244,7 @@ <h2 class="voiceover_macos">Test 20: Read information about a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2317,7 +2289,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2327,7 +2299,7 @@ <h2 class="jaws nvda">Test 21: Navigate forwards to an option in a listbox popup
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2405,7 +2377,7 @@ <h2 class="jaws nvda">Test 22: Navigate backwards to an option in a listbox popu
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2446,7 +2418,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2473,7 +2445,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2483,7 +2455,7 @@ <h2 class="voiceover_macos">Test 23: Navigate forwards to an option in a listbox
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2535,7 +2507,7 @@ <h2 class="voiceover_macos">Test 24: Navigate backwards to an option in a listbo
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2577,7 +2549,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2587,7 +2559,7 @@ <h2 class="jaws nvda">Test 25: Navigate to a specific option in a listbox popup
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2665,7 +2637,7 @@ <h2 class="voiceover_macos">Test 26: Navigate to a specific option in a listbox
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2715,7 +2687,7 @@ <h2 class="jaws nvda">Test 27: Navigate to the first option in a listbox popup i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2756,7 +2728,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2783,7 +2755,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2793,7 +2765,7 @@ <h2 class="jaws nvda">Test 28: Navigate to the last option in a listbox popup in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2871,7 +2843,7 @@ <h2 class="voiceover_macos">Test 29: Navigate to the first option in a listbox p
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2911,7 +2883,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2921,7 +2893,7 @@ <h2 class="voiceover_macos">Test 30: Navigate to the last option in a listbox po
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2971,7 +2943,7 @@ <h2 class="jaws nvda">Test 31: Navigate forwards by ten options in a listbox pop
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3049,7 +3021,7 @@ <h2 class="jaws nvda">Test 32: Navigate backwards by ten options in a listbox po
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3127,7 +3099,7 @@ <h2 class="voiceover_macos">Test 33: Navigate forwards by ten options in a listb
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3177,7 +3149,7 @@ <h2 class="voiceover_macos">Test 34: Navigate backwards by ten options in a list
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3227,7 +3199,7 @@ <h2 class="jaws nvda">Test 35: Select an option in a listbox popup in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3310,7 +3282,7 @@ <h2 class="voiceover_macos">Test 36: Select an option in a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3364,7 +3336,7 @@ <h2 class="jaws nvda">Test 37: Close a listbox popup in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-37-close-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3443,7 +3415,7 @@ <h2 class="voiceover_macos">Test 38: Close a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-38-close-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/command-button.html b/build/review/command-button.html
index 47feba1b2..182232016 100644
--- a/build/review/command-button.html
+++ b/build/review/command-button.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: command-button (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a button in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-01-navigate-forwards-to-button-reading.html?at=jaws">jaws</a></li>
@@ -926,7 +898,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Print Page&#39; button using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -949,7 +921,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a button in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-02-navigate-backwards-to-button-reading.html?at=jaws">jaws</a></li>
@@ -1005,7 +977,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Print Page&#39; button using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1028,7 +1000,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a button in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-03-navigate-forwards-to-button-interaction.html?at=jaws">jaws</a></li>
@@ -1101,7 +1073,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a button in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-04-navigate-backwards-to-button-interaction.html?at=jaws">jaws</a></li>
@@ -1174,7 +1146,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-05-navigate-forwards-to-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1223,7 +1195,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-06-navigate-backwards-to-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1272,7 +1244,7 @@ <h2 class="jaws nvda">Test 7: Read information about a button in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-07-read-information-about-button-reading.html?at=jaws">jaws</a></li>
@@ -1326,7 +1298,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Print Page&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1347,7 +1319,7 @@ <h2 class="jaws nvda">Test 8: Read information about a button in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-08-read-information-about-button-interaction.html?at=jaws">jaws</a></li>
@@ -1422,7 +1394,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-09-read-information-about-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/complementary.html b/build/review/complementary.html
index 8987735dd..26cb9a007 100644
--- a/build/review/complementary.html
+++ b/build/review/complementary.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: complementary (20 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a complementary landmark in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards into a complementary landmark in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-01-navigate-forwards-into-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -928,7 +900,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -954,7 +926,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards into a complementary landmark in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-02-navigate-forwards-into-a-complementary-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1031,7 +1003,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards into a complementary landm
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-03-navigate-forwards-into-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1081,7 +1053,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards into a complementary landmark i
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-04-navigate-backwards-into-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1138,7 +1110,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1163,7 +1135,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards into a complementary landmark i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-05-navigate-backwards-into-a-complementary-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1240,7 +1212,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards into a complementary land
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-06-navigate-backwards-into-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1290,7 +1262,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards out of a complementary landmark
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-07-navigate-forwards-out-of-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1347,7 +1319,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1372,7 +1344,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards out of a complementary landmark
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-08-navigate-forwards-out-of-a-complementary-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1449,7 +1421,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards out of a complementary lan
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-09-navigate-forwards-out-of-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1499,7 +1471,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards out of a complementary landmar
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-10-navigate-backwards-out-of-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1556,7 +1528,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1581,7 +1553,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards out of a complementary landmar
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-11-navigate-backwards-out-of-a-complementary-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1658,7 +1630,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards out of a complementary l
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-12-navigate-backwards-out-of-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1708,7 +1680,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a heading inside a complemen
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-13-navigate-forwards-to-a-heading-inside-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1765,7 +1737,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Landmarks&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -1789,7 +1761,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a heading inside a com
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-14-navigate-forwards-to-a-heading-inside-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1839,7 +1811,7 @@ <h2 class="jaws nvda">Test 15: Navigate backwards to a heading inside a compleme
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-15-navigate-backwards-to-a-heading-inside-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1896,7 +1868,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Landmarks&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
@@ -1920,7 +1892,7 @@ <h2 class="voiceover_macos">Test 16: Navigate backwards to a heading inside a co
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-16-navigate-backwards-to-a-heading-inside-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1970,7 +1942,7 @@ <h2 class="jaws nvda">Test 17: Navigate forwards to a list inside a complementar
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-17-navigate-forwards-to-a-list-inside-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2027,7 +1999,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the list. using the following commands:
                <ul>
                    <li>L</li>
@@ -2051,7 +2023,7 @@ <h2 class="voiceover_macos">Test 18: Navigate forwards to a list inside a comple
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-18-navigate-forwards-to-a-list-inside-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2101,7 +2073,7 @@ <h2 class="jaws nvda">Test 19: Navigate backwards to a list inside a complementa
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-19-navigate-backwards-to-a-list-inside-a-complementary-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2157,7 +2129,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the list. using the following commands:
                <ul>
                    <li>Shift+L</li>
@@ -2180,7 +2152,7 @@ <h2 class="voiceover_macos">Test 20: Navigate backwards to a list inside a compl
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 16:09:21 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/complementary/test-20-navigate-backwards-to-a-list-inside-a-complementary-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/contentinfo.html b/build/review/contentinfo.html
index 5d9c1ab51..6d49c067b 100644
--- a/build/review/contentinfo.html
+++ b/build/review/contentinfo.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: contentinfo (16 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a contentinfo landmark in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards into a contentinfo landmark in r
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-01-navigate-forwards-into-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -952,7 +924,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards into a contentinfo landmark in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-02-navigate-forwards-into-a-contentinfo-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1027,7 +999,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards into a contentinfo landmar
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-03-navigate-forwards-into-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1076,7 +1048,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards into a contentinfo landmark in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-04-navigate-backwards-into-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1132,7 +1104,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1156,7 +1128,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards into a contentinfo landmark in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-05-navigate-backwards-into-a-contentinfo-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1231,7 +1203,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards into a contentinfo landma
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-06-navigate-backwards-into-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1280,7 +1252,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards out of a contentinfo landmark in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-07-navigate-forwards-out-of-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1336,7 +1308,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1360,7 +1332,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards out of a contentinfo landmark in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-08-navigate-forwards-out-of-a-contentinfo-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1435,7 +1407,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards out of a contentinfo landm
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-09-navigate-forwards-out-of-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1484,7 +1456,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards out of a contentinfo landmark
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-10-navigate-backwards-out-of-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1540,7 +1512,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1564,7 +1536,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards out of a contentinfo landmark
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-11-navigate-backwards-out-of-a-contentinfo-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1639,7 +1611,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards out of a contentinfo lan
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-12-navigate-backwards-out-of-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1688,7 +1660,7 @@ <h2 class="jaws">Test 13: Navigate forwards to a paragraph inside a contentinfo
       <ul class="jaws">
         <li>Mode: reading</li>
         <li>Applies to: jaws</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-13-navigate-forwards-to-a-paragraph-inside-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1735,7 +1707,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a paragraph inside a c
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-14-navigate-forwards-to-a-paragraph-inside-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1782,7 +1754,7 @@ <h2 class="jaws">Test 15: Navigate backwards to a paragraph inside a contentinfo
       <ul class="jaws">
         <li>Mode: reading</li>
         <li>Applies to: jaws</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-15-navigate-backwards-to-a-paragraph-inside-a-contentinfo-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1829,7 +1801,7 @@ <h2 class="voiceover_macos">Test 16: Navigate backwards to a paragraph inside a
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Jan 5 17:03:13 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/contentinfo/test-16-navigate-backwards-to-a-paragraph-inside-a-contentinfo-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/datepicker-spin-button.html b/build/review/datepicker-spin-button.html
index 0736e13c5..22ed253b0 100644
--- a/build/review/datepicker-spin-button.html
+++ b/build/review/datepicker-spin-button.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: datepicker-spin-button (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a spin button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a spin button in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-01-navigate-forwards-to-spin-button-reading.html?at=jaws">jaws</a></li>
@@ -932,7 +904,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Day&#39; spin button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -956,7 +928,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a spin button in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-02-navigate-backwards-to-spin-button-reading.html?at=jaws">jaws</a></li>
@@ -1018,7 +990,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Year&#39; spin button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1042,7 +1014,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a spin button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-03-navigate-forwards-to-spin-button-interaction.html?at=jaws">jaws</a></li>
@@ -1126,7 +1098,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a spin button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-04-navigate-backwards-to-spin-button-interaction.html?at=jaws">jaws</a></li>
@@ -1210,7 +1182,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a spin button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-05-navigate-forwards-to-spin-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1266,7 +1238,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a spin button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-06-navigate-backwards-to-spin-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1322,7 +1294,7 @@ <h2 class="jaws nvda">Test 7: Read information about a spin button in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-07-read-information-about-spin-button-reading.html?at=jaws">jaws</a></li>
@@ -1381,7 +1353,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Day&#39; spin button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1403,7 +1375,7 @@ <h2 class="jaws nvda">Test 8: Read information about a spin button in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-08-read-information-about-spin-button-interaction.html?at=jaws">jaws</a></li>
@@ -1484,7 +1456,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a spin button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-09-read-information-about-spin-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1537,7 +1509,7 @@ <h2 class="jaws nvda">Test 10: Decrement a spin button by one step in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-10-decrement-spin-button-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1609,7 +1581,7 @@ <h2 class="voiceover_macos">Test 11: Decrement a spin button by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-11-decrement-spin-button-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1656,7 +1628,7 @@ <h2 class="jaws nvda">Test 12: Increment a spin button by one step in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-12-increment-spin-button-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1728,7 +1700,7 @@ <h2 class="voiceover_macos">Test 13: Increment a spin button by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-13-increment-spin-button-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1775,7 +1747,7 @@ <h2 class="jaws nvda">Test 14: Decrement a spin button by five steps in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-14-decrement-spin-button-by-five-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1847,7 +1819,7 @@ <h2 class="voiceover_macos">Test 15: Decrement a spin button by five steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-15-decrement-spin-button-by-five-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1894,7 +1866,7 @@ <h2 class="jaws nvda">Test 16: Increment a spin button by five steps in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-16-increment-spin-button-by-five-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1966,7 +1938,7 @@ <h2 class="voiceover_macos">Test 17: Increment a spin button by five steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-17-increment-spin-button-by-five-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2013,7 +1985,7 @@ <h2 class="jaws nvda">Test 18: Decrement a spin button to the minimum value in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-18-decrement-spin-button-to-minimum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2086,7 +2058,7 @@ <h2 class="voiceover_macos">Test 19: Decrement a spin button to the minimum valu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-19-decrement-spin-button-to-minimum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2134,7 +2106,7 @@ <h2 class="jaws nvda">Test 20: Increment a spin button to the maximum value in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-20-increment-spin-button-to-maximum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2206,7 +2178,7 @@ <h2 class="voiceover_macos">Test 21: Increment a spin button to the maximum valu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 10:27:56 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/datepicker-spin-button/test-21-increment-spin-button-to-maximum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/disclosure-faq.html b/build/review/disclosure-faq.html
index 56507b931..6180d799f 100644
--- a/build/review/disclosure-faq.html
+++ b/build/review/disclosure-faq.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: disclosure-faq (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>B</li>
@@ -951,7 +923,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a collapsed disclosure butto
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1008,7 +980,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1032,7 +1004,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a collapsed disclosure button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1107,7 +1079,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a collapsed disclosure butto
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1182,7 +1154,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a collapsed disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1232,7 +1204,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a collapsed disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1282,7 +1254,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards to an expanded disclosure button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1339,7 +1311,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>B</li>
@@ -1363,7 +1335,7 @@ <h2 class="jaws nvda">Test 8: Navigate backwards to an expanded disclosure butto
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1420,7 +1392,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1444,7 +1416,7 @@ <h2 class="jaws nvda">Test 9: Navigate forwards to an expanded disclosure button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1519,7 +1491,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards to an expanded disclosure butt
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1594,7 +1566,7 @@ <h2 class="voiceover_macos">Test 11: Navigate forwards to an expanded disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1644,7 +1616,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to an expanded disclosur
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1694,7 +1666,7 @@ <h2 class="jaws nvda">Test 13: Read information about a collapsed disclosure but
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1749,7 +1721,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1771,7 +1743,7 @@ <h2 class="jaws nvda">Test 14: Read information about a collapsed disclosure but
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1846,7 +1818,7 @@ <h2 class="voiceover_macos">Test 15: Read information about a collapsed disclosu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1895,7 +1867,7 @@ <h2 class="jaws nvda">Test 16: Read information about an expanded disclosure but
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1950,7 +1922,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1972,7 +1944,7 @@ <h2 class="jaws nvda">Test 17: Read information about an expanded disclosure but
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2047,7 +2019,7 @@ <h2 class="voiceover_macos">Test 18: Read information about an expanded disclosu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2096,7 +2068,7 @@ <h2 class="jaws nvda">Test 19: Operate a collapsed disclosure button in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2149,7 +2121,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, set the state of the button to expanded. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2169,7 +2141,7 @@ <h2 class="jaws nvda">Test 20: Operate a collapsed disclosure button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2242,7 +2214,7 @@ <h2 class="voiceover_macos">Test 21: Operate a collapsed disclosure button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2290,7 +2262,7 @@ <h2 class="jaws nvda">Test 22: Operate an expanded disclosure button in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2343,7 +2315,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, set the state of the button to collapsed. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2363,7 +2335,7 @@ <h2 class="jaws nvda">Test 23: Operate an expanded disclosure button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2436,7 +2408,7 @@ <h2 class="voiceover_macos">Test 24: Operate an expanded disclosure button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2484,7 +2456,7 @@ <h2 class="jaws nvda">Test 25: Navigate from an expanded disclosure button to th
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html?at=jaws">jaws</a></li>
@@ -2536,7 +2508,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, move into the text of the associated question answer. Note: you may need to press Down Arrow multiple times to hear the answer text in its entirety. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -2555,7 +2527,7 @@ <h2 class="voiceover_macos">Test 26: Navigate from an expanded disclosure button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/disclosure-navigation.html b/build/review/disclosure-navigation.html
index dc3270e47..14539c026 100644
--- a/build/review/disclosure-navigation.html
+++ b/build/review/disclosure-navigation.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: disclosure-navigation (46 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>B</li>
@@ -951,7 +923,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a collapsed disclosure butto
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1008,7 +980,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1032,7 +1004,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a collapsed disclosure button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1107,7 +1079,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a collapsed disclosure butto
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1188,7 +1160,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a collapsed disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1238,7 +1210,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a collapsed disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1288,7 +1260,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards to an expanded disclosure button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1345,7 +1317,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>B</li>
@@ -1369,7 +1341,7 @@ <h2 class="jaws nvda">Test 8: Navigate backwards to an expanded disclosure butto
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1426,7 +1398,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1450,7 +1422,7 @@ <h2 class="jaws nvda">Test 9: Navigate forwards to an expanded disclosure button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1525,7 +1497,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards to an expanded disclosure butt
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1600,7 +1572,7 @@ <h2 class="voiceover_macos">Test 11: Navigate forwards to an expanded disclosure
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1649,7 +1621,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to an expanded disclosur
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1699,7 +1671,7 @@ <h2 class="jaws nvda">Test 13: Read information about a collapsed disclosure but
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1754,7 +1726,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1776,7 +1748,7 @@ <h2 class="jaws nvda">Test 14: Read information about a collapsed disclosure but
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1851,7 +1823,7 @@ <h2 class="voiceover_macos">Test 15: Read information about a collapsed disclosu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1900,7 +1872,7 @@ <h2 class="jaws nvda">Test 16: Read information about an expanded disclosure but
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1955,7 +1927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1977,7 +1949,7 @@ <h2 class="jaws nvda">Test 17: Read information about an expanded disclosure but
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2052,7 +2024,7 @@ <h2 class="voiceover_macos">Test 18: Read information about an expanded disclosu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2101,7 +2073,7 @@ <h2 class="jaws nvda">Test 19: Operate a collapsed disclosure button in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2154,7 +2126,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, set the state of the button to expanded. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2174,7 +2146,7 @@ <h2 class="jaws nvda">Test 20: Operate a collapsed disclosure button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2247,7 +2219,7 @@ <h2 class="voiceover_macos">Test 21: Operate a collapsed disclosure button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2295,7 +2267,7 @@ <h2 class="jaws nvda">Test 22: Operate an expanded disclosure button in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2348,7 +2320,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, set the state of the button to collapsed. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2368,7 +2340,7 @@ <h2 class="jaws nvda">Test 23: Operate an expanded disclosure button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2441,7 +2413,7 @@ <h2 class="voiceover_macos">Test 24: Operate an expanded disclosure button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2489,7 +2461,7 @@ <h2 class="jaws nvda">Test 25: Navigate from an expanded disclosure button to a
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -2545,7 +2517,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, move into the button&#39;s associated list of links. Note: you may need to press certain commands (such as Down Arrow) multiple times to hear all information about the dropdown and link. using the following commands:
                <ul>
                    <li>U</li>
@@ -2570,7 +2542,7 @@ <h2 class="jaws nvda">Test 26: Navigate from an expanded disclosure button to a
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -2648,7 +2620,7 @@ <h2 class="voiceover_macos">Test 27: Navigate from an expanded disclosure button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2699,7 +2671,7 @@ <h2 class="jaws nvda">Test 28: Navigate from an expanded disclosure button to th
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html?at=jaws">jaws</a></li>
@@ -2757,7 +2729,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, move into the button&#39;s associated list of links. Note: you may need to press certain commands (such as Down Arrow) multiple times to hear all information about the dropdown and link. using the following commands:
                <ul>
                    <li>U</li>
@@ -2783,7 +2755,7 @@ <h2 class="jaws nvda">Test 29: Navigate from an expanded disclosure button to th
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html?at=jaws">jaws</a></li>
@@ -2864,7 +2836,7 @@ <h2 class="voiceover_macos">Test 30: Navigate from an expanded disclosure button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2917,7 +2889,7 @@ <h2 class="jaws nvda">Test 31: Navigate from a dropdown to a collapsed disclosur
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2971,7 +2943,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, close the dropdown and return focus to the associated disclosure button. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -2992,7 +2964,7 @@ <h2 class="jaws nvda">Test 32: Navigate from a dropdown to a collapsed disclosur
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -3067,7 +3039,7 @@ <h2 class="voiceover_macos">Test 33: Navigate from a dropdown to a collapsed dis
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3115,7 +3087,7 @@ <h2 class="jaws nvda">Test 34: Navigate forwards to a link in a dropdown in read
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -3169,7 +3141,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, navigate to the next link. using the following commands:
                <ul>
                    <li>U</li>
@@ -3192,7 +3164,7 @@ <h2 class="jaws nvda">Test 35: Navigate backwards to a link in a dropdown in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -3246,7 +3218,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, navigate to the previous link. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -3269,7 +3241,7 @@ <h2 class="jaws nvda">Test 36: Navigate forwards to a link in a dropdown in inte
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3345,7 +3317,7 @@ <h2 class="jaws nvda">Test 37: Navigate backwards to a link in a dropdown in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3421,7 +3393,7 @@ <h2 class="voiceover_macos">Test 38: Navigate forwards to a link in a dropdown</
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3471,7 +3443,7 @@ <h2 class="voiceover_macos">Test 39: Navigate backwards to a link in a dropdown<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3521,7 +3493,7 @@ <h2 class="jaws nvda">Test 40: Navigate to the first link in a dropdown in inter
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3593,7 +3565,7 @@ <h2 class="jaws nvda">Test 41: Navigate to the last link in a dropdown in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3665,7 +3637,7 @@ <h2 class="voiceover_macos">Test 42: Navigate to the first link in a dropdown</h
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3711,7 +3683,7 @@ <h2 class="voiceover_macos">Test 43: Navigate to the last link in a dropdown</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Nov 30 08:51:28 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3757,7 +3729,7 @@ <h2 class="jaws nvda">Test 44: Activate a link in a dropdown in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Dec 1 09:06:55 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -3812,7 +3784,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, activate the link. using the following commands:
                <ul>
                    <li>Enter</li>
@@ -3833,7 +3805,7 @@ <h2 class="jaws nvda">Test 45: Activate a link in a dropdown in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Dec 1 09:06:55 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3907,7 +3879,7 @@ <h2 class="voiceover_macos">Test 46: Activate a link in a dropdown</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Dec 1 09:06:55 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/form.html b/build/review/form.html
index 7afbe2ef5..43d28103a 100644
--- a/build/review/form.html
+++ b/build/review/form.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: form (20 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a form landmark in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards into a form landmark in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-01-navigate-forwards-into-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -929,7 +901,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -955,7 +927,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards into a form landmark in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-02-navigate-forwards-into-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1033,7 +1005,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards into a form landmark</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-03-navigate-forwards-into-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1084,7 +1056,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards into a form landmark in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-04-navigate-backwards-into-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1142,7 +1114,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1167,7 +1139,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards into a form landmark in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-05-navigate-backwards-into-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1245,7 +1217,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards into a form landmark</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-06-navigate-backwards-into-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1296,7 +1268,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards out of a form landmark in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-07-navigate-forwards-out-of-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1353,7 +1325,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1378,7 +1350,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards out of a form landmark in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-08-navigate-forwards-out-of-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1455,7 +1427,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards out of a form landmark</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-09-navigate-forwards-out-of-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1505,7 +1477,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards out of a form landmark in read
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-10-navigate-backwards-out-of-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1562,7 +1534,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1587,7 +1559,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards out of a form landmark in inte
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-11-navigate-backwards-out-of-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1664,7 +1636,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards out of a form landmark</
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-12-navigate-backwards-out-of-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1714,7 +1686,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a text input inside a form l
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-13-navigate-forwards-to-a-text-input-inside-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1773,7 +1745,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Name&#39; text input. using the following commands:
                <ul>
                    <li>F</li>
@@ -1798,7 +1770,7 @@ <h2 class="jaws nvda">Test 14: Navigate forwards to a text input inside a form l
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-14-navigate-forwards-to-a-text-input-inside-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1880,7 +1852,7 @@ <h2 class="voiceover_macos">Test 15: Navigate forwards to a text input inside a
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-15-navigate-forwards-to-a-text-input-inside-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1932,7 +1904,7 @@ <h2 class="jaws nvda">Test 16: Navigate backwards to a text input inside a form
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-16-navigate-backwards-to-a-text-input-inside-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1991,7 +1963,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Phone&#39; text input. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -2016,7 +1988,7 @@ <h2 class="jaws nvda">Test 17: Navigate backwards to a text input inside a form
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-17-navigate-backwards-to-a-text-input-inside-a-form-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -2098,7 +2070,7 @@ <h2 class="voiceover_macos">Test 18: Navigate backwards to a text input inside a
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-18-navigate-backwards-to-a-text-input-inside-a-form-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2150,7 +2122,7 @@ <h2 class="jaws nvda">Test 19: Navigate forwards to a button inside a form landm
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-19-navigate-forwards-to-a-button-inside-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2208,7 +2180,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Add contact&#39; button. using the following commands:
                <ul>
                    <li>B</li>
@@ -2232,7 +2204,7 @@ <h2 class="jaws nvda">Test 20: Navigate backwards to a button inside a form land
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:00:03 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/form/test-20-navigate-backwards-to-a-button-inside-a-form-landmark-reading.html?at=jaws">jaws</a></li>
@@ -2290,7 +2262,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Add contact&#39; button. using the following commands:
                <ul>
                    <li>Shift+B</li>
diff --git a/build/review/horizontal-slider.html b/build/review/horizontal-slider.html
index 933a65475..0c1e4e0e2 100644
--- a/build/review/horizontal-slider.html
+++ b/build/review/horizontal-slider.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: horizontal-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-01-navigate-forwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -932,7 +904,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Red&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -957,7 +929,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a slider in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-02-navigate-backwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -1019,7 +991,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Red&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1044,7 +1016,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a slider in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-03-navigate-forwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1129,7 +1101,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a slider in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-04-navigate-backwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1214,7 +1186,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-05-navigate-forwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1270,7 +1242,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-06-navigate-backwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1326,7 +1298,7 @@ <h2 class="jaws nvda">Test 7: Read information about a slider in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-07-read-information-about-slider-reading.html?at=jaws">jaws</a></li>
@@ -1388,7 +1360,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Red&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1413,7 +1385,7 @@ <h2 class="jaws nvda">Test 8: Read information about a slider in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-08-read-information-about-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1500,7 +1472,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-09-read-information-about-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1556,7 +1528,7 @@ <h2 class="jaws nvda">Test 10: Increment a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-10-increment-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1629,7 +1601,7 @@ <h2 class="voiceover_macos">Test 11: Increment a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-11-increment-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1676,7 +1648,7 @@ <h2 class="jaws nvda">Test 12: Decrement a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-12-decrement-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1749,7 +1721,7 @@ <h2 class="voiceover_macos">Test 13: Decrement a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-13-decrement-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1796,7 +1768,7 @@ <h2 class="jaws nvda">Test 14: Increment a slider by ten steps in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-14-increment-slider-by-ten-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1867,7 +1839,7 @@ <h2 class="voiceover_macos">Test 15: Increment a slider by ten steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-15-increment-slider-by-ten-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1913,7 +1885,7 @@ <h2 class="jaws nvda">Test 16: Decrement a slider by ten steps in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-16-decrement-slider-by-ten-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1984,7 +1956,7 @@ <h2 class="voiceover_macos">Test 17: Decrement a slider by ten steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-17-decrement-slider-by-ten-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2030,7 +2002,7 @@ <h2 class="jaws nvda">Test 18: Decrement a slider to the minimum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-18-decrement-slider-to-minimum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2102,7 +2074,7 @@ <h2 class="voiceover_macos">Test 19: Decrement a slider to the minimum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-19-decrement-slider-to-minimum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2149,7 +2121,7 @@ <h2 class="jaws nvda">Test 20: Increment a slider to the maximum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-20-increment-slider-to-maximum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2221,7 +2193,7 @@ <h2 class="voiceover_macos">Test 21: Increment a slider to the maximum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 12:58:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/horizontal-slider/test-21-increment-slider-to-maximum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/main.html b/build/review/main.html
index 2976da168..b6ec9cac2 100644
--- a/build/review/main.html
+++ b/build/review/main.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: main (16 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a main landmark in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards into a main landmark in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-01-navigate-forwards-into-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -928,7 +900,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -953,7 +925,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards into a main landmark in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-02-navigate-forwards-into-a-main-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1028,7 +1000,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards into a main landmark</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-03-navigate-forwards-into-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1077,7 +1049,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards into a main landmark in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-04-navigate-backwards-into-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1133,7 +1105,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1157,7 +1129,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards into a main landmark in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-05-navigate-backwards-into-a-main-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1232,7 +1204,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards into a main landmark</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-06-navigate-backwards-into-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1281,7 +1253,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards out of a main landmark in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-07-navigate-forwards-out-of-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1337,7 +1309,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1361,7 +1333,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards out of a main landmark in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-08-navigate-forwards-out-of-a-main-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1436,7 +1408,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards out of a main landmark</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-09-navigate-forwards-out-of-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1485,7 +1457,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards out of a main landmark in read
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-10-navigate-backwards-out-of-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1541,7 +1513,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1565,7 +1537,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards out of a main landmark in inte
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-11-navigate-backwards-out-of-a-main-landmark-interaction.html?at=jaws">jaws</a></li>
@@ -1640,7 +1612,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards out of a main landmark</
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-12-navigate-backwards-out-of-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1689,7 +1661,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a heading inside a main land
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-13-navigate-forwards-to-a-heading-inside-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1745,7 +1717,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Main Landmark&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -1768,7 +1740,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a heading inside a mai
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-14-navigate-forwards-to-a-heading-inside-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1817,7 +1789,7 @@ <h2 class="jaws nvda">Test 15: Navigate backwards to a heading inside a main lan
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-15-navigate-backwards-to-a-heading-inside-a-main-landmark-reading.html?at=jaws">jaws</a></li>
@@ -1873,7 +1845,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Main Landmark&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
@@ -1896,7 +1868,7 @@ <h2 class="voiceover_macos">Test 16: Navigate backwards to a heading inside a ma
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Jan 6 14:50:28 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/main/test-16-navigate-backwards-to-a-heading-inside-a-main-landmark-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menu-button-actions-active-descendant.html b/build/review/menu-button-actions-active-descendant.html
index 855dd8971..337338557 100644
--- a/build/review/menu-button-actions-active-descendant.html
+++ b/build/review/menu-button-actions-active-descendant.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: menu-button-actions-active-descendant (26 test
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -926,7 +898,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>B</li>
@@ -949,7 +921,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a menu button in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1005,7 +977,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1028,7 +1000,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a menu button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1101,7 +1073,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a menu button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1174,7 +1146,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1223,7 +1195,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1272,7 +1244,7 @@ <h2 class="jaws nvda">Test 7: Read information about a menu button in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1326,7 +1298,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, read information about the menu button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1347,7 +1319,7 @@ <h2 class="jaws nvda">Test 8: Read information about a menu button in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1422,7 +1394,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1470,7 +1442,7 @@ <h2 class="jaws nvda">Test 10: Open a menu in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html?at=jaws">jaws</a></li>
@@ -1531,7 +1503,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, open the menu. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1556,7 +1528,7 @@ <h2 class="jaws nvda">Test 11: Open a menu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1644,7 +1616,7 @@ <h2 class="voiceover_macos">Test 12: Open a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1700,7 +1672,7 @@ <h2 class="jaws nvda">Test 13: Open a menu to the last item in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html?at=jaws">jaws</a></li>
@@ -1784,7 +1756,7 @@ <h2 class="voiceover_macos">Test 14: Open a menu to the last item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1838,7 +1810,7 @@ <h2 class="jaws nvda">Test 15: Read information about a menu item in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -1918,7 +1890,7 @@ <h2 class="voiceover_macos">Test 16: Read information about a menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1969,7 +1941,7 @@ <h2 class="jaws nvda">Test 17: Navigate to the first item in a menu in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2049,7 +2021,7 @@ <h2 class="voiceover_macos">Test 18: Navigate to the first item in a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2100,7 +2072,7 @@ <h2 class="jaws nvda">Test 19: Navigate to the last item in a menu in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2180,7 +2152,7 @@ <h2 class="voiceover_macos">Test 20: Navigate to the last item in a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2231,7 +2203,7 @@ <h2 class="jaws nvda">Test 21: Navigate to an item in a menu by typing a charact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2309,7 +2281,7 @@ <h2 class="voiceover_macos">Test 22: Navigate to an item in a menu by typing a c
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2359,7 +2331,7 @@ <h2 class="jaws nvda">Test 23: Activate a menu item in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -2432,7 +2404,7 @@ <h2 class="voiceover_macos">Test 24: Activate a menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2480,7 +2452,7 @@ <h2 class="jaws nvda">Test 25: Close a menu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2553,7 +2525,7 @@ <h2 class="voiceover_macos">Test 26: Close a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menu-button-actions.html b/build/review/menu-button-actions.html
index fd20d2cbc..920007877 100644
--- a/build/review/menu-button-actions.html
+++ b/build/review/menu-button-actions.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: menu-button-actions (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -926,7 +898,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>B</li>
@@ -949,7 +921,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a menu button in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1005,7 +977,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1028,7 +1000,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a menu button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1101,7 +1073,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a menu button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1174,7 +1146,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1223,7 +1195,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1272,7 +1244,7 @@ <h2 class="jaws nvda">Test 7: Read information about a menu button in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1326,7 +1298,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, read information about the menu button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1347,7 +1319,7 @@ <h2 class="jaws nvda">Test 8: Read information about a menu button in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1422,7 +1394,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a menu button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1470,7 +1442,7 @@ <h2 class="jaws nvda">Test 10: Open a menu in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-10-open-menu-reading.html?at=jaws">jaws</a></li>
@@ -1530,7 +1502,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, open the menu. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1555,7 +1527,7 @@ <h2 class="jaws nvda">Test 11: Open a menu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-11-open-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1642,7 +1614,7 @@ <h2 class="voiceover_macos">Test 12: Open a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-12-open-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1698,7 +1670,7 @@ <h2 class="jaws nvda">Test 13: Open a menu to the last item in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html?at=jaws">jaws</a></li>
@@ -1781,7 +1753,7 @@ <h2 class="voiceover_macos">Test 14: Open a menu to the last item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1834,7 +1806,7 @@ <h2 class="jaws nvda">Test 15: Read information about a menu item in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -1913,7 +1885,7 @@ <h2 class="voiceover_macos">Test 16: Read information about a menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1963,7 +1935,7 @@ <h2 class="jaws nvda">Test 17: Navigate to the first item in a menu in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2042,7 +2014,7 @@ <h2 class="voiceover_macos">Test 18: Navigate to the first item in a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2092,7 +2064,7 @@ <h2 class="jaws nvda">Test 19: Navigate to the last item in a menu in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2171,7 +2143,7 @@ <h2 class="voiceover_macos">Test 20: Navigate to the last item in a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2221,7 +2193,7 @@ <h2 class="jaws nvda">Test 21: Navigate to an item in a menu by typing a charact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2298,7 +2270,7 @@ <h2 class="voiceover_macos">Test 22: Navigate to an item in a menu by typing a c
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2347,7 +2319,7 @@ <h2 class="jaws nvda">Test 23: Activate a menu item in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-23-activate-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -2420,7 +2392,7 @@ <h2 class="voiceover_macos">Test 24: Activate a menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-24-activate-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2468,7 +2440,7 @@ <h2 class="jaws nvda">Test 25: Close a menu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-25-close-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2541,7 +2513,7 @@ <h2 class="voiceover_macos">Test 26: Close a menu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-26-close-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menubar-editor.html b/build/review/menubar-editor.html
index 850d9c75a..396e5ba4b 100644
--- a/build/review/menubar-editor.html
+++ b/build/review/menubar-editor.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: menubar-editor (40 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to menubar in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate to menubar in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-01-navigate-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar using the following commands:
                <ul>
                    <li>Up Arrow &#x2F; Down Arrow</li>
@@ -951,7 +923,7 @@ <h2 class="jaws nvda">Test 2: Activate menubar in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-02-activate-menubar-reading.html?at=jaws">jaws</a></li>
@@ -994,7 +966,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Font&quot; menu item in the &#39;Text Formatting&#39; menubar example with down arrow. | Activate the &#39;Font&#39; menu using the following commands:
                <ul>
                    <li>Space</li>
@@ -1014,7 +986,7 @@ <h2 class="jaws nvda">Test 3: Navigate to menubar with commands that switch mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-03-tab-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -1071,7 +1043,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar using the following commands:
                <ul>
                    <li>Tab</li>
@@ -1095,7 +1067,7 @@ <h2 class="jaws nvda">Test 4: Navigate to menubar in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-04-navigate-to-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1174,7 +1146,7 @@ <h2 class="voiceover_macos">Test 5: Navigate to menubar</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-05-navigate-to-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1225,7 +1197,7 @@ <h2 class="jaws nvda">Test 6: Navigate to menu item in menubar in reading mode</
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -1271,7 +1243,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to &#39;Text Formatting&#39; menu with down arrow| Navigate to &#39;Style&#x2F;Color&#39; menu using the following commands:
                <ul>
                    <li>Insert+Numpad 6 (or CapsLock+Numpad 6)</li>
@@ -1294,7 +1266,7 @@ <h2 class="jaws nvda">Test 7: Navigate to menu item in menubar in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1373,7 +1345,7 @@ <h2 class="voiceover_macos">Test 8: Navigate to menu item in menubar</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1424,7 +1396,7 @@ <h2 class="jaws nvda">Test 9: Navigate to open menu item in menubar in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1503,7 +1475,7 @@ <h2 class="voiceover_macos">Test 10: Navigate to open menu item in menubar</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1553,7 +1525,7 @@ <h2 class="jaws nvda">Test 11: Open submenu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1633,7 +1605,7 @@ <h2 class="voiceover_macos">Test 12: Open submenu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1685,7 +1657,7 @@ <h2 class="jaws nvda">Test 13: Close submenu in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1763,7 +1735,7 @@ <h2 class="voiceover_macos">Test 14: Close submenu</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1813,7 +1785,7 @@ <h2 class="jaws nvda">Test 15: Navigate to checked menu item radio in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -1891,7 +1863,7 @@ <h2 class="voiceover_macos">Test 16: Navigate to checked menu item radio</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1942,7 +1914,7 @@ <h2 class="jaws nvda">Test 17: Navigate to unchecked menu item radio in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2020,7 +1992,7 @@ <h2 class="voiceover_macos">Test 18: Navigate to unchecked menu item radio</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2071,7 +2043,7 @@ <h2 class="jaws nvda">Test 19: Navigate to unchecked menu item checkbox in inter
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2151,7 +2123,7 @@ <h2 class="voiceover_macos">Test 20: Navigate to unchecked menu item checkbox</h
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2203,7 +2175,7 @@ <h2 class="jaws nvda">Test 21: Navigate to checked menu item checkbox in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2289,7 +2261,7 @@ <h2 class="voiceover_macos">Test 22: Navigate to checked menu item checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2344,7 +2316,7 @@ <h2 class="jaws nvda">Test 23: Read menu item in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jun 29 16:13:31 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -2394,7 +2366,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar. | Navigate to the size menu item in the menubar. | Read &#39;Size&#39; menu item using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2418,7 +2390,7 @@ <h2 class="jaws nvda">Test 24: Read menu item in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -2502,7 +2474,7 @@ <h2 class="voiceover_macos">Test 25: Read menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2556,7 +2528,7 @@ <h2 class="jaws nvda">Test 26: Read unchecked menu item radio in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -2616,7 +2588,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Blue&#39; menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  &#39;Blue&#39; menu item radio using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2640,7 +2612,7 @@ <h2 class="jaws nvda">Test 27: Read unchecked menu item radio in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2724,7 +2696,7 @@ <h2 class="voiceover_macos">Test 28: Read unchecked menu item radio</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2778,7 +2750,7 @@ <h2 class="jaws nvda">Test 29: Read checked menu item radio in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -2838,7 +2810,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Black&#39; menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  &#39;Black&#39; menu item radio using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2862,7 +2834,7 @@ <h2 class="jaws nvda">Test 30: Read checked menu item radio in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2946,7 +2918,7 @@ <h2 class="voiceover_macos">Test 31: Read checked menu item radio</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3000,7 +2972,7 @@ <h2 class="jaws nvda">Test 32: Read unchecked menu item checkbox in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -3060,7 +3032,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox with down arrow. | Activate the screen reader reading cursor. | Read the &#39;Italic&#39; menu item checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3084,7 +3056,7 @@ <h2 class="jaws nvda">Test 33: Read unchecked menu item checkbox in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -3168,7 +3140,7 @@ <h2 class="voiceover_macos">Test 34: Read unchecked menu item checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3222,7 +3194,7 @@ <h2 class="jaws nvda">Test 35: Read checked menu item checkbox in reading mode</
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -3282,7 +3254,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox and check it by pressing enter. (the menu will close.) | Re-open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox. | Activate the screen reader reading cursor. | Read the &#39;Italic&#39; menu item checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3306,7 +3278,7 @@ <h2 class="jaws nvda">Test 36: Read checked menu item checkbox in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -3390,7 +3362,7 @@ <h2 class="voiceover_macos">Test 37: Read checked menu item checkbox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3444,7 +3416,7 @@ <h2 class="jaws nvda">Test 38: Read disabled menu item in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -3503,7 +3475,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Size&#39; menu item with right arrow. | Open &#39;Size&#39; menu with  down arrow. | Navigate to &#39;X-Small&#39; with down arrow. | Activate &#39;X-Small&#39;. with Enter. | Open &#39;Size&#39; menu with down arrow. | Activate the screen reader reading cursor. | Read the &#39;Smaller&#39; menu item using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3526,7 +3498,7 @@ <h2 class="jaws nvda">Test 39: Read disabled menu item in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -3608,7 +3580,7 @@ <h2 class="voiceover_macos">Test 40: Read disabled menu item</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/meter.html b/build/review/meter.html
index 8a1e6c9c2..e1991004d 100644
--- a/build/review/meter.html
+++ b/build/review/meter.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: meter (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a meter in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a meter in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-01-navigate-forwards-to-a-meter-reading.html?at=jaws">jaws</a></li>
@@ -930,7 +902,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the meter. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -953,7 +925,7 @@ <h2 class="voiceover_macos">Test 2: Navigate forwards to a meter</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-02-navigate-forwards-to-a-meter-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1007,7 +979,7 @@ <h2 class="jaws nvda">Test 3: Navigate backwards to a meter in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-03-navigate-backwards-to-a-meter-reading.html?at=jaws">jaws</a></li>
@@ -1067,7 +1039,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the meter. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1090,7 +1062,7 @@ <h2 class="voiceover_macos">Test 4: Navigate backwards to a meter</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-04-navigate-backwards-to-a-meter-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1144,7 +1116,7 @@ <h2 class="jaws nvda">Test 5: Read information about a meter in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-05-read-information-about-a-meter-reading.html?at=jaws">jaws</a></li>
@@ -1205,7 +1177,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the meter, read information about the meter using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1229,7 +1201,7 @@ <h2 class="voiceover_macos">Test 6: Read information about a meter</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-06-read-information-about-a-meter-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1284,7 +1256,7 @@ <h2 class="jaws nvda">Test 7: Trigger a meter update in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-07-trigger-a-meter-update-reading.html?at=jaws">jaws</a></li>
@@ -1337,7 +1309,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Change Value&#39; button, activate the button to trigger a meter update. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1357,7 +1329,7 @@ <h2 class="jaws nvda">Test 8: Trigger a meter update in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-08-trigger-a-meter-update-interaction.html?at=jaws">jaws</a></li>
@@ -1430,7 +1402,7 @@ <h2 class="voiceover_macos">Test 9: Trigger a meter update</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Mon Jan 3 17:38:49 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/meter/test-09-trigger-a-meter-update-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/minimal-data-grid.html b/build/review/minimal-data-grid.html
index 18d840140..032a730ae 100644
--- a/build/review/minimal-data-grid.html
+++ b/build/review/minimal-data-grid.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: minimal-data-grid (55 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a grid in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a grid in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -900,9 +872,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the first column header in the grid. using the following commands:
+             <li>Navigate to the first column header in the grid. Note: you may need to press  certain commands (such as Down Arrow) multiple times to hear all information relating to the grid and the first column header. using the following commands:
                <ul>
-                   <li>T, then Down Arrow</li>
+                   <li>T followed by Down Arrow</li>
                    <li>Down Arrow</li>
                </ul>
              </li>
@@ -929,8 +901,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the first column header in the grid. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the first column header in the grid. Note: you may need to press  certain commands (such as Down Arrow) multiple times to hear all information relating to the grid and the first column header. using the following commands:
                <ul>
                    <li>T</li>
                    <li>Down Arrow</li>
@@ -954,7 +926,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a grid in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -986,7 +958,7 @@ <h4>Tester Instructions</h4>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
              <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
-                   <li>Shift+T, then Down Arrow</li>
+                   <li>Shift+T followed by Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1012,7 +984,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
                    <li>Shift+T</li>
@@ -1036,7 +1008,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards to a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1065,7 +1037,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the first column header in the grid. using the following commands:
+             <li>Navigate to the first column header in the grid. Note: you may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the grid and the first column header. using the following commands:
                <ul>
                    <li>Control+Option+Right</li>
                    <li>Control+Option+Command+T</li>
@@ -1089,7 +1061,7 @@ <h2 class="jaws nvda">Test 4: Navigate into the end of a grid in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html?at=jaws">jaws</a></li>
@@ -1118,7 +1090,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the last cell in the grid. using the following commands:
+             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the grid and the last cell. using the following commands:
                <ul>
                    <li>Up Arrow</li>
                </ul>
@@ -1148,8 +1120,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the last cell in the grid. using the following commands:
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the grid and the last cell. using the following commands:
                <ul>
                    <li>Up Arrow</li>
                </ul>
@@ -1174,7 +1146,7 @@ <h2 class="voiceover_macos">Test 5: Navigate into the end of a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1202,7 +1174,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the last cell in the grid. using the following commands:
+             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the grid and the last cell. using the following commands:
                <ul>
                    <li>Ctrl+Option+Left</li>
                </ul>
@@ -1227,7 +1199,7 @@ <h2 class="jaws nvda">Test 6: Move focus forwards into a grid in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html?at=jaws">jaws</a></li>
@@ -1286,7 +1258,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Move keyboard focus onto the first non-header cell in the grid. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -1311,7 +1283,7 @@ <h2 class="jaws nvda">Test 7: Move focus backwards into a grid in reading mode</
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html?at=jaws">jaws</a></li>
@@ -1370,7 +1342,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Move keyboard focus onto the first non-header cell in the grid. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -1395,7 +1367,7 @@ <h2 class="jaws nvda">Test 8: Move focus forwards into a grid in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html?at=jaws">jaws</a></li>
@@ -1479,7 +1451,7 @@ <h2 class="jaws nvda">Test 9: Move focus backwards into a grid in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html?at=jaws">jaws</a></li>
@@ -1563,7 +1535,7 @@ <h2 class="voiceover_macos">Test 10: Move focus forwards into a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1616,7 +1588,7 @@ <h2 class="voiceover_macos">Test 11: Move focus backwards into a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1669,7 +1641,7 @@ <h2 class="jaws nvda">Test 12: Read information about a grid cell in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html?at=jaws">jaws</a></li>
@@ -1723,7 +1695,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first non-header cell in the grid, read information about the cell. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1745,7 +1717,7 @@ <h2 class="jaws nvda">Test 13: Read information about a grid cell in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html?at=jaws">jaws</a></li>
@@ -1821,7 +1793,7 @@ <h2 class="voiceover_macos">Test 14: Read information about a grid cell</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1869,7 +1841,7 @@ <h2 class="jaws nvda">Test 15: Read information about a grid cell containing a l
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html?at=jaws">jaws</a></li>
@@ -1924,7 +1896,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a cell containing a link in the grid, read information about the cell. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1947,7 +1919,7 @@ <h2 class="jaws nvda">Test 16: Read information about a grid cell containing a l
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html?at=jaws">jaws</a></li>
@@ -2025,7 +1997,7 @@ <h2 class="voiceover_macos">Test 17: Read information about a grid cell containi
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2069,12 +2041,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 18: Navigate to the next column in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 18: Navigate to the next colum in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2127,7 +2099,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Right</li>
@@ -2143,12 +2115,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 19: Navigate to the next column in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 19: Navigate to the next colum in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2217,12 +2189,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 20: Navigate to the next column in a grid</h2>
+    <h2 class="voiceover_macos">Test 20: Navigate to the next colum in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2266,12 +2238,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 21: Navigate to the previous column in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 21: Navigate to the previous colum in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2324,7 +2296,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Left</li>
@@ -2340,12 +2312,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 22: Navigate to the previous column in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 22: Navigate to the previous colum in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2414,12 +2386,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 23: Navigate to the previous column in a grid</h2>
+    <h2 class="voiceover_macos">Test 23: Navigate to the previous colum in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2463,12 +2435,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 24: Navigate to the next column containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 24: Navigate to the next colum containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2523,7 +2495,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next column containing a link in the grid. using the following commands:
                <ul>
                    <li>U</li>
@@ -2542,12 +2514,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 25: Navigate to the next column containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 25: Navigate to the next colum containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2619,12 +2591,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 26: Navigate to the next column containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 26: Navigate to the next colum containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2670,12 +2642,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 27: Navigate to the previous column containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 27: Navigate to the previous colum containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2730,7 +2702,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous column containing a link in the grid. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -2749,12 +2721,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 28: Navigate to the previous column containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 28: Navigate to the previous colum containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2825,12 +2797,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 29: Navigate to the previous column containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 29: Navigate to the previous colum containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2876,12 +2848,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 30: Navigate to the next column from a cell containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 30: Navigate to the next column from a cel containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2934,7 +2906,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the next column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Right</li>
@@ -2950,12 +2922,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 31: Navigate to the next column from a cell containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 31: Navigate to the next column from a cel containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3024,12 +2996,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 32: Navigate to the next column from a cell containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 32: Navigate to the next column from a cel containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3073,12 +3045,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 33: Navigate to the previous column from a cell containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 33: Navigate to the previous column from a cel containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3131,7 +3103,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the previous column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Left</li>
@@ -3147,12 +3119,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 34: Navigate to the previous column from a cell containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 34: Navigate to the previous column from a cel containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3221,12 +3193,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 35: Navigate to the previous column from a cell containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 35: Navigate to the previous column from a cel containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3258,6 +3230,7 @@ <h4>Tester Instructions</h4>
                    <li>Left Arrow</li>
                    <li>Ctrl+Option+Left</li>
                    <li>Shift+Control+Option+Command+Y</li>
+                   <li>Shift+Control+Option+Command+L</li>
                </ul>
              </li>
           </ol>
@@ -3275,7 +3248,7 @@ <h2 class="jaws nvda">Test 36: Navigate to the next row in a grid in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3313,6 +3286,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3327,7 +3301,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Down</li>
@@ -3338,6 +3312,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3347,7 +3322,7 @@ <h2 class="jaws nvda">Test 37: Navigate to the next row in a grid in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3385,6 +3360,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3410,6 +3386,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3419,7 +3396,7 @@ <h2 class="voiceover_macos">Test 38: Navigate to the next row in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3457,6 +3434,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3466,7 +3444,7 @@ <h2 class="jaws nvda">Test 39: Navigate to the previous row in a grid in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3504,6 +3482,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3518,7 +3497,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Up</li>
@@ -3529,6 +3508,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3538,7 +3518,7 @@ <h2 class="jaws nvda">Test 40: Navigate to the previous row in a grid in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3576,6 +3556,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3601,6 +3582,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3610,7 +3592,7 @@ <h2 class="voiceover_macos">Test 41: Navigate to the previous row in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3648,6 +3630,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3657,7 +3640,7 @@ <h2 class="jaws nvda">Test 42: Navigate to a cell containing a link on the next
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3695,6 +3678,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3710,7 +3694,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the next row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Down</li>
@@ -3721,6 +3705,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3731,7 +3716,7 @@ <h2 class="jaws nvda">Test 43: Navigate to a cell containing a link on the next
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3769,6 +3754,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3795,6 +3781,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3805,7 +3792,7 @@ <h2 class="voiceover_macos">Test 44: Navigate to a cell containing a link on the
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3843,6 +3830,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3853,7 +3841,7 @@ <h2 class="jaws nvda">Test 45: Navigate to a cell containing a link on the previ
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3891,6 +3879,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3906,7 +3895,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the previous row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Up</li>
@@ -3917,6 +3906,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3927,7 +3917,7 @@ <h2 class="jaws nvda">Test 46: Navigate to a cell containing a link on the previ
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3965,6 +3955,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3991,6 +3982,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -4001,7 +3993,7 @@ <h2 class="voiceover_macos">Test 47: Navigate to a cell containing a link on the
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4039,6 +4031,7 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
+            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -4049,7 +4042,7 @@ <h2 class="jaws nvda">Test 48: Navigate to the first cell of a row in a grid in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4123,7 +4116,7 @@ <h2 class="voiceover_macos">Test 49: Navigate to the first cell of a row in a gr
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4170,7 +4163,7 @@ <h2 class="jaws nvda">Test 50: Navigate to the last cell of a row in a grid in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4244,7 +4237,7 @@ <h2 class="voiceover_macos">Test 51: Navigate to the last cell of a row in a gri
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4291,7 +4284,7 @@ <h2 class="jaws nvda">Test 52: Navigate to the first cell in a grid in interacti
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4365,7 +4358,7 @@ <h2 class="voiceover_macos">Test 53: Navigate to the first cell in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4412,7 +4405,7 @@ <h2 class="jaws nvda">Test 54: Navigate to the last cell in a grid in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4486,7 +4479,7 @@ <h2 class="voiceover_macos">Test 55: Navigate to the last cell in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/modal-dialog.html b/build/review/modal-dialog.html
index 995bebb54..b6abb1d56 100644
--- a/build/review/modal-dialog.html
+++ b/build/review/modal-dialog.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: modal-dialog (29 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Open a modal dialog in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Open a modal dialog in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-01-open-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +899,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Add Delivery Address&#39; button, open the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -950,7 +922,7 @@ <h2 class="jaws nvda">Test 2: Open a modal dialog in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-02-open-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1030,7 +1002,7 @@ <h2 class="voiceover_macos">Test 3: Open a Modal Dialog</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-03-open-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1082,7 +1054,7 @@ <h2 class="jaws nvda">Test 4: Close a modal dialog in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-04-close-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1134,7 +1106,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, close the dialog. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -1154,7 +1126,7 @@ <h2 class="jaws nvda">Test 5: Close a modal dialog in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-05-close-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1226,7 +1198,7 @@ <h2 class="voiceover_macos">Test 6: Close a modal dialog</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-06-close-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1272,7 +1244,7 @@ <h2 class="jaws nvda">Test 7: Close a modal dialog using a button in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html?at=jaws">jaws</a></li>
@@ -1325,7 +1297,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Cancel&#39; button inside a modal dialog, press the button to close the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1346,7 +1318,7 @@ <h2 class="jaws nvda">Test 8: Close a modal dialog using a button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html?at=jaws">jaws</a></li>
@@ -1420,7 +1392,7 @@ <h2 class="voiceover_macos">Test 9: Close a modal dialog using a button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1468,7 +1440,7 @@ <h2 class="jaws nvda">Test 10: Navigate to the last focusable element in a modal
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1540,7 +1512,7 @@ <h2 class="voiceover_macos">Test 11: Navigate to the last focusable element in a
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1586,7 +1558,7 @@ <h2 class="jaws nvda">Test 12: Navigate to the first focusable element in a moda
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1658,7 +1630,7 @@ <h2 class="voiceover_macos">Test 13: Navigate to the first focusable element in
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1704,7 +1676,7 @@ <h2 class="jaws nvda">Test 14: Navigate to the beginning of a modal dialog in re
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1757,7 +1729,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, navigate to the beginning of the dialog. using the following commands:
                <ul>
                    <li>Control+Home</li>
@@ -1778,7 +1750,7 @@ <h2 class="voiceover_macos">Test 15: Navigate to the beginning of a modal dialog
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1825,7 +1797,7 @@ <h2 class="jaws nvda">Test 16: Navigate to the end of a modal dialog in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1877,7 +1849,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, navigate to the end of the dialog. using the following commands:
                <ul>
                    <li>Control+End</li>
@@ -1897,7 +1869,7 @@ <h2 class="voiceover_macos">Test 17: Navigate to the end of a modal dialog</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1943,7 +1915,7 @@ <h2 class="jaws nvda">Test 18: Open a nested modal dialog in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -2002,7 +1974,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Add&#39; button inside a modal dialog, open the nested &#39;Address Added&#39; dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2026,7 +1998,7 @@ <h2 class="jaws nvda">Test 19: Open a nested modal dialog in interaction mode</h
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -2109,7 +2081,7 @@ <h2 class="voiceover_macos">Test 20: Open a nested modal dialog</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2163,7 +2135,7 @@ <h2 class="jaws nvda">Test 21: Close a nested modal dialog in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -2219,7 +2191,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Close&#39; button inside a modal dialog, close the dialog. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -2241,7 +2213,7 @@ <h2 class="jaws nvda">Test 22: Close a nested modal dialog in interaction mode</
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -2319,7 +2291,7 @@ <h2 class="voiceover_macos">Test 23: Close a nested modal dialog</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2369,7 +2341,7 @@ <h2 class="jaws nvda">Test 24: Close a nested modal dialog using a button in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html?at=jaws">jaws</a></li>
@@ -2426,7 +2398,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Close&#39; button inside a modal dialog, press the button to close the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2449,7 +2421,7 @@ <h2 class="jaws nvda">Test 25: Close a nested modal dialog using a button in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html?at=jaws">jaws</a></li>
@@ -2529,7 +2501,7 @@ <h2 class="voiceover_macos">Test 26: Close a nested modal dialog using a button<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2581,7 +2553,7 @@ <h2 class="jaws nvda">Test 27: Open a nested modal dialog using a link in readin
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html?at=jaws">jaws</a></li>
@@ -2639,7 +2611,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;your profile&#39; link inside a modal dialog, open the nested &#39;End of the Road!&#39; dialog. using the following commands:
                <ul>
                    <li>Enter</li>
@@ -2662,7 +2634,7 @@ <h2 class="jaws nvda">Test 28: Open a nested modal dialog using a link in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html?at=jaws">jaws</a></li>
@@ -2743,7 +2715,7 @@ <h2 class="voiceover_macos">Test 29: Open a nested modal dialog using a link</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/radiogroup-aria-activedescendant.html b/build/review/radiogroup-aria-activedescendant.html
index a417b1682..799690b9e 100644
--- a/build/review/radiogroup-aria-activedescendant.html
+++ b/build/review/radiogroup-aria-activedescendant.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: radiogroup-aria-activedescendant (39 tests)</h
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a group in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -934,7 +906,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>F</li>
@@ -961,7 +933,7 @@ <h2 class="voiceover_macos">Test 2: Navigate to the first unchecked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1018,7 +990,7 @@ <h2 class="jaws nvda">Test 3: navigate to the last unchecked radio button in a g
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1082,7 +1054,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1109,7 +1081,7 @@ <h2 class="voiceover_macos">Test 4: Navigate to the last unchecked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1166,7 +1138,7 @@ <h2 class="jaws nvda">Test 5: Navigate to the first checked radio button in a gr
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1230,7 +1202,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1257,7 +1229,7 @@ <h2 class="voiceover_macos">Test 6: Navigate to the first checked radio button i
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1314,7 +1286,7 @@ <h2 class="jaws nvda">Test 7: Navigate to the last checked radio button in a gro
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1378,7 +1350,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1405,7 +1377,7 @@ <h2 class="voiceover_macos">Test 8: Navigate to the last checked radio button in
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1462,7 +1434,7 @@ <h2 class="jaws nvda">Test 9: Navigate forwards to an unchecked radio button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1549,7 +1521,7 @@ <h2 class="voiceover_macos">Test 10: Navigate forwards to an unchecked radio but
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1605,7 +1577,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards to an unchecked radio button i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1692,7 +1664,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to an unchecked radio bu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1748,7 +1720,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a checked radio button in in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1835,7 +1807,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a checked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1891,7 +1863,7 @@ <h2 class="jaws nvda">Test 15: Navigate backwards to a checked radio button in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1978,7 +1950,7 @@ <h2 class="voiceover_macos">Test 16: Navigate backwards to a checked radio butto
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2034,7 +2006,7 @@ <h2 class="jaws nvda">Test 17: Navigate out of the start of a radio group in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2092,7 +2064,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -2116,7 +2088,7 @@ <h2 class="jaws nvda">Test 18: Navigate out of the start of a radio group in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2196,7 +2168,7 @@ <h2 class="voiceover_macos">Test 19: Navigate out of the start of a radio group<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2248,7 +2220,7 @@ <h2 class="jaws nvda">Test 20: Navigate out of the end of a radio group in readi
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2306,7 +2278,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Thin crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -2330,7 +2302,7 @@ <h2 class="jaws nvda">Test 21: Navigate out of the end of a radio group in inter
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2410,7 +2382,7 @@ <h2 class="voiceover_macos">Test 22: Navigate out of the end of a radio group</h
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2462,7 +2434,7 @@ <h2 class="jaws nvda">Test 23: Read information about an unchecked radio button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2521,7 +2493,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2545,7 +2517,7 @@ <h2 class="jaws nvda">Test 24: Read information about an unchecked radio button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2628,7 +2600,7 @@ <h2 class="voiceover_macos">Test 25: Read information about an unchecked radio b
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2681,7 +2653,7 @@ <h2 class="jaws nvda">Test 26: Read information about a checked radio button in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2740,7 +2712,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2764,7 +2736,7 @@ <h2 class="jaws nvda">Test 27: Read information about a checked radio button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2847,7 +2819,7 @@ <h2 class="voiceover_macos">Test 28: Read information about a checked radio butt
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2900,7 +2872,7 @@ <h2 class="jaws nvda">Test 29: Navigate to the next radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2983,7 +2955,7 @@ <h2 class="voiceover_macos">Test 30: Navigate to the next radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3037,7 +3009,7 @@ <h2 class="jaws nvda">Test 31: Navigate to the previous radio button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3120,7 +3092,7 @@ <h2 class="voiceover_macos">Test 32: Navigate to the previous radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3174,7 +3146,7 @@ <h2 class="jaws nvda">Test 33: Navigate to the first radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3257,7 +3229,7 @@ <h2 class="voiceover_macos">Test 34: Navigate to the first radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3310,7 +3282,7 @@ <h2 class="jaws nvda">Test 35: Navigate to the last radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3393,7 +3365,7 @@ <h2 class="voiceover_macos">Test 36: Navigate to the last radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3446,7 +3418,7 @@ <h2 class="jaws nvda">Test 37: Check a radio button in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -3498,7 +3470,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, check the radio button. using the following commands:
                <ul>
                    <li>Space</li>
@@ -3517,7 +3489,7 @@ <h2 class="jaws nvda">Test 38: Check a radio button in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3588,7 +3560,7 @@ <h2 class="voiceover_macos">Test 39: Check a radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/radiogroup-roving-tabindex.html b/build/review/radiogroup-roving-tabindex.html
index 96bac0174..1a16542fd 100644
--- a/build/review/radiogroup-roving-tabindex.html
+++ b/build/review/radiogroup-roving-tabindex.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: radiogroup-roving-tabindex (39 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a group in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -933,7 +905,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>F</li>
@@ -960,7 +932,7 @@ <h2 class="voiceover_macos">Test 2: Navigate to the first unchecked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1016,7 +988,7 @@ <h2 class="jaws nvda">Test 3: navigate to the last unchecked radio button in a g
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1079,7 +1051,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1106,7 +1078,7 @@ <h2 class="voiceover_macos">Test 4: Navigate to the last unchecked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1162,7 +1134,7 @@ <h2 class="jaws nvda">Test 5: Navigate to the first checked radio button in a gr
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1225,7 +1197,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1252,7 +1224,7 @@ <h2 class="voiceover_macos">Test 6: Navigate to the first checked radio button i
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1308,7 +1280,7 @@ <h2 class="jaws nvda">Test 7: Navigate to the last checked radio button in a gro
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1371,7 +1343,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1398,7 +1370,7 @@ <h2 class="voiceover_macos">Test 8: Navigate to the last checked radio button in
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1454,7 +1426,7 @@ <h2 class="jaws nvda">Test 9: Navigate forwards to an unchecked radio button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1540,7 +1512,7 @@ <h2 class="voiceover_macos">Test 10: Navigate forwards to an unchecked radio but
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1595,7 +1567,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards to an unchecked radio button i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1681,7 +1653,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to an unchecked radio bu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1736,7 +1708,7 @@ <h2 class="jaws nvda">Test 13: Navigate forwards to a checked radio button in in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1822,7 +1794,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a checked radio button
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1877,7 +1849,7 @@ <h2 class="jaws nvda">Test 15: Navigate backwards to a checked radio button in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1963,7 +1935,7 @@ <h2 class="voiceover_macos">Test 16: Navigate backwards to a checked radio butto
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2018,7 +1990,7 @@ <h2 class="jaws nvda">Test 17: Navigate out of the start of a radio group in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2076,7 +2048,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -2100,7 +2072,7 @@ <h2 class="jaws nvda">Test 18: Navigate out of the start of a radio group in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2180,7 +2152,7 @@ <h2 class="voiceover_macos">Test 19: Navigate out of the start of a radio group<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2232,7 +2204,7 @@ <h2 class="jaws nvda">Test 20: Navigate out of the end of a radio group in readi
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2290,7 +2262,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Thin crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -2314,7 +2286,7 @@ <h2 class="jaws nvda">Test 21: Navigate out of the end of a radio group in inter
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2394,7 +2366,7 @@ <h2 class="voiceover_macos">Test 22: Navigate out of the end of a radio group</h
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2446,7 +2418,7 @@ <h2 class="jaws nvda">Test 23: Read information about an unchecked radio button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2504,7 +2476,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2528,7 +2500,7 @@ <h2 class="jaws nvda">Test 24: Read information about an unchecked radio button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2610,7 +2582,7 @@ <h2 class="voiceover_macos">Test 25: Read information about an unchecked radio b
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2662,7 +2634,7 @@ <h2 class="jaws nvda">Test 26: Read information about a checked radio button in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2720,7 +2692,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2744,7 +2716,7 @@ <h2 class="jaws nvda">Test 27: Read information about a checked radio button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2826,7 +2798,7 @@ <h2 class="voiceover_macos">Test 28: Read information about a checked radio butt
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2878,7 +2850,7 @@ <h2 class="jaws nvda">Test 29: Navigate to the next radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2960,7 +2932,7 @@ <h2 class="voiceover_macos">Test 30: Navigate to the next radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3013,7 +2985,7 @@ <h2 class="jaws nvda">Test 31: Navigate to the previous radio button in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3095,7 +3067,7 @@ <h2 class="voiceover_macos">Test 32: Navigate to the previous radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3148,7 +3120,7 @@ <h2 class="jaws nvda">Test 33: Navigate to the first radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3230,7 +3202,7 @@ <h2 class="voiceover_macos">Test 34: Navigate to the first radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3282,7 +3254,7 @@ <h2 class="jaws nvda">Test 35: Navigate to the last radio button in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3364,7 +3336,7 @@ <h2 class="voiceover_macos">Test 36: Navigate to the last radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3416,7 +3388,7 @@ <h2 class="jaws nvda">Test 37: Check a radio button in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -3468,7 +3440,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, check the radio button. using the following commands:
                <ul>
                    <li>Space</li>
@@ -3487,7 +3459,7 @@ <h2 class="jaws nvda">Test 38: Check a radio button in interaction mode</h2>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3558,7 +3530,7 @@ <h2 class="voiceover_macos">Test 39: Check a radio button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/rating-slider.html b/build/review/rating-slider.html
index ec99b9d48..e224ac1cc 100644
--- a/build/review/rating-slider.html
+++ b/build/review/rating-slider.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: rating-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-01-navigate-forwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -934,7 +906,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Rating&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -960,7 +932,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a slider in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-02-navigate-backwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -1024,7 +996,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Rating&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1050,7 +1022,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a slider in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-03-navigate-forwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1138,7 +1110,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a slider in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-04-navigate-backwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1226,7 +1198,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-05-navigate-forwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1284,7 +1256,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-06-navigate-backwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1342,7 +1314,7 @@ <h2 class="jaws nvda">Test 7: Read information about a slider in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-07-read-information-about-slider-reading.html?at=jaws">jaws</a></li>
@@ -1406,7 +1378,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Rating&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1432,7 +1404,7 @@ <h2 class="jaws nvda">Test 8: Read information about a slider in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-08-read-information-about-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1522,7 +1494,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-09-read-information-about-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1580,7 +1552,7 @@ <h2 class="jaws nvda">Test 10: Increment a slider by one half star in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-10-increment-slider-by-one-half-star-interaction.html?at=jaws">jaws</a></li>
@@ -1656,7 +1628,7 @@ <h2 class="voiceover_macos">Test 11: Increment a slider by one half star</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-11-increment-slider-by-one-half-star-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1705,7 +1677,7 @@ <h2 class="jaws nvda">Test 12: Decrement a slider by one half star in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-12-decrement-slider-by-one-half-star-interaction.html?at=jaws">jaws</a></li>
@@ -1781,7 +1753,7 @@ <h2 class="voiceover_macos">Test 13: Decrement a slider by one half star</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-13-decrement-slider-by-one-half-star-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1830,7 +1802,7 @@ <h2 class="jaws nvda">Test 14: Increment a slider by one star in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-14-increment-slider-by-one-star-interaction.html?at=jaws">jaws</a></li>
@@ -1904,7 +1876,7 @@ <h2 class="voiceover_macos">Test 15: Increment a slider by one star</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-15-increment-slider-by-one-star-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1952,7 +1924,7 @@ <h2 class="jaws nvda">Test 16: Decrement a slider by one star in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-16-decrement-slider-by-one-star-interaction.html?at=jaws">jaws</a></li>
@@ -2026,7 +1998,7 @@ <h2 class="voiceover_macos">Test 17: Decrement a slider by one star in interacti
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-17-decrement-slider-by-one-star-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2074,7 +2046,7 @@ <h2 class="jaws nvda">Test 18: Decrement a slider to the minimum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-18-decrement-slider-to-minimum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2149,7 +2121,7 @@ <h2 class="voiceover_macos">Test 19: Decrement a slider to the minimum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-19-decrement-slider-to-minimum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2198,7 +2170,7 @@ <h2 class="jaws nvda">Test 20: Increment a slider to the maximum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-20-increment-slider-to-maximum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2273,7 +2245,7 @@ <h2 class="voiceover_macos">Test 21: Increment a slider to the maximum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Sat Oct 23 13:56:15 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/rating-slider/test-21-increment-slider-to-maximum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/seek-slider.html b/build/review/seek-slider.html
index 2766d8157..c142f31bc 100644
--- a/build/review/seek-slider.html
+++ b/build/review/seek-slider.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: seek-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-01-navigate-forwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -934,7 +906,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Seek&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -960,7 +932,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a slider in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-02-navigate-backwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -1024,7 +996,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Seek&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1050,7 +1022,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a slider in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-03-navigate-forwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1138,7 +1110,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a slider in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-04-navigate-backwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1226,7 +1198,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-05-navigate-forwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1284,7 +1256,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-06-navigate-backwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1342,7 +1314,7 @@ <h2 class="jaws nvda">Test 7: Read information about a slider in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-07-read-information-about-slider-reading.html?at=jaws">jaws</a></li>
@@ -1406,7 +1378,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Seek&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1432,7 +1404,7 @@ <h2 class="jaws nvda">Test 8: Read information about a slider in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-08-read-information-about-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1522,7 +1494,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-09-read-information-about-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1580,7 +1552,7 @@ <h2 class="jaws nvda">Test 10: Increment a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-10-increment-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1656,7 +1628,7 @@ <h2 class="voiceover_macos">Test 11: Increment a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-11-increment-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1705,7 +1677,7 @@ <h2 class="jaws nvda">Test 12: Decrement a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-12-decrement-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1781,7 +1753,7 @@ <h2 class="voiceover_macos">Test 13: Decrement a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-13-decrement-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1830,7 +1802,7 @@ <h2 class="jaws nvda">Test 14: Increment a slider by fifteen steps in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-14-increment-slider-by-fifteen-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1904,7 +1876,7 @@ <h2 class="voiceover_macos">Test 15: Increment a slider by fifteen steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-15-increment-slider-by-fifteen-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1952,7 +1924,7 @@ <h2 class="jaws nvda">Test 16: Decrement a slider by fifteen steps in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-16-decrement-slider-by-fifteen-steps-interaction.html?at=jaws">jaws</a></li>
@@ -2026,7 +1998,7 @@ <h2 class="voiceover_macos">Test 17: Decrement a slider by fifteen steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-17-decrement-slider-by-fifteen-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2074,7 +2046,7 @@ <h2 class="jaws nvda">Test 18: Decrement a slider to the minimum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-18-decrement-slider-to-minimum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2149,7 +2121,7 @@ <h2 class="voiceover_macos">Test 19: Decrement a slider to the minimum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-19-decrement-slider-to-minimum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2198,7 +2170,7 @@ <h2 class="jaws nvda">Test 20: Increment a slider to the maximum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-20-increment-slider-to-maximum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2273,7 +2245,7 @@ <h2 class="voiceover_macos">Test 21: Increment a slider to the maximum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 13:20:46 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/seek-slider/test-21-increment-slider-to-maximum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/switch.html b/build/review/switch.html
index 1cc1654a1..0fe1ef5c9 100644
--- a/build/review/switch.html
+++ b/build/review/switch.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: switch (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a switch in the off state in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a switch in the off state in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-01-navigate-forwards-to-a-switch-in-the-off-state-reading.html?at=jaws">jaws</a></li>
@@ -928,7 +900,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>B</li>
@@ -952,7 +924,7 @@ <h2 class="jaws nvda">Test 2: Navigate forwards to a switch in the off state in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-02-navigate-forwards-to-a-switch-in-the-off-state-interaction.html?at=jaws">jaws</a></li>
@@ -1029,7 +1001,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards to a switch in the off sta
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-03-navigate-forwards-to-a-switch-in-the-off-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1081,7 +1053,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a switch in the off state in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-04-navigate-backwards-to-a-switch-in-the-off-state-reading.html?at=jaws">jaws</a></li>
@@ -1139,7 +1111,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1163,7 +1135,7 @@ <h2 class="jaws nvda">Test 5: Navigate backwards to a switch in the off state in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-05-navigate-backwards-to-a-switch-in-the-off-state-interaction.html?at=jaws">jaws</a></li>
@@ -1240,7 +1212,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a switch in the off st
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-06-navigate-backwards-to-a-switch-in-the-off-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1292,7 +1264,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards to a switch in the on state in r
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-07-navigate-forwards-to-a-switch-in-the-on-state-reading.html?at=jaws">jaws</a></li>
@@ -1350,7 +1322,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>B</li>
@@ -1374,7 +1346,7 @@ <h2 class="jaws nvda">Test 8: Navigate forwards to a switch in the on state in i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-08-navigate-forwards-to-a-switch-in-the-on-state-interaction.html?at=jaws">jaws</a></li>
@@ -1451,7 +1423,7 @@ <h2 class="voiceover_macos">Test 9: Navigate forwards to a switch in the on stat
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-09-navigate-forwards-to-a-switch-in-the-on-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1503,7 +1475,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards to a switch in the on state in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-10-navigate-backwards-to-a-switch-in-the-on-state-reading.html?at=jaws">jaws</a></li>
@@ -1561,7 +1533,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1585,7 +1557,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards to a switch in the on state in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-11-navigate-backwards-to-a-switch-in-the-on-state-interaction.html?at=jaws">jaws</a></li>
@@ -1662,7 +1634,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to a switch in the on st
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-12-navigate-backwards-to-a-switch-in-the-on-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1714,7 +1686,7 @@ <h2 class="jaws nvda">Test 13: Read information about a switch in the off state
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-13-read-information-about-a-switch-in-the-off-state-reading.html?at=jaws">jaws</a></li>
@@ -1771,7 +1743,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, read information about the switch. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1793,7 +1765,7 @@ <h2 class="jaws nvda">Test 14: Read information about a switch in the off state
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-14-read-information-about-a-switch-in-the-off-state-interaction.html?at=jaws">jaws</a></li>
@@ -1872,7 +1844,7 @@ <h2 class="voiceover_macos">Test 15: Read information about a switch in the off
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-15-read-information-about-a-switch-in-the-off-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1923,7 +1895,7 @@ <h2 class="jaws nvda">Test 16: Read information about a switch in the on state i
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-16-read-information-about-a-switch-in-the-on-state-reading.html?at=jaws">jaws</a></li>
@@ -1980,7 +1952,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, read information about the switch. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2002,7 +1974,7 @@ <h2 class="jaws nvda">Test 17: Read information about a switch in the on state i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-17-read-information-about-a-switch-in-the-on-state-interaction.html?at=jaws">jaws</a></li>
@@ -2081,7 +2053,7 @@ <h2 class="voiceover_macos">Test 18: Read information about a switch in the on s
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-18-read-information-about-a-switch-in-the-on-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2132,7 +2104,7 @@ <h2 class="jaws nvda">Test 19: Operate a switch in the off state in reading mode
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-19-operate-a-switch-in-the-off-state-reading.html?at=jaws">jaws</a></li>
@@ -2185,7 +2157,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, change its state to &#39;on&#39;. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2205,7 +2177,7 @@ <h2 class="jaws nvda">Test 20: Operate a switch in the off state in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-20-operate-a-switch-in-the-off-state-interaction.html?at=jaws">jaws</a></li>
@@ -2278,7 +2250,7 @@ <h2 class="voiceover_macos">Test 21: Operate a switch in the off state</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-21-operate-a-switch-in-the-off-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2326,7 +2298,7 @@ <h2 class="jaws nvda">Test 22: Operate a switch in the on state in reading mode<
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-22-operate-a-switch-in-the-on-state-reading.html?at=jaws">jaws</a></li>
@@ -2379,7 +2351,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, change its state to &#39;off&#39;. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2399,7 +2371,7 @@ <h2 class="jaws nvda">Test 23: Operate a switch in the on state in interaction m
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-23-operate-a-switch-in-the-on-state-interaction.html?at=jaws">jaws</a></li>
@@ -2472,7 +2444,7 @@ <h2 class="voiceover_macos">Test 24: Operate a switch in the on state</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Tue Jan 4 09:55:50 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/switch/test-24-operate-a-switch-in-the-on-state-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/tabs-manual-activation.html b/build/review/tabs-manual-activation.html
index e9326e538..15c1e8a1d 100644
--- a/build/review/tabs-manual-activation.html
+++ b/build/review/tabs-manual-activation.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: tabs-manual-activation (29 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a tab list in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a tab list in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -933,7 +905,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the tab list. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the tab list. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -959,7 +931,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a tab list in reading mode</
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1022,7 +994,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the tab list. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the tab list. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -1048,7 +1020,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a tab list in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1135,7 +1107,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a tab list in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1222,7 +1194,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1280,7 +1252,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1338,7 +1310,7 @@ <h2 class="jaws nvda">Test 7: Read information about a tab in a tab list in read
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1397,7 +1369,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Nils Frahm&#39; tab, read information about the tab. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1421,7 +1393,7 @@ <h2 class="jaws nvda">Test 8: Read information about a tab in a tab list in inte
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1504,7 +1476,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a tab in a tab list</
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1557,7 +1529,7 @@ <h2 class="jaws nvda">Test 10: Navigate to the next tab in a tab list in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1613,7 +1585,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Nils Frahm&#39; tab, navigate to the next tab. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1635,7 +1607,7 @@ <h2 class="jaws nvda">Test 11: Navigate to the next tab in a tab list in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1713,7 +1685,7 @@ <h2 class="voiceover_macos">Test 12: Navigate to the next tab in a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1763,7 +1735,7 @@ <h2 class="jaws nvda">Test 13: Navigate to the previous tab in a tab list in rea
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1821,7 +1793,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Agnes Obel&#39; tab, navigate to the previous tab. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1844,7 +1816,7 @@ <h2 class="jaws nvda">Test 14: Navigate to the previous tab in a tab list in int
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1925,7 +1897,7 @@ <h2 class="voiceover_macos">Test 15: Navigate to the previous tab in a tab list<
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1977,7 +1949,7 @@ <h2 class="jaws nvda">Test 16: Navigate to the first tab in a tab list in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2058,7 +2030,7 @@ <h2 class="voiceover_macos">Test 17: Navigate to the first tab in a tab list</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2110,7 +2082,7 @@ <h2 class="jaws nvda">Test 18: Navigate to the last tab in a tab list in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2188,7 +2160,7 @@ <h2 class="voiceover_macos">Test 19: Navigate to the last tab in a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2238,7 +2210,7 @@ <h2 class="jaws nvda">Test 20: Navigate forwards to a tab panel in interaction m
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html?at=jaws">jaws</a></li>
@@ -2314,7 +2286,7 @@ <h2 class="jaws nvda">Test 21: Navigate backwards to a tab panel in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html?at=jaws">jaws</a></li>
@@ -2390,7 +2362,7 @@ <h2 class="voiceover_macos">Test 22: Navigate forwards to a tab panel</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2440,7 +2412,7 @@ <h2 class="voiceover_macos">Test 23: Navigate backwards to a tab panel</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2490,7 +2462,7 @@ <h2 class="jaws nvda">Test 24: Activate a tab in a tab list in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -2543,7 +2515,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Agnes Obel&#39; tab, activate the tab. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2563,7 +2535,7 @@ <h2 class="jaws nvda">Test 25: Activate a tab in a tab list in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2636,7 +2608,7 @@ <h2 class="voiceover_macos">Test 26: Activate a tab in a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2684,7 +2656,7 @@ <h2 class="jaws nvda">Test 27: Delete a tab from a tab list in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -2742,7 +2714,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Joke&#39; tab, delete the tab. using the following commands:
                <ul>
                    <li>Delete</li>
@@ -2765,7 +2737,7 @@ <h2 class="jaws nvda">Test 28: Delete a tab from a tab list in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2846,7 +2818,7 @@ <h2 class="voiceover_macos">Test 29: Delete a tab from a tab list</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/toggle-button.html b/build/review/toggle-button.html
index b13653764..e90bf716f 100644
--- a/build/review/toggle-button.html
+++ b/build/review/toggle-button.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: toggle-button (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a not pressed toggle button in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a not pressed toggle button i
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -928,7 +900,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -952,7 +924,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a not pressed toggle button
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1010,7 +982,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1034,7 +1006,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a not pressed toggle button i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1110,7 +1082,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a not pressed toggle button
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1186,7 +1158,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a not pressed toggle bu
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1237,7 +1209,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a not pressed toggle b
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1288,7 +1260,7 @@ <h2 class="jaws nvda">Test 7: Navigate forwards to a pressed toggle button in re
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1346,7 +1318,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1370,7 +1342,7 @@ <h2 class="jaws nvda">Test 8: Navigate backwards to a pressed toggle button in r
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1428,7 +1400,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1452,7 +1424,7 @@ <h2 class="jaws nvda">Test 9: Navigate forwards to a pressed toggle button in in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1528,7 +1500,7 @@ <h2 class="jaws nvda">Test 10: Navigate backwards to a pressed toggle button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1604,7 +1576,7 @@ <h2 class="voiceover_macos">Test 11: Navigate forwards to a pressed toggle butto
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1655,7 +1627,7 @@ <h2 class="voiceover_macos">Test 12: Navigate backwards to a pressed toggle butt
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Wed Oct 20 13:32:55 2021 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1706,7 +1678,7 @@ <h2 class="jaws nvda">Test 13: Read information about a not pressed toggle butto
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1762,7 +1734,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1784,7 +1756,7 @@ <h2 class="jaws nvda">Test 14: Read information about a not pressed toggle butto
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1862,7 +1834,7 @@ <h2 class="voiceover_macos">Test 15: Read information about a not pressed toggle
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1912,7 +1884,7 @@ <h2 class="jaws nvda">Test 16: Read information about a pressed toggle button in
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1968,7 +1940,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1990,7 +1962,7 @@ <h2 class="jaws nvda">Test 17: Read information about a pressed toggle button in
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -2068,7 +2040,7 @@ <h2 class="voiceover_macos">Test 18: Read information about a pressed toggle but
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2118,7 +2090,7 @@ <h2 class="jaws nvda">Test 19: Operate a not pressed toggle button in reading mo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -2172,7 +2144,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, activate the button. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2192,7 +2164,7 @@ <h2 class="jaws nvda">Test 20: Operate a not pressed toggle button in interactio
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -2266,7 +2238,7 @@ <h2 class="voiceover_macos">Test 21: Operate a not pressed toggle button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2316,7 +2288,7 @@ <h2 class="jaws nvda">Test 22: Operate a pressed toggle button in reading mode</
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -2370,7 +2342,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, activate the button. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2390,7 +2362,7 @@ <h2 class="jaws nvda">Test 23: Operate a pressed toggle button in interaction mo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -2464,7 +2436,7 @@ <h2 class="voiceover_macos">Test 24: Operate a pressed toggle button</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/vertical-temperature-slider.html b/build/review/vertical-temperature-slider.html
index 814f8af10..79f4e8318 100644
--- a/build/review/vertical-temperature-slider.html
+++ b/build/review/vertical-temperature-slider.html
@@ -21,37 +21,6 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
-      function numberTests(value) {
-        let testNumber = 0;
-        let titleTextChanged = false;
-        let buttonTextChanged = false;
-
-        for (let result of document.querySelectorAll(value)) {
-          result.style.display = 'block';
-
-          if (titleTextChanged && buttonTextChanged) {
-            testNumber += 1;
-
-            titleTextChanged = false;
-            buttonTextChanged = false;
-          }
-
-          if (result.nodeName === 'H2') {
-            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
-            titleTextChanged = true;
-          }
-
-          if (result.nodeName === 'BUTTON') {
-            result.value = `Open Test ${testNumber + 1} Page`;
-            result.innerText = `Open Test ${testNumber + 1} Page`;
-            buttonTextChanged = true;
-          }
-        }
-
-        let reviewPageTitle = document.querySelector('h1');
-        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
-      }
-
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -67,7 +36,6 @@
               at.checked = true;
             }
           }
-          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -82,8 +50,12 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
+
+          }
+
+          for (let result of document.querySelectorAll(`.${val}`)) {
+            result.style.display = 'block';
           }
-          numberTests(`.${val}`);
         }
       };
 
@@ -860,9 +832,9 @@ <h1>Test plan review for pattern: vertical-temperature-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -870,7 +842,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-01-navigate-forwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -935,7 +907,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Temperature&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -961,7 +933,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a slider in reading mode</h2
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-02-navigate-backwards-to-slider-reading.html?at=jaws">jaws</a></li>
@@ -1026,7 +998,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Temperature&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1052,7 +1024,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a slider in interaction mode<
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-03-navigate-forwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1141,7 +1113,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a slider in interaction mode
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-04-navigate-backwards-to-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1230,7 +1202,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-05-navigate-forwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1289,7 +1261,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-06-navigate-backwards-to-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1348,7 +1320,7 @@ <h2 class="jaws nvda">Test 7: Read information about a slider in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-07-read-information-about-slider-reading.html?at=jaws">jaws</a></li>
@@ -1413,7 +1385,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Temperature&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1439,7 +1411,7 @@ <h2 class="jaws nvda">Test 8: Read information about a slider in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-08-read-information-about-slider-interaction.html?at=jaws">jaws</a></li>
@@ -1530,7 +1502,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a slider</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-09-read-information-about-slider-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1589,7 +1561,7 @@ <h2 class="jaws nvda">Test 10: Increment a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-10-increment-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1665,7 +1637,7 @@ <h2 class="voiceover_macos">Test 11: Increment a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-11-increment-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1714,7 +1686,7 @@ <h2 class="jaws nvda">Test 12: Decrement a slider by one step in interaction mod
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-12-decrement-slider-by-one-step-interaction.html?at=jaws">jaws</a></li>
@@ -1790,7 +1762,7 @@ <h2 class="voiceover_macos">Test 13: Decrement a slider by one step</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-13-decrement-slider-by-one-step-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1839,7 +1811,7 @@ <h2 class="jaws nvda">Test 14: Increment a slider by twenty steps in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-14-increment-slider-by-twenty-steps-interaction.html?at=jaws">jaws</a></li>
@@ -1913,7 +1885,7 @@ <h2 class="voiceover_macos">Test 15: Increment a slider by twenty steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-15-increment-slider-by-twenty-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1961,7 +1933,7 @@ <h2 class="jaws nvda">Test 16: Decrement a slider by twenty steps in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-16-decrement-slider-by-twenty-steps-interaction.html?at=jaws">jaws</a></li>
@@ -2035,7 +2007,7 @@ <h2 class="voiceover_macos">Test 17: Decrement a slider by twenty steps</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-17-decrement-slider-by-twenty-steps-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2083,7 +2055,7 @@ <h2 class="jaws nvda">Test 18: Decrement a slider to the minimum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-18-decrement-slider-to-minimum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2158,7 +2130,7 @@ <h2 class="voiceover_macos">Test 19: Decrement a slider to the minimum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-19-decrement-slider-to-minimum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2207,7 +2179,7 @@ <h2 class="jaws nvda">Test 20: Increment a slider to the maximum value in intera
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-20-increment-slider-to-maximum-value-interaction.html?at=jaws">jaws</a></li>
@@ -2282,7 +2254,7 @@ <h2 class="voiceover_macos">Test 21: Increment a slider to the maximum value</h2
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Thu Feb 17 16:24:22 2022 +0000</li>
+        <li>Last edited: Thu Nov 4 16:42:05 2021 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/vertical-temperature-slider/test-21-increment-slider-to-maximum-value-interaction.html?at=voiceover_macos">voiceover_macos</a></li>

From b46844853c381d4b80f7e4c875ea45b012a383f0 Mon Sep 17 00:00:00 2001
From: howard-e <howard-e@users.noreply.github.com>
Date: Mon, 7 Mar 2022 22:30:21 +0000
Subject: [PATCH 3/4] Generate test and review files automatically

---
 build/index.html | 67 ++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/build/index.html b/build/index.html
index 6c67bb876..02d716722 100644
--- a/build/index.html
+++ b/build/index.html
@@ -21,6 +21,11 @@
         padding: .5em;
       }
 
+      tr:not(:first-of-type) th {
+        padding: .5em;
+        text-align: left;
+      }
+
     </style>
   </head>
   <body>
@@ -32,11 +37,11 @@ <h1>Test Patterns for Review</h1>
         <th>Pattern</th>
         <th>Index Page</th>
         <th>Review Page</th>
-        <th># of Tests</th>
+        <th>Number of Tests</th>
         <th>Commit of Last Change</th>
       </tr>
           <tr>
-            <td>alert</td>
+            <th>alert</th>
             <td><a href="./tests/alert/index.html">Index</a></td>
             <td><a href="./review/alert.html">Review</a></td>
             <td>3</td>
@@ -44,7 +49,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>banner</td>
+            <th>banner</th>
             <td><a href="./tests/banner/index.html">Index</a></td>
             <td><a href="./review/banner.html">Review</a></td>
             <td>26</td>
@@ -52,7 +57,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>breadcrumb</td>
+            <th>breadcrumb</th>
             <td><a href="./tests/breadcrumb/index.html">Index</a></td>
             <td><a href="./review/breadcrumb.html">Review</a></td>
             <td>9</td>
@@ -60,7 +65,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>checkbox</td>
+            <th>checkbox</th>
             <td><a href="./tests/checkbox/index.html">Index</a></td>
             <td><a href="./review/checkbox.html">Review</a></td>
             <td>26</td>
@@ -68,7 +73,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>checkbox-tri-state</td>
+            <th>checkbox-tri-state</th>
             <td><a href="./tests/checkbox-tri-state/index.html">Index</a></td>
             <td><a href="./review/checkbox-tri-state.html">Review</a></td>
             <td>24</td>
@@ -76,7 +81,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>combobox-autocomplete-both-updated</td>
+            <th>combobox-autocomplete-both-updated</th>
             <td><a href="./tests/combobox-autocomplete-both-updated/index.html">Index</a></td>
             <td><a href="./review/combobox-autocomplete-both-updated.html">Review</a></td>
             <td>76</td>
@@ -84,7 +89,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>combobox-select-only</td>
+            <th>combobox-select-only</th>
             <td><a href="./tests/combobox-select-only/index.html">Index</a></td>
             <td><a href="./review/combobox-select-only.html">Review</a></td>
             <td>38</td>
@@ -92,7 +97,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>command-button</td>
+            <th>command-button</th>
             <td><a href="./tests/command-button/index.html">Index</a></td>
             <td><a href="./review/command-button.html">Review</a></td>
             <td>9</td>
@@ -100,7 +105,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>complementary</td>
+            <th>complementary</th>
             <td><a href="./tests/complementary/index.html">Index</a></td>
             <td><a href="./review/complementary.html">Review</a></td>
             <td>20</td>
@@ -108,7 +113,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>contentinfo</td>
+            <th>contentinfo</th>
             <td><a href="./tests/contentinfo/index.html">Index</a></td>
             <td><a href="./review/contentinfo.html">Review</a></td>
             <td>16</td>
@@ -116,7 +121,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>datepicker-spin-button</td>
+            <th>datepicker-spin-button</th>
             <td><a href="./tests/datepicker-spin-button/index.html">Index</a></td>
             <td><a href="./review/datepicker-spin-button.html">Review</a></td>
             <td>21</td>
@@ -124,7 +129,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>disclosure-faq</td>
+            <th>disclosure-faq</th>
             <td><a href="./tests/disclosure-faq/index.html">Index</a></td>
             <td><a href="./review/disclosure-faq.html">Review</a></td>
             <td>26</td>
@@ -132,7 +137,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>disclosure-navigation</td>
+            <th>disclosure-navigation</th>
             <td><a href="./tests/disclosure-navigation/index.html">Index</a></td>
             <td><a href="./review/disclosure-navigation.html">Review</a></td>
             <td>46</td>
@@ -140,7 +145,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>form</td>
+            <th>form</th>
             <td><a href="./tests/form/index.html">Index</a></td>
             <td><a href="./review/form.html">Review</a></td>
             <td>20</td>
@@ -148,7 +153,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>horizontal-slider</td>
+            <th>horizontal-slider</th>
             <td><a href="./tests/horizontal-slider/index.html">Index</a></td>
             <td><a href="./review/horizontal-slider.html">Review</a></td>
             <td>21</td>
@@ -156,7 +161,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>main</td>
+            <th>main</th>
             <td><a href="./tests/main/index.html">Index</a></td>
             <td><a href="./review/main.html">Review</a></td>
             <td>16</td>
@@ -164,7 +169,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>menu-button-actions</td>
+            <th>menu-button-actions</th>
             <td><a href="./tests/menu-button-actions/index.html">Index</a></td>
             <td><a href="./review/menu-button-actions.html">Review</a></td>
             <td>26</td>
@@ -172,7 +177,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>menu-button-actions-active-descendant</td>
+            <th>menu-button-actions-active-descendant</th>
             <td><a href="./tests/menu-button-actions-active-descendant/index.html">Index</a></td>
             <td><a href="./review/menu-button-actions-active-descendant.html">Review</a></td>
             <td>26</td>
@@ -180,7 +185,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>menubar-editor</td>
+            <th>menubar-editor</th>
             <td><a href="./tests/menubar-editor/index.html">Index</a></td>
             <td><a href="./review/menubar-editor.html">Review</a></td>
             <td>40</td>
@@ -188,7 +193,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>meter</td>
+            <th>meter</th>
             <td><a href="./tests/meter/index.html">Index</a></td>
             <td><a href="./review/meter.html">Review</a></td>
             <td>9</td>
@@ -196,7 +201,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>minimal-data-grid</td>
+            <th>minimal-data-grid</th>
             <td><a href="./tests/minimal-data-grid/index.html">Index</a></td>
             <td><a href="./review/minimal-data-grid.html">Review</a></td>
             <td>55</td>
@@ -204,7 +209,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>modal-dialog</td>
+            <th>modal-dialog</th>
             <td><a href="./tests/modal-dialog/index.html">Index</a></td>
             <td><a href="./review/modal-dialog.html">Review</a></td>
             <td>29</td>
@@ -212,7 +217,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>radiogroup-aria-activedescendant</td>
+            <th>radiogroup-aria-activedescendant</th>
             <td><a href="./tests/radiogroup-aria-activedescendant/index.html">Index</a></td>
             <td><a href="./review/radiogroup-aria-activedescendant.html">Review</a></td>
             <td>39</td>
@@ -220,7 +225,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>radiogroup-roving-tabindex</td>
+            <th>radiogroup-roving-tabindex</th>
             <td><a href="./tests/radiogroup-roving-tabindex/index.html">Index</a></td>
             <td><a href="./review/radiogroup-roving-tabindex.html">Review</a></td>
             <td>39</td>
@@ -228,7 +233,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>rating-slider</td>
+            <th>rating-slider</th>
             <td><a href="./tests/rating-slider/index.html">Index</a></td>
             <td><a href="./review/rating-slider.html">Review</a></td>
             <td>21</td>
@@ -236,7 +241,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>seek-slider</td>
+            <th>seek-slider</th>
             <td><a href="./tests/seek-slider/index.html">Index</a></td>
             <td><a href="./review/seek-slider.html">Review</a></td>
             <td>21</td>
@@ -244,7 +249,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>switch</td>
+            <th>switch</th>
             <td><a href="./tests/switch/index.html">Index</a></td>
             <td><a href="./review/switch.html">Review</a></td>
             <td>24</td>
@@ -252,7 +257,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>tabs-manual-activation</td>
+            <th>tabs-manual-activation</th>
             <td><a href="./tests/tabs-manual-activation/index.html">Index</a></td>
             <td><a href="./review/tabs-manual-activation.html">Review</a></td>
             <td>29</td>
@@ -260,7 +265,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>toggle-button</td>
+            <th>toggle-button</th>
             <td><a href="./tests/toggle-button/index.html">Index</a></td>
             <td><a href="./review/toggle-button.html">Review</a></td>
             <td>24</td>
@@ -268,7 +273,7 @@ <h1>Test Patterns for Review</h1>
 </a></td>
           </tr>
           <tr>
-            <td>vertical-temperature-slider</td>
+            <th>vertical-temperature-slider</th>
             <td><a href="./tests/vertical-temperature-slider/index.html">Index</a></td>
             <td><a href="./review/vertical-temperature-slider.html">Review</a></td>
             <td>21</td>

From 14a0530810a85181fb35724e4c2636c499211266 Mon Sep 17 00:00:00 2001
From: howard-e <howard-e@users.noreply.github.com>
Date: Wed, 9 Mar 2022 22:25:18 +0000
Subject: [PATCH 4/4] Generate test and review files automatically

---
 build/index.html                              | 190 +++++++--------
 build/review/alert.html                       |  46 +++-
 build/review/banner.html                      |  64 +++--
 build/review/breadcrumb.html                  |  50 +++-
 build/review/checkbox-tri-state.html          |  60 +++--
 build/review/checkbox.html                    |  62 +++--
 .../combobox-autocomplete-both-updated.html   | 156 ++++++++-----
 build/review/combobox-select-only.html        | 166 +++++++------
 build/review/command-button.html              |  50 +++-
 build/review/complementary.html               |  60 +++--
 build/review/contentinfo.html                 |  52 ++++-
 build/review/datepicker-spin-button.html      |  50 +++-
 build/review/disclosure-faq.html              |  62 +++--
 build/review/disclosure-navigation.html       |  72 ++++--
 build/review/form.html                        |  60 +++--
 build/review/horizontal-slider.html           |  50 +++-
 build/review/main.html                        |  56 +++--
 ...menu-button-actions-active-descendant.html |  52 ++++-
 build/review/menu-button-actions.html         |  52 ++++-
 build/review/menubar-editor.html              |  64 +++--
 build/review/meter.html                       |  52 ++++-
 build/review/minimal-data-grid.html           | 221 +++++++++---------
 build/review/modal-dialog.html                |  62 +++--
 .../radiogroup-aria-activedescendant.html     |  62 +++--
 build/review/radiogroup-roving-tabindex.html  |  62 +++--
 build/review/rating-slider.html               |  50 +++-
 build/review/seek-slider.html                 |  50 +++-
 build/review/switch.html                      |  60 +++--
 build/review/tabs-manual-activation.html      |  58 +++--
 build/review/toggle-button.html               |  60 +++--
 build/review/vertical-temperature-slider.html |  50 +++-
 31 files changed, 1542 insertions(+), 719 deletions(-)

diff --git a/build/index.html b/build/index.html
index 02d716722..513b09935 100644
--- a/build/index.html
+++ b/build/index.html
@@ -21,6 +21,10 @@
         padding: .5em;
       }
 
+      td > p {
+        margin: 0;
+      }
+
       tr:not(:first-of-type) th {
         padding: .5em;
         text-align: left;
@@ -42,241 +46,241 @@ <h1>Test Patterns for Review</h1>
       </tr>
           <tr>
             <th>alert</th>
-            <td><a href="./tests/alert/index.html">Index</a></td>
-            <td><a href="./review/alert.html">Review</a></td>
-            <td>3</td>
+            <td><a href="./tests/alert/index.html" aria-label="Index: alert">Index</a></td>
+            <td><a href="./review/alert.html" aria-label="Review: alert">Review</a></td>
+            <td><p aria-label="Number of Tests: 3">3</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/9ccc7888" target="_blank">9ccc7888 Add Alert and Breadcrumb test plan titles (#529)
 </a></td>
           </tr>
           <tr>
             <th>banner</th>
-            <td><a href="./tests/banner/index.html">Index</a></td>
-            <td><a href="./review/banner.html">Review</a></td>
-            <td>26</td>
+            <td><a href="./tests/banner/index.html" aria-label="Index: banner">Index</a></td>
+            <td><a href="./review/banner.html" aria-label="Review: banner">Review</a></td>
+            <td><p aria-label="Number of Tests: 26">26</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/0c61f715" target="_blank">0c61f715 Revert &quot;Update JAWS commands for banner landmark tests, in line with JAWS 2022 updates&quot; (#602)
 </a></td>
           </tr>
           <tr>
             <th>breadcrumb</th>
-            <td><a href="./tests/breadcrumb/index.html">Index</a></td>
-            <td><a href="./review/breadcrumb.html">Review</a></td>
-            <td>9</td>
+            <td><a href="./tests/breadcrumb/index.html" aria-label="Index: breadcrumb">Index</a></td>
+            <td><a href="./review/breadcrumb.html" aria-label="Review: breadcrumb">Review</a></td>
+            <td><p aria-label="Number of Tests: 9">9</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/a2434b1e" target="_blank">a2434b1e Breadcrumb: fix misquoted strings in commands.csv (#540)
 </a></td>
           </tr>
           <tr>
             <th>checkbox</th>
-            <td><a href="./tests/checkbox/index.html">Index</a></td>
-            <td><a href="./review/checkbox.html">Review</a></td>
-            <td>26</td>
+            <td><a href="./tests/checkbox/index.html" aria-label="Index: checkbox">Index</a></td>
+            <td><a href="./review/checkbox.html" aria-label="Review: checkbox">Review</a></td>
+            <td><p aria-label="Number of Tests: 26">26</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/c2df595d" target="_blank">c2df595d Move test plan titles for app from support.json to references.csv (#473)
 </a></td>
           </tr>
           <tr>
             <th>checkbox-tri-state</th>
-            <td><a href="./tests/checkbox-tri-state/index.html">Index</a></td>
-            <td><a href="./review/checkbox-tri-state.html">Review</a></td>
-            <td>24</td>
+            <td><a href="./tests/checkbox-tri-state/index.html" aria-label="Index: checkbox-tri-state">Index</a></td>
+            <td><a href="./review/checkbox-tri-state.html" aria-label="Review: checkbox-tri-state">Review</a></td>
+            <td><p aria-label="Number of Tests: 24">24</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>combobox-autocomplete-both-updated</th>
-            <td><a href="./tests/combobox-autocomplete-both-updated/index.html">Index</a></td>
-            <td><a href="./review/combobox-autocomplete-both-updated.html">Review</a></td>
-            <td>76</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
+            <td><a href="./tests/combobox-autocomplete-both-updated/index.html" aria-label="Index: combobox-autocomplete-both-updated">Index</a></td>
+            <td><a href="./review/combobox-autocomplete-both-updated.html" aria-label="Review: combobox-autocomplete-both-updated">Review</a></td>
+            <td><p aria-label="Number of Tests: 76">76</p></td>
+            <td><a href="https://github.com/w3c/aria-at/commit/f9dbdf68" target="_blank">f9dbdf68 Address test plan feedback reported by community group (#623)
 </a></td>
           </tr>
           <tr>
             <th>combobox-select-only</th>
-            <td><a href="./tests/combobox-select-only/index.html">Index</a></td>
-            <td><a href="./review/combobox-select-only.html">Review</a></td>
-            <td>38</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
+            <td><a href="./tests/combobox-select-only/index.html" aria-label="Index: combobox-select-only">Index</a></td>
+            <td><a href="./review/combobox-select-only.html" aria-label="Review: combobox-select-only">Review</a></td>
+            <td><p aria-label="Number of Tests: 38">38</p></td>
+            <td><a href="https://github.com/w3c/aria-at/commit/f9dbdf68" target="_blank">f9dbdf68 Address test plan feedback reported by community group (#623)
 </a></td>
           </tr>
           <tr>
             <th>command-button</th>
-            <td><a href="./tests/command-button/index.html">Index</a></td>
-            <td><a href="./review/command-button.html">Review</a></td>
-            <td>9</td>
+            <td><a href="./tests/command-button/index.html" aria-label="Index: command-button">Index</a></td>
+            <td><a href="./review/command-button.html" aria-label="Review: command-button">Review</a></td>
+            <td><p aria-label="Number of Tests: 9">9</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>complementary</th>
-            <td><a href="./tests/complementary/index.html">Index</a></td>
-            <td><a href="./review/complementary.html">Review</a></td>
-            <td>20</td>
+            <td><a href="./tests/complementary/index.html" aria-label="Index: complementary">Index</a></td>
+            <td><a href="./review/complementary.html" aria-label="Review: complementary">Review</a></td>
+            <td><p aria-label="Number of Tests: 20">20</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/03b8747f" target="_blank">03b8747f Create tests for APG design pattern example: Contentinfo Landmark (#549)
 </a></td>
           </tr>
           <tr>
             <th>contentinfo</th>
-            <td><a href="./tests/contentinfo/index.html">Index</a></td>
-            <td><a href="./review/contentinfo.html">Review</a></td>
-            <td>16</td>
+            <td><a href="./tests/contentinfo/index.html" aria-label="Index: contentinfo">Index</a></td>
+            <td><a href="./review/contentinfo.html" aria-label="Review: contentinfo">Review</a></td>
+            <td><p aria-label="Number of Tests: 16">16</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/03b8747f" target="_blank">03b8747f Create tests for APG design pattern example: Contentinfo Landmark (#549)
 </a></td>
           </tr>
           <tr>
             <th>datepicker-spin-button</th>
-            <td><a href="./tests/datepicker-spin-button/index.html">Index</a></td>
-            <td><a href="./review/datepicker-spin-button.html">Review</a></td>
-            <td>21</td>
+            <td><a href="./tests/datepicker-spin-button/index.html" aria-label="Index: datepicker-spin-button">Index</a></td>
+            <td><a href="./review/datepicker-spin-button.html" aria-label="Review: datepicker-spin-button">Review</a></td>
+            <td><p aria-label="Number of Tests: 21">21</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/0483d7ea" target="_blank">0483d7ea Create tests for APG design pattern example: Date Picker Spin Button (#411)
 </a></td>
           </tr>
           <tr>
             <th>disclosure-faq</th>
-            <td><a href="./tests/disclosure-faq/index.html">Index</a></td>
-            <td><a href="./review/disclosure-faq.html">Review</a></td>
-            <td>26</td>
+            <td><a href="./tests/disclosure-faq/index.html" aria-label="Index: disclosure-faq">Index</a></td>
+            <td><a href="./review/disclosure-faq.html" aria-label="Review: disclosure-faq">Review</a></td>
+            <td><p aria-label="Number of Tests: 26">26</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>disclosure-navigation</th>
-            <td><a href="./tests/disclosure-navigation/index.html">Index</a></td>
-            <td><a href="./review/disclosure-navigation.html">Review</a></td>
-            <td>46</td>
+            <td><a href="./tests/disclosure-navigation/index.html" aria-label="Index: disclosure-navigation">Index</a></td>
+            <td><a href="./review/disclosure-navigation.html" aria-label="Review: disclosure-navigation">Review</a></td>
+            <td><p aria-label="Number of Tests: 46">46</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/b2ceec70" target="_blank">b2ceec70 Remove Space from tests 45 and 46 in disclosure navigation test plan (#585)
 </a></td>
           </tr>
           <tr>
             <th>form</th>
-            <td><a href="./tests/form/index.html">Index</a></td>
-            <td><a href="./review/form.html">Review</a></td>
-            <td>20</td>
+            <td><a href="./tests/form/index.html" aria-label="Index: form">Index</a></td>
+            <td><a href="./review/form.html" aria-label="Review: form">Review</a></td>
+            <td><p aria-label="Number of Tests: 20">20</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/53792c23" target="_blank">53792c23 Create tests for APG design pattern example: Form Landmark (#551)
 </a></td>
           </tr>
           <tr>
             <th>horizontal-slider</th>
-            <td><a href="./tests/horizontal-slider/index.html">Index</a></td>
-            <td><a href="./review/horizontal-slider.html">Review</a></td>
-            <td>21</td>
+            <td><a href="./tests/horizontal-slider/index.html" aria-label="Index: horizontal-slider">Index</a></td>
+            <td><a href="./review/horizontal-slider.html" aria-label="Review: horizontal-slider">Review</a></td>
+            <td><p aria-label="Number of Tests: 21">21</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/49e2a000" target="_blank">49e2a000 Create tests for APG design pattern example: Color Viewer Slider (#414)
 </a></td>
           </tr>
           <tr>
             <th>main</th>
-            <td><a href="./tests/main/index.html">Index</a></td>
-            <td><a href="./review/main.html">Review</a></td>
-            <td>16</td>
+            <td><a href="./tests/main/index.html" aria-label="Index: main">Index</a></td>
+            <td><a href="./review/main.html" aria-label="Review: main">Review</a></td>
+            <td><p aria-label="Number of Tests: 16">16</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/4ed847af" target="_blank">4ed847af Create tests for APG design pattern example: Main Landmark (#553)
 </a></td>
           </tr>
           <tr>
             <th>menu-button-actions</th>
-            <td><a href="./tests/menu-button-actions/index.html">Index</a></td>
-            <td><a href="./review/menu-button-actions.html">Review</a></td>
-            <td>26</td>
+            <td><a href="./tests/menu-button-actions/index.html" aria-label="Index: menu-button-actions">Index</a></td>
+            <td><a href="./review/menu-button-actions.html" aria-label="Review: menu-button-actions">Review</a></td>
+            <td><p aria-label="Number of Tests: 26">26</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>menu-button-actions-active-descendant</th>
-            <td><a href="./tests/menu-button-actions-active-descendant/index.html">Index</a></td>
-            <td><a href="./review/menu-button-actions-active-descendant.html">Review</a></td>
-            <td>26</td>
+            <td><a href="./tests/menu-button-actions-active-descendant/index.html" aria-label="Index: menu-button-actions-active-descendant">Index</a></td>
+            <td><a href="./review/menu-button-actions-active-descendant.html" aria-label="Review: menu-button-actions-active-descendant">Review</a></td>
+            <td><p aria-label="Number of Tests: 26">26</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>menubar-editor</th>
-            <td><a href="./tests/menubar-editor/index.html">Index</a></td>
-            <td><a href="./review/menubar-editor.html">Review</a></td>
-            <td>40</td>
+            <td><a href="./tests/menubar-editor/index.html" aria-label="Index: menubar-editor">Index</a></td>
+            <td><a href="./review/menubar-editor.html" aria-label="Review: menubar-editor">Review</a></td>
+            <td><p aria-label="Number of Tests: 40">40</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/05c4cf59" target="_blank">05c4cf59 Standardize code style (#484)
 </a></td>
           </tr>
           <tr>
             <th>meter</th>
-            <td><a href="./tests/meter/index.html">Index</a></td>
-            <td><a href="./review/meter.html">Review</a></td>
-            <td>9</td>
+            <td><a href="./tests/meter/index.html" aria-label="Index: meter">Index</a></td>
+            <td><a href="./review/meter.html" aria-label="Review: meter">Review</a></td>
+            <td><p aria-label="Number of Tests: 9">9</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/0177f9e7" target="_blank">0177f9e7 Create tests for APG design pattern example: meter (#571)
 </a></td>
           </tr>
           <tr>
             <th>minimal-data-grid</th>
-            <td><a href="./tests/minimal-data-grid/index.html">Index</a></td>
-            <td><a href="./review/minimal-data-grid.html">Review</a></td>
-            <td>55</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
+            <td><a href="./tests/minimal-data-grid/index.html" aria-label="Index: minimal-data-grid">Index</a></td>
+            <td><a href="./review/minimal-data-grid.html" aria-label="Review: minimal-data-grid">Review</a></td>
+            <td><p aria-label="Number of Tests: 55">55</p></td>
+            <td><a href="https://github.com/w3c/aria-at/commit/f9dbdf68" target="_blank">f9dbdf68 Address test plan feedback reported by community group (#623)
 </a></td>
           </tr>
           <tr>
             <th>modal-dialog</th>
-            <td><a href="./tests/modal-dialog/index.html">Index</a></td>
-            <td><a href="./review/modal-dialog.html">Review</a></td>
-            <td>29</td>
+            <td><a href="./tests/modal-dialog/index.html" aria-label="Index: modal-dialog">Index</a></td>
+            <td><a href="./review/modal-dialog.html" aria-label="Review: modal-dialog">Review</a></td>
+            <td><p aria-label="Number of Tests: 29">29</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/04ed13d5" target="_blank">04ed13d5 Fix typo in modal-dialog metadata (#527)
 </a></td>
           </tr>
           <tr>
             <th>radiogroup-aria-activedescendant</th>
-            <td><a href="./tests/radiogroup-aria-activedescendant/index.html">Index</a></td>
-            <td><a href="./review/radiogroup-aria-activedescendant.html">Review</a></td>
-            <td>39</td>
+            <td><a href="./tests/radiogroup-aria-activedescendant/index.html" aria-label="Index: radiogroup-aria-activedescendant">Index</a></td>
+            <td><a href="./review/radiogroup-aria-activedescendant.html" aria-label="Review: radiogroup-aria-activedescendant">Review</a></td>
+            <td><p aria-label="Number of Tests: 39">39</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>radiogroup-roving-tabindex</th>
-            <td><a href="./tests/radiogroup-roving-tabindex/index.html">Index</a></td>
-            <td><a href="./review/radiogroup-roving-tabindex.html">Review</a></td>
-            <td>39</td>
+            <td><a href="./tests/radiogroup-roving-tabindex/index.html" aria-label="Index: radiogroup-roving-tabindex">Index</a></td>
+            <td><a href="./review/radiogroup-roving-tabindex.html" aria-label="Review: radiogroup-roving-tabindex">Review</a></td>
+            <td><p aria-label="Number of Tests: 39">39</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>rating-slider</th>
-            <td><a href="./tests/rating-slider/index.html">Index</a></td>
-            <td><a href="./review/rating-slider.html">Review</a></td>
-            <td>21</td>
+            <td><a href="./tests/rating-slider/index.html" aria-label="Index: rating-slider">Index</a></td>
+            <td><a href="./review/rating-slider.html" aria-label="Review: rating-slider">Review</a></td>
+            <td><p aria-label="Number of Tests: 21">21</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/b5c67ace" target="_blank">b5c67ace Create tests for APG design pattern example: Vertical Temperature Slider (#487)
 </a></td>
           </tr>
           <tr>
             <th>seek-slider</th>
-            <td><a href="./tests/seek-slider/index.html">Index</a></td>
-            <td><a href="./review/seek-slider.html">Review</a></td>
-            <td>21</td>
+            <td><a href="./tests/seek-slider/index.html" aria-label="Index: seek-slider">Index</a></td>
+            <td><a href="./review/seek-slider.html" aria-label="Review: seek-slider">Review</a></td>
+            <td><p aria-label="Number of Tests: 21">21</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/22c9895b" target="_blank">22c9895b Create tests for APG design pattern example: Media Seek Slider (#488)
 </a></td>
           </tr>
           <tr>
             <th>switch</th>
-            <td><a href="./tests/switch/index.html">Index</a></td>
-            <td><a href="./review/switch.html">Review</a></td>
-            <td>24</td>
+            <td><a href="./tests/switch/index.html" aria-label="Index: switch">Index</a></td>
+            <td><a href="./review/switch.html" aria-label="Review: switch">Review</a></td>
+            <td><p aria-label="Number of Tests: 24">24</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/d3b62389" target="_blank">d3b62389 Create tests for APG design pattern example: Switch (#543)
 </a></td>
           </tr>
           <tr>
             <th>tabs-manual-activation</th>
-            <td><a href="./tests/tabs-manual-activation/index.html">Index</a></td>
-            <td><a href="./review/tabs-manual-activation.html">Review</a></td>
-            <td>29</td>
+            <td><a href="./tests/tabs-manual-activation/index.html" aria-label="Index: tabs-manual-activation">Index</a></td>
+            <td><a href="./review/tabs-manual-activation.html" aria-label="Review: tabs-manual-activation">Review</a></td>
+            <td><p aria-label="Number of Tests: 29">29</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/091420a1" target="_blank">091420a1 Add title reference field to each test plan (#521)
 </a></td>
           </tr>
           <tr>
             <th>toggle-button</th>
-            <td><a href="./tests/toggle-button/index.html">Index</a></td>
-            <td><a href="./review/toggle-button.html">Review</a></td>
-            <td>24</td>
+            <td><a href="./tests/toggle-button/index.html" aria-label="Index: toggle-button">Index</a></td>
+            <td><a href="./review/toggle-button.html" aria-label="Review: toggle-button">Review</a></td>
+            <td><p aria-label="Number of Tests: 24">24</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/acc6cb13" target="_blank">acc6cb13 Toggle Button: fix setup scripts to set state of button to &#39;pressed&#39; in some cases which were previously not accounted for (#532)
 </a></td>
           </tr>
           <tr>
             <th>vertical-temperature-slider</th>
-            <td><a href="./tests/vertical-temperature-slider/index.html">Index</a></td>
-            <td><a href="./review/vertical-temperature-slider.html">Review</a></td>
-            <td>21</td>
+            <td><a href="./tests/vertical-temperature-slider/index.html" aria-label="Index: vertical-temperature-slider">Index</a></td>
+            <td><a href="./review/vertical-temperature-slider.html" aria-label="Review: vertical-temperature-slider">Review</a></td>
+            <td><p aria-label="Number of Tests: 21">21</p></td>
             <td><a href="https://github.com/w3c/aria-at/commit/b5c67ace" target="_blank">b5c67ace Create tests for APG design pattern example: Vertical Temperature Slider (#487)
 </a></td>
           </tr>
diff --git a/build/review/alert.html b/build/review/alert.html
index 8974d4462..bbc916b10 100644
--- a/build/review/alert.html
+++ b/build/review/alert.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: alert (3 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Trigger an alert in reading mode</h2>
@@ -896,7 +924,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Trigger Alert&#39; button, activate the button to trigger the alert. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/banner.html b/build/review/banner.html
index a613d2651..33ac4d8eb 100644
--- a/build/review/banner.html
+++ b/build/review/banner.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: banner (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a banner landmark in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -1104,7 +1132,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1307,7 +1335,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1509,7 +1537,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1716,7 +1744,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Skip To Content&#39; button. using the following commands:
                <ul>
                    <li>B</li>
@@ -1934,7 +1962,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Show Headings&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -2142,7 +2170,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;W3C Logo&#39; image. using the following commands:
                <ul>
                    <li>G</li>
@@ -2265,7 +2293,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;W3C Logo&#39; image. using the following commands:
                <ul>
                    <li>Shift+G</li>
@@ -2390,7 +2418,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;ARIA Landmarks Example&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -2518,7 +2546,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;ARIA Landmarks Example&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
diff --git a/build/review/breadcrumb.html b/build/review/breadcrumb.html
index 2f3b8578c..81a793766 100644
--- a/build/review/breadcrumb.html
+++ b/build/review/breadcrumb.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: breadcrumb (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first breadcrumb link in reading mode</h2>
@@ -902,7 +930,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;WAI-ARIA Authoring Practices&#39; link. using the following commands:
                <ul>
                    <li>U</li>
@@ -993,7 +1021,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Breadcrumb Example&#39; link. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -1350,7 +1378,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Breadcrumb Example&#39; link, read information about the link. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/checkbox-tri-state.html b/build/review/checkbox-tri-state.html
index a477c6c71..fd7df7f10 100644
--- a/build/review/checkbox-tri-state.html
+++ b/build/review/checkbox-tri-state.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: checkbox-tri-state (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a partially checked checkbox in reading mode</h2>
@@ -900,7 +928,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the partially checked state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the checkbox. using the following commands:
                <ul>
                    <li>X</li>
@@ -982,7 +1010,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the partially checked state. using the following commands:
                <ul>
                    <li>Shift+X</li>
@@ -1312,7 +1340,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Check the first checkbox. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1502,7 +1530,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Partially check the first checkbox. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1697,7 +1725,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox. Note: it should be in the partially checked state. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1899,7 +1927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When reading cursor is on the first checkbox, read its grouping information. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2093,7 +2121,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate forwards into the checkbox group. using the following commands:
                <ul>
                    <li>X</li>
@@ -2169,7 +2197,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate backwards out of the checkbox group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
diff --git a/build/review/checkbox.html b/build/review/checkbox.html
index c8c0617e7..a4f8b398e 100644
--- a/build/review/checkbox.html
+++ b/build/review/checkbox.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: checkbox (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to an unchecked checkbox in reading mode</h2>
@@ -891,7 +919,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the unchecked state. using the following commands:
                <ul>
                    <li>X &#x2F; Shift+X</li>
@@ -1086,7 +1114,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first checkbox. Note: it should be in the checked state. using the following commands:
                <ul>
                    <li>X &#x2F; Shift+X</li>
@@ -1280,7 +1308,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Check and uncheck the first checkbox. using the following commands:
                <ul>
                    <li>Enter</li>
@@ -1459,7 +1487,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1665,7 +1693,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When the reading cursor is on the first checkbox, read the first checkbox.  Note: it should be in the checked state. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1859,7 +1887,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>When reading cursor is on a checkbox, read its grouping information using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2034,7 +2062,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate both forward and backward into and out of  the checkbox group. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -2153,7 +2181,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate from outside the checkbox group to a checkbox inside the group. Test both navigating forward into the start and backward into the end. using the following commands:
                <ul>
                    <li>X</li>
@@ -2345,7 +2373,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate from a checkbox inside the checkbox group to an element outside the checkbox group. Test both navigating forward out of the end and backward out of the start. using the following commands:
                <ul>
                    <li>Tab</li>
diff --git a/build/review/combobox-autocomplete-both-updated.html b/build/review/combobox-autocomplete-both-updated.html
index fb84fcd2d..6b945fcab 100644
--- a/build/review/combobox-autocomplete-both-updated.html
+++ b/build/review/combobox-autocomplete-both-updated.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: combobox-autocomplete-both-updated (76 tests)<
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to an empty, collapsed combobox in reading mode</h2>
@@ -842,7 +870,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -873,13 +901,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow</li>
+                   <li>Down Arrow, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -904,14 +932,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow</li>
+                   <li>Down Arrow, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -931,7 +959,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -962,13 +990,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -993,14 +1021,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1020,7 +1048,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1051,7 +1079,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1079,7 +1107,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1101,7 +1129,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to an empty, collapsed combobox
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1132,7 +1160,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1160,7 +1188,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1182,7 +1210,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to an empty, collapsed com
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1212,9 +1240,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right</li>
+                   <li>Control+Option+Right, then Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1236,7 +1264,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to an empty, collapsed co
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1266,9 +1294,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -1349,7 +1377,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1507,7 +1535,7 @@ <h2 class="jaws nvda">Test 10: Navigate forwards to a filled in, collapsed combo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1538,13 +1566,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow</li>
+                   <li>Down Arrow, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1571,14 +1599,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>E</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow</li>
+                   <li>Down Arrow, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1600,7 +1628,7 @@ <h2 class="jaws nvda">Test 11: Navigate backwards to a filled in, collapsed comb
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1631,13 +1659,13 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1664,14 +1692,14 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+E</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1693,7 +1721,7 @@ <h2 class="jaws nvda">Test 12: Navigate forwards to a filled in, collapsed combo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1724,7 +1752,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1754,7 +1782,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1778,7 +1806,7 @@ <h2 class="jaws nvda">Test 13: Navigate backwards to a filled in, collapsed comb
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1809,7 +1837,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1839,7 +1867,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1863,7 +1891,7 @@ <h2 class="voiceover_macos">Test 14: Navigate forwards to a filled in, collapsed
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1893,9 +1921,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right</li>
+                   <li>Control+Option+Right, then Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1919,7 +1947,7 @@ <h2 class="voiceover_macos">Test 15: Navigate backwards to a filled in, collapse
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1949,9 +1977,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;State&#39; Combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -2036,7 +2064,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2255,7 +2283,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox without moving into the listbox popup. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -2448,7 +2476,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox without moving into the listbox popup. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -2893,7 +2921,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3112,7 +3140,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3566,7 +3594,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, close the combobox. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -3757,7 +3785,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, close the combobox. using the following commands:
                <ul>
                    <li>Escape</li>
diff --git a/build/review/combobox-select-only.html b/build/review/combobox-select-only.html
index 525562ff4..ae0cfa2ac 100644
--- a/build/review/combobox-select-only.html
+++ b/build/review/combobox-select-only.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: combobox-select-only (38 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed select-only combobox in reading mode</h2>
@@ -842,7 +870,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed select-only combo
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -873,12 +901,12 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>C</li>
                    <li>Tab</li>
-                   <li>Down Arrow</li>
+                   <li>Down Arrow, then Down Arrow, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -902,8 +930,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>F</li>
                    <li>C</li>
@@ -927,7 +955,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a collapsed select-only comb
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -958,12 +986,12 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -987,13 +1015,13 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+F</li>
                    <li>Shift+C</li>
                    <li>Shift+Tab</li>
-                   <li>Up Arrow</li>
+                   <li>Up Arrow, then Up Arrow</li>
                </ul>
              </li>
           </ol>
@@ -1012,7 +1040,7 @@ <h2 class="jaws nvda">Test 3: Navigate forwards to a collapsed select-only combo
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1043,7 +1071,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1070,7 +1098,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Tab</li>
                </ul>
@@ -1091,7 +1119,7 @@ <h2 class="jaws nvda">Test 4: Navigate backwards to a collapsed select-only comb
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1122,7 +1150,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1149,7 +1177,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
                </ul>
@@ -1170,7 +1198,7 @@ <h2 class="voiceover_macos">Test 5: Navigate forwards to a collapsed select-only
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1200,9 +1228,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
-                   <li>Control+Option+Right</li>
+                   <li>Control+Option+Right, then Control+Option+Right</li>
                    <li>Tab</li>
                    <li>Control+Option+Command+J</li>
                </ul>
@@ -1223,7 +1251,7 @@ <h2 class="voiceover_macos">Test 6: Navigate backwards to a collapsed select-onl
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1253,9 +1281,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the Combobox. Note: it should be in the collapsed state. You may need to press certain commands (such as Control+Option+Left Arrow) multiple times to hear all information relating to the combobox. using the following commands:
+             <li>With focus on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Favorite Fruit&#39; Combobox. using the following commands:
                <ul>
-                   <li>Ctrl+Option+Left</li>
+                   <li>Ctrl+Option+Left, then Ctrl+Option+Left</li>
                    <li>Shift+Tab</li>
                    <li>Shift+Control+Option+Command+J</li>
                </ul>
@@ -1276,7 +1304,7 @@ <h2 class="jaws nvda">Test 7: Read information about a collapsed select-only com
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1307,7 +1335,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
+             <li>With the reading cursor on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                    <li>Insert+Up</li>
@@ -1334,8 +1362,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>With the reading cursor on the combobox, read information about the combobox. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>With the reading cursor on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                    <li>Insert+Up</li>
@@ -1357,7 +1385,7 @@ <h2 class="jaws nvda">Test 8: Read information about a collapsed select-only com
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1388,7 +1416,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the PC Cursor is active by pressing Alt+Delete. If it is not, turn off the Virtual Cursor by pressing Insert+Z.</li>
-             <li>With focus on the combobox, read information about the combobox. using the following commands:
+             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                </ul>
@@ -1415,7 +1443,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>If NVDA did not make the focus mode sound when the test page loaded, press Insert+Space to turn focus mode on.</li>
-             <li>With focus on the combobox, read information about the combobox. using the following commands:
+             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
                </ul>
@@ -1436,7 +1464,7 @@ <h2 class="voiceover_macos">Test 9: Read information about a collapsed select-on
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1466,7 +1494,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>With focus on the combobox, read information about the combobox. using the following commands:
+             <li>With focus on the &#39;Favorite Fruit&#39; combobox, read information about the combobox. using the following commands:
                <ul>
                    <li>Control+Option+F3</li>
                    <li>Control+Option+F4</li>
@@ -1488,7 +1516,7 @@ <h2 class="jaws nvda">Test 10: Open a collapsed select-only combobox in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1534,7 +1562,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>State of the combobox (expanded) is conveyed</td></tr>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
-            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
+            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is not conveyed</td></tr>
             <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
@@ -1550,7 +1578,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the combobox, open the combobox. using the following commands:
                <ul>
                    <li>Alt+Down</li>
@@ -1564,7 +1592,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>State of the combobox (expanded) is conveyed</td></tr>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
-            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
+            <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is not conveyed</td></tr>
             <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
@@ -1575,7 +1603,7 @@ <h2 class="jaws nvda">Test 11: Open a collapsed select-only combobox in interact
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1626,7 +1654,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1660,7 +1688,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1670,7 +1698,7 @@ <h2 class="voiceover_macos">Test 12: Open a collapsed select-only combobox</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1721,7 +1749,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1731,7 +1759,7 @@ <h2 class="jaws nvda">Test 13: Open a collapsed select-only combobox to the firs
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=jaws">jaws</a></li>
@@ -1778,7 +1806,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1808,7 +1836,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -1818,7 +1846,7 @@ <h2 class="voiceover_macos">Test 14: Open a collapsed select-only combobox to th
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1864,7 +1892,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2160,7 +2188,7 @@ <h2 class="jaws nvda">Test 19: Read information about a listbox popup in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2205,7 +2233,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2234,7 +2262,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2244,7 +2272,7 @@ <h2 class="voiceover_macos">Test 20: Read information about a listbox popup</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2289,7 +2317,7 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>Role of the popup (&#39;listbox&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Name of the popup (&#39;Favorite Fruit&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2377,7 +2405,7 @@ <h2 class="jaws nvda">Test 22: Navigate backwards to an option in a listbox popu
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2418,7 +2446,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2445,7 +2473,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2507,7 +2535,7 @@ <h2 class="voiceover_macos">Test 24: Navigate backwards to an option in a listbo
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2549,7 +2577,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2687,7 +2715,7 @@ <h2 class="jaws nvda">Test 27: Navigate to the first option in a listbox popup i
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2728,7 +2756,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2755,7 +2783,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
@@ -2843,7 +2871,7 @@ <h2 class="voiceover_macos">Test 29: Navigate to the first option in a listbox p
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2883,7 +2911,7 @@ <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
             <tr><td>required</td><td>Text of the focused option in the popup (&#39;Choose a Fruit&#39;) is conveyed</td></tr>
-            <tr><td>optional</td><td>State of the focused option in the popup (not selected) is conveyed</td></tr>
+            <tr><td>optional</td><td>State of the focused option in the popup (selected) is not conveyed</td></tr>
             <tr><td>required</td><td>Position of the focused option in the popup (1) is conveyed</td></tr>
             <tr><td>required</td><td>Number of options in the popup (13) is conveyed</td></tr>
         </table>
diff --git a/build/review/command-button.html b/build/review/command-button.html
index 182232016..c2644bf51 100644
--- a/build/review/command-button.html
+++ b/build/review/command-button.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: command-button (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a button in reading mode</h2>
@@ -898,7 +926,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Print Page&#39; button using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -977,7 +1005,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Print Page&#39; button using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1298,7 +1326,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Print Page&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/complementary.html b/build/review/complementary.html
index 26cb9a007..882fd49df 100644
--- a/build/review/complementary.html
+++ b/build/review/complementary.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: complementary (20 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a complementary landmark in reading mode</h2>
@@ -900,7 +928,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -1110,7 +1138,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1319,7 +1347,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1528,7 +1556,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1737,7 +1765,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Landmarks&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -1868,7 +1896,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Landmarks&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
@@ -1999,7 +2027,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the list. using the following commands:
                <ul>
                    <li>L</li>
@@ -2129,7 +2157,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the list. using the following commands:
                <ul>
                    <li>Shift+L</li>
diff --git a/build/review/contentinfo.html b/build/review/contentinfo.html
index 6d49c067b..033643f4d 100644
--- a/build/review/contentinfo.html
+++ b/build/review/contentinfo.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: contentinfo (16 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a contentinfo landmark in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -1104,7 +1132,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1308,7 +1336,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1512,7 +1540,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
diff --git a/build/review/datepicker-spin-button.html b/build/review/datepicker-spin-button.html
index 22ed253b0..709a1fef0 100644
--- a/build/review/datepicker-spin-button.html
+++ b/build/review/datepicker-spin-button.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: datepicker-spin-button (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a spin button in reading mode</h2>
@@ -904,7 +932,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Day&#39; spin button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -990,7 +1018,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Year&#39; spin button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1353,7 +1381,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Day&#39; spin button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/disclosure-faq.html b/build/review/disclosure-faq.html
index 6180d799f..d89577d0c 100644
--- a/build/review/disclosure-faq.html
+++ b/build/review/disclosure-faq.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: disclosure-faq (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>B</li>
@@ -980,7 +1008,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1311,7 +1339,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>B</li>
@@ -1392,7 +1420,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the list of frequently asked questions. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1721,7 +1749,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1922,7 +1950,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2121,7 +2149,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, set the state of the button to expanded. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2315,7 +2343,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, set the state of the button to collapsed. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2508,7 +2536,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the list of frequently asked questions, move into the text of the associated question answer. Note: you may need to press Down Arrow multiple times to hear the answer text in its entirety. using the following commands:
                <ul>
                    <li>Down Arrow</li>
diff --git a/build/review/disclosure-navigation.html b/build/review/disclosure-navigation.html
index 14539c026..224e13931 100644
--- a/build/review/disclosure-navigation.html
+++ b/build/review/disclosure-navigation.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: disclosure-navigation (46 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a collapsed disclosure button in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>B</li>
@@ -980,7 +1008,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the collapsed state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1317,7 +1345,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>B</li>
@@ -1398,7 +1426,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first disclosure button in the navigation region. Note: it should be in the expanded state. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1726,7 +1754,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1927,7 +1955,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2126,7 +2154,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, set the state of the button to expanded. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2320,7 +2348,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, set the state of the button to collapsed. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2517,7 +2545,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, move into the button&#39;s associated list of links. Note: you may need to press certain commands (such as Down Arrow) multiple times to hear all information about the dropdown and link. using the following commands:
                <ul>
                    <li>U</li>
@@ -2729,7 +2757,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first disclosure button in the navigation region, move into the button&#39;s associated list of links. Note: you may need to press certain commands (such as Down Arrow) multiple times to hear all information about the dropdown and link. using the following commands:
                <ul>
                    <li>U</li>
@@ -2943,7 +2971,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, close the dropdown and return focus to the associated disclosure button. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -3141,7 +3169,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, navigate to the next link. using the following commands:
                <ul>
                    <li>U</li>
@@ -3218,7 +3246,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, navigate to the previous link. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -3784,7 +3812,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a link in the first dropdown, activate the link. using the following commands:
                <ul>
                    <li>Enter</li>
diff --git a/build/review/form.html b/build/review/form.html
index 43d28103a..3e6baf469 100644
--- a/build/review/form.html
+++ b/build/review/form.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: form (20 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a form landmark in reading mode</h2>
@@ -901,7 +929,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -1114,7 +1142,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1325,7 +1353,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1534,7 +1562,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1745,7 +1773,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Name&#39; text input. using the following commands:
                <ul>
                    <li>F</li>
@@ -1963,7 +1991,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Phone&#39; text input. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -2180,7 +2208,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Add contact&#39; button. using the following commands:
                <ul>
                    <li>B</li>
@@ -2262,7 +2290,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Add contact&#39; button. using the following commands:
                <ul>
                    <li>Shift+B</li>
diff --git a/build/review/horizontal-slider.html b/build/review/horizontal-slider.html
index 0c1e4e0e2..48dbf35a0 100644
--- a/build/review/horizontal-slider.html
+++ b/build/review/horizontal-slider.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: horizontal-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -904,7 +932,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Red&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -991,7 +1019,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Red&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1360,7 +1388,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Red&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/main.html b/build/review/main.html
index b6ec9cac2..3348cd6a7 100644
--- a/build/review/main.html
+++ b/build/review/main.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: main (16 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards into a main landmark in reading mode</h2>
@@ -900,7 +928,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Top&#39; link. using the following commands:
                <ul>
                    <li>D</li>
@@ -1105,7 +1133,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Bottom&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1309,7 +1337,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Bottom&#39; link, navigate to the &#39;Navigate backwards from here&#39; link. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1513,7 +1541,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Top&#39; link, navigate to the &#39;Navigate forwards from here&#39; link. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1717,7 +1745,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Main Landmark&#39; heading. using the following commands:
                <ul>
                    <li>H</li>
@@ -1845,7 +1873,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Main Landmark&#39; heading. using the following commands:
                <ul>
                    <li>Shift+H</li>
diff --git a/build/review/menu-button-actions-active-descendant.html b/build/review/menu-button-actions-active-descendant.html
index 337338557..1f25452f1 100644
--- a/build/review/menu-button-actions-active-descendant.html
+++ b/build/review/menu-button-actions-active-descendant.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: menu-button-actions-active-descendant (26 test
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode</h2>
@@ -898,7 +926,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>B</li>
@@ -977,7 +1005,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1298,7 +1326,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, read information about the menu button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1503,7 +1531,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, open the menu. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/menu-button-actions.html b/build/review/menu-button-actions.html
index 920007877..e294a3205 100644
--- a/build/review/menu-button-actions.html
+++ b/build/review/menu-button-actions.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: menu-button-actions (26 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a menu button in reading mode</h2>
@@ -898,7 +926,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>B</li>
@@ -977,7 +1005,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the menu button. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1298,7 +1326,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, read information about the menu button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1502,7 +1530,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Actions&#39; menu button, open the menu. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/menubar-editor.html b/build/review/menubar-editor.html
index 396e5ba4b..49c5bd3e7 100644
--- a/build/review/menubar-editor.html
+++ b/build/review/menubar-editor.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: menubar-editor (40 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to menubar in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar using the following commands:
                <ul>
                    <li>Up Arrow &#x2F; Down Arrow</li>
@@ -966,7 +994,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Font&quot; menu item in the &#39;Text Formatting&#39; menubar example with down arrow. | Activate the &#39;Font&#39; menu using the following commands:
                <ul>
                    <li>Space</li>
@@ -1043,7 +1071,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar using the following commands:
                <ul>
                    <li>Tab</li>
@@ -1243,7 +1271,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to &#39;Text Formatting&#39; menu with down arrow| Navigate to &#39;Style&#x2F;Color&#39; menu using the following commands:
                <ul>
                    <li>Insert+Numpad 6 (or CapsLock+Numpad 6)</li>
@@ -2366,7 +2394,7 @@ <h3>NVDA</h3>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the &#39;Text Formatting&#39; menubar. | Navigate to the size menu item in the menubar. | Read &#39;Size&#39; menu item using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2588,7 +2616,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Blue&#39; menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  &#39;Blue&#39; menu item radio using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2810,7 +2838,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Black&#39; menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  &#39;Black&#39; menu item radio using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3032,7 +3060,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox with down arrow. | Activate the screen reader reading cursor. | Read the &#39;Italic&#39; menu item checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3254,7 +3282,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Style&#x2F;Color&#39; menu item with right arrow. | Open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox and check it by pressing enter. (the menu will close.) | Re-open &#39;Style&#x2F;Color&#39; menu with down arrow. | Navigate to &#39;Italic&#39; menu item checkbox. | Activate the screen reader reading cursor. | Read the &#39;Italic&#39; menu item checkbox using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3475,7 +3503,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Tab to &#39;Text Formatting&#39; menubar. | Navigate to &#39;Size&#39; menu item with right arrow. | Open &#39;Size&#39; menu with  down arrow. | Navigate to &#39;X-Small&#39; with down arrow. | Activate &#39;X-Small&#39;. with Enter. | Open &#39;Size&#39; menu with down arrow. | Activate the screen reader reading cursor. | Read the &#39;Smaller&#39; menu item using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/meter.html b/build/review/meter.html
index e1991004d..6201c7a8e 100644
--- a/build/review/meter.html
+++ b/build/review/meter.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: meter (9 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a meter in reading mode</h2>
@@ -902,7 +930,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the meter. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1039,7 +1067,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the meter. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1177,7 +1205,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the meter, read information about the meter using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1309,7 +1337,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Change Value&#39; button, activate the button to trigger a meter update. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/minimal-data-grid.html b/build/review/minimal-data-grid.html
index 032a730ae..801f81468 100644
--- a/build/review/minimal-data-grid.html
+++ b/build/review/minimal-data-grid.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: minimal-data-grid (55 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a grid in reading mode</h2>
@@ -842,7 +870,7 @@ <h2 class="jaws nvda">Test 1: Navigate forwards to a grid in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -872,9 +900,9 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the first column header in the grid. Note: you may need to press  certain commands (such as Down Arrow) multiple times to hear all information relating to the grid and the first column header. using the following commands:
+             <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
-                   <li>T followed by Down Arrow</li>
+                   <li>T, then Down Arrow</li>
                    <li>Down Arrow</li>
                </ul>
              </li>
@@ -901,8 +929,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the first column header in the grid. Note: you may need to press  certain commands (such as Down Arrow) multiple times to hear all information relating to the grid and the first column header. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
                    <li>T</li>
                    <li>Down Arrow</li>
@@ -926,7 +954,7 @@ <h2 class="jaws nvda">Test 2: Navigate backwards to a grid in reading mode</h2>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -958,7 +986,7 @@ <h4>Tester Instructions</h4>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
              <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
-                   <li>Shift+T followed by Down Arrow</li>
+                   <li>Shift+T, then Down Arrow</li>
                </ul>
              </li>
           </ol>
@@ -984,7 +1012,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
                    <li>Shift+T</li>
@@ -1008,7 +1036,7 @@ <h2 class="voiceover_macos">Test 3: Navigate forwards to a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1037,7 +1065,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the first column header in the grid. Note: you may need to press certain commands (such as Control+Option+Right) multiple times to hear all information relating to the grid and the first column header. using the following commands:
+             <li>Navigate to the first column header in the grid. using the following commands:
                <ul>
                    <li>Control+Option+Right</li>
                    <li>Control+Option+Command+T</li>
@@ -1061,7 +1089,7 @@ <h2 class="jaws nvda">Test 4: Navigate into the end of a grid in reading mode</h
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html?at=jaws">jaws</a></li>
@@ -1090,7 +1118,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Verify the Virtual Cursor is active by pressing Alt+Delete. If it is not, turn on the Virtual Cursor by pressing Insert+Z.</li>
-             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the grid and the last cell. using the following commands:
+             <li>Navigate to the last cell in the grid. using the following commands:
                <ul>
                    <li>Up Arrow</li>
                </ul>
@@ -1120,8 +1148,8 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
-             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the grid and the last cell. using the following commands:
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Navigate to the last cell in the grid. using the following commands:
                <ul>
                    <li>Up Arrow</li>
                </ul>
@@ -1146,7 +1174,7 @@ <h2 class="voiceover_macos">Test 5: Navigate into the end of a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1174,7 +1202,7 @@ <h4>Tester Instructions</h4>
         <p>
           <ol>
              <li>Toggle Quick Nav OFF by pressing the Left Arrow and Right Arrow keys at the same time.</li>
-             <li>Navigate to the last cell in the grid. Note: you may need to press certain commands (such as Control+Option+Left) multiple times to hear all information relating to the grid and the last cell. using the following commands:
+             <li>Navigate to the last cell in the grid. using the following commands:
                <ul>
                    <li>Ctrl+Option+Left</li>
                </ul>
@@ -1258,7 +1286,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Move keyboard focus onto the first non-header cell in the grid. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -1342,7 +1370,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Move keyboard focus onto the first non-header cell in the grid. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -1695,7 +1723,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the first non-header cell in the grid, read information about the cell. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1896,7 +1924,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on a cell containing a link in the grid, read information about the cell. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2041,12 +2069,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 18: Navigate to the next colum in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 18: Navigate to the next column in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2099,7 +2127,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Right</li>
@@ -2115,12 +2143,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 19: Navigate to the next colum in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 19: Navigate to the next column in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2189,12 +2217,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 20: Navigate to the next colum in a grid</h2>
+    <h2 class="voiceover_macos">Test 20: Navigate to the next column in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2238,12 +2266,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 21: Navigate to the previous colum in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 21: Navigate to the previous column in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2296,7 +2324,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Left</li>
@@ -2312,12 +2340,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 22: Navigate to the previous colum in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 22: Navigate to the previous column in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2386,12 +2414,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 23: Navigate to the previous colum in a grid</h2>
+    <h2 class="voiceover_macos">Test 23: Navigate to the previous column in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2435,12 +2463,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 24: Navigate to the next colum containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 24: Navigate to the next column containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2495,7 +2523,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next column containing a link in the grid. using the following commands:
                <ul>
                    <li>U</li>
@@ -2514,12 +2542,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 25: Navigate to the next colum containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 25: Navigate to the next column containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2591,12 +2619,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 26: Navigate to the next colum containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 26: Navigate to the next column containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2642,12 +2670,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 27: Navigate to the previous colum containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 27: Navigate to the previous column containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2702,7 +2730,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous column containing a link in the grid. using the following commands:
                <ul>
                    <li>Shift+U</li>
@@ -2721,12 +2749,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 28: Navigate to the previous colum containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 28: Navigate to the previous column containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2797,12 +2825,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 29: Navigate to the previous colum containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 29: Navigate to the previous column containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2848,12 +2876,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 30: Navigate to the next column from a cel containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 30: Navigate to the next column from a cell containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2906,7 +2934,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the next column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Right</li>
@@ -2922,12 +2950,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 31: Navigate to the next column from a cel containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 31: Navigate to the next column from a cell containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2996,12 +3024,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 32: Navigate to the next column from a cel containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 32: Navigate to the next column from a cell containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3045,12 +3073,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 4, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 33: Navigate to the previous column from a cel containing a link in a grid in reading mode</h2>
+    <h2 class="jaws nvda">Test 33: Navigate to the previous column from a cell containing a link in a grid in reading mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3103,7 +3131,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the previous column in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Left</li>
@@ -3119,12 +3147,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="jaws nvda">Test 34: Navigate to the previous column from a cel containing a link in a grid in interaction mode</h2>
+    <h2 class="jaws nvda">Test 34: Navigate to the previous column from a cell containing a link in a grid in interaction mode</h2>
     <p>
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3193,12 +3221,12 @@ <h4>Assertions</h4>
             <tr><td>required</td><td>coordinates of the cell (column 2, row 2) are conveyed</td></tr>
         </table>
       </div>
-    <h2 class="voiceover_macos">Test 35: Navigate to the previous column from a cel containing a link in a grid</h2>
+    <h2 class="voiceover_macos">Test 35: Navigate to the previous column from a cell containing a link in a grid</h2>
     <p>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3230,7 +3258,6 @@ <h4>Tester Instructions</h4>
                    <li>Left Arrow</li>
                    <li>Ctrl+Option+Left</li>
                    <li>Shift+Control+Option+Command+Y</li>
-                   <li>Shift+Control+Option+Command+L</li>
                </ul>
              </li>
           </ol>
@@ -3248,7 +3275,7 @@ <h2 class="jaws nvda">Test 36: Navigate to the next row in a grid in reading mod
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3286,7 +3313,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3301,7 +3327,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the next row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Down</li>
@@ -3312,7 +3338,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3322,7 +3347,7 @@ <h2 class="jaws nvda">Test 37: Navigate to the next row in a grid in interaction
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3360,7 +3385,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3386,7 +3410,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3396,7 +3419,7 @@ <h2 class="voiceover_macos">Test 38: Navigate to the next row in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3434,7 +3457,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;02-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 3) are conveyed</td></tr>
         </table>
@@ -3444,7 +3466,7 @@ <h2 class="jaws nvda">Test 39: Navigate to the previous row in a grid in reading
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3482,7 +3504,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3497,7 +3518,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the previous row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Up</li>
@@ -3508,7 +3529,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3518,7 +3538,7 @@ <h2 class="jaws nvda">Test 40: Navigate to the previous row in a grid in interac
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3556,7 +3576,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3582,7 +3601,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3592,7 +3610,7 @@ <h2 class="voiceover_macos">Test 41: Navigate to the previous row in a grid</h2>
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3630,7 +3648,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Date&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Text of the cell (&#39;01-Jan-16&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 1, row 2) are conveyed</td></tr>
         </table>
@@ -3640,7 +3657,7 @@ <h2 class="jaws nvda">Test 42: Navigate to a cell containing a link on the next
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3678,7 +3695,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3694,7 +3710,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the next row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Down</li>
@@ -3705,7 +3721,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3716,7 +3731,7 @@ <h2 class="jaws nvda">Test 43: Navigate to a cell containing a link on the next
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3754,7 +3769,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3781,7 +3795,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3792,7 +3805,7 @@ <h2 class="voiceover_macos">Test 44: Navigate to a cell containing a link on the
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3830,7 +3843,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Down Town Grocery&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 3) are conveyed</td></tr>
@@ -3841,7 +3853,7 @@ <h2 class="jaws nvda">Test 45: Navigate to a cell containing a link on the previ
       <ul class="jaws nvda">
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3879,7 +3891,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3895,7 +3906,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>From a cell containing a link, navigate to the previous row in the grid. using the following commands:
                <ul>
                    <li>Control+Alt+Up</li>
@@ -3906,7 +3917,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3917,7 +3927,7 @@ <h2 class="jaws nvda">Test 46: Navigate to a cell containing a link on the previ
       <ul class="jaws nvda">
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3955,7 +3965,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3982,7 +3991,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
@@ -3993,7 +4001,7 @@ <h2 class="voiceover_macos">Test 47: Navigate to a cell containing a link on the
       <ul class="voiceover_macos">
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Fri Oct 1 11:21:00 2021 -0400</li>
+        <li>Last edited: Wed Mar 9 15:30:19 2022 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4031,7 +4039,6 @@ <h4>Tester Instructions</h4>
         <h4>Assertions</h4>
         <table>
           <tr><th>Priority</th><th>Assertion</th></tr>
-            <tr><td>required</td><td>Text of the column header (&#39;Description&#39;) is conveyed</td></tr>
             <tr><td>required</td><td>Role &#39;link&#39; is conveyed</td></tr>
             <tr><td>required</td><td>Name &#39;Cash Deposit&#39; is conveyed</td></tr>
             <tr><td>required</td><td>coordinates of the cell (column 3, row 2) are conveyed</td></tr>
diff --git a/build/review/modal-dialog.html b/build/review/modal-dialog.html
index b6abb1d56..3ab0699a6 100644
--- a/build/review/modal-dialog.html
+++ b/build/review/modal-dialog.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: modal-dialog (29 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Open a modal dialog in reading mode</h2>
@@ -899,7 +927,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Add Delivery Address&#39; button, open the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1106,7 +1134,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, close the dialog. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -1297,7 +1325,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Cancel&#39; button inside a modal dialog, press the button to close the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -1729,7 +1757,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, navigate to the beginning of the dialog. using the following commands:
                <ul>
                    <li>Control+Home</li>
@@ -1849,7 +1877,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on an input inside a modal dialog, navigate to the end of the dialog. using the following commands:
                <ul>
                    <li>Control+End</li>
@@ -1974,7 +2002,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Add&#39; button inside a modal dialog, open the nested &#39;Address Added&#39; dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2191,7 +2219,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Close&#39; button inside a modal dialog, close the dialog. using the following commands:
                <ul>
                    <li>Escape</li>
@@ -2398,7 +2426,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Close&#39; button inside a modal dialog, press the button to close the dialog. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2611,7 +2639,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;your profile&#39; link inside a modal dialog, open the nested &#39;End of the Road!&#39; dialog. using the following commands:
                <ul>
                    <li>Enter</li>
diff --git a/build/review/radiogroup-aria-activedescendant.html b/build/review/radiogroup-aria-activedescendant.html
index 799690b9e..a7fbc2cdf 100644
--- a/build/review/radiogroup-aria-activedescendant.html
+++ b/build/review/radiogroup-aria-activedescendant.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: radiogroup-aria-activedescendant (39 tests)</h
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a group in reading mode</h2>
@@ -906,7 +934,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1054,7 +1082,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1202,7 +1230,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1350,7 +1378,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -2064,7 +2092,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -2278,7 +2306,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Thin crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -2493,7 +2521,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2712,7 +2740,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3470,7 +3498,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, check the radio button. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/radiogroup-roving-tabindex.html b/build/review/radiogroup-roving-tabindex.html
index 1a16542fd..a9143ae83 100644
--- a/build/review/radiogroup-roving-tabindex.html
+++ b/build/review/radiogroup-roving-tabindex.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: radiogroup-roving-tabindex (39 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate to the first unchecked radio button in a group in reading mode</h2>
@@ -905,7 +933,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1051,7 +1079,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -1197,7 +1225,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the first radio button in the group. using the following commands:
                <ul>
                    <li>F</li>
@@ -1343,7 +1371,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the last radio button in the group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the radio button and group. using the following commands:
                <ul>
                    <li>Shift+F</li>
@@ -2048,7 +2076,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -2262,7 +2290,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Thin crust&#39; radio button, navigate out of the radio group. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the group. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -2476,7 +2504,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2692,7 +2720,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, read information about the radio button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -3440,7 +3468,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Regular crust&#39; radio button, check the radio button. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/rating-slider.html b/build/review/rating-slider.html
index e224ac1cc..207c7edee 100644
--- a/build/review/rating-slider.html
+++ b/build/review/rating-slider.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: rating-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -906,7 +934,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Rating&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -996,7 +1024,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Rating&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1378,7 +1406,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Rating&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/seek-slider.html b/build/review/seek-slider.html
index c142f31bc..1e4e3318c 100644
--- a/build/review/seek-slider.html
+++ b/build/review/seek-slider.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: seek-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -906,7 +934,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Seek&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -996,7 +1024,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Seek&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1378,7 +1406,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Seek&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
diff --git a/build/review/switch.html b/build/review/switch.html
index 0fe1ef5c9..6ed569603 100644
--- a/build/review/switch.html
+++ b/build/review/switch.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: switch (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a switch in the off state in reading mode</h2>
@@ -900,7 +928,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>B</li>
@@ -1111,7 +1139,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1322,7 +1350,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>B</li>
@@ -1533,7 +1561,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Notifications&#39; switch. using the following commands:
                <ul>
                    <li>Shift+B</li>
@@ -1743,7 +1771,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, read information about the switch. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1952,7 +1980,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, read information about the switch. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2157,7 +2185,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, change its state to &#39;on&#39;. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2351,7 +2379,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Notifications&#39; switch, change its state to &#39;off&#39;. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/tabs-manual-activation.html b/build/review/tabs-manual-activation.html
index 15c1e8a1d..8f51852a0 100644
--- a/build/review/tabs-manual-activation.html
+++ b/build/review/tabs-manual-activation.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: tabs-manual-activation (29 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a tab list in reading mode</h2>
@@ -905,7 +933,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the tab list. Note: You may need to press certain commands (such as Down Arrow) multiple times to hear all information relating to the tab list. using the following commands:
                <ul>
                    <li>Tab</li>
@@ -994,7 +1022,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>Navigate to the tab list. Note: You may need to press certain commands (such as Up Arrow) multiple times to hear all information relating to the tab list. using the following commands:
                <ul>
                    <li>Shift+Tab</li>
@@ -1369,7 +1397,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Nils Frahm&#39; tab, read information about the tab. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1585,7 +1613,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Nils Frahm&#39; tab, navigate to the next tab. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1793,7 +1821,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Agnes Obel&#39; tab, navigate to the previous tab. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -2515,7 +2543,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Agnes Obel&#39; tab, activate the tab. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2714,7 +2742,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Joke&#39; tab, delete the tab. using the following commands:
                <ul>
                    <li>Delete</li>
diff --git a/build/review/toggle-button.html b/build/review/toggle-button.html
index e90bf716f..28319c75c 100644
--- a/build/review/toggle-button.html
+++ b/build/review/toggle-button.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: toggle-button (24 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a not pressed toggle button in reading mode</h2>
@@ -900,7 +928,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -982,7 +1010,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1318,7 +1346,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Down Arrow</li>
@@ -1400,7 +1428,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Mute&#39; button. using the following commands:
                <ul>
                    <li>Up Arrow</li>
@@ -1734,7 +1762,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -1940,7 +1968,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, read information about the button. using the following commands:
                <ul>
                    <li>Insert+Tab</li>
@@ -2144,7 +2172,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, activate the button. using the following commands:
                <ul>
                    <li>Space</li>
@@ -2342,7 +2370,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Mute&#39; button, activate the button. using the following commands:
                <ul>
                    <li>Space</li>
diff --git a/build/review/vertical-temperature-slider.html b/build/review/vertical-temperature-slider.html
index 79f4e8318..c8b1fa245 100644
--- a/build/review/vertical-temperature-slider.html
+++ b/build/review/vertical-temperature-slider.html
@@ -21,6 +21,37 @@
     <script type="module">
       import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
 
+      function numberTests(value) {
+        let testNumber = 0;
+        let titleTextChanged = false;
+        let buttonTextChanged = false;
+
+        for (let result of document.querySelectorAll(value)) {
+          result.style.display = 'block';
+
+          if (titleTextChanged && buttonTextChanged) {
+            testNumber += 1;
+
+            titleTextChanged = false;
+            buttonTextChanged = false;
+          }
+
+          if (result.nodeName === 'H2') {
+            result.innerText = result.innerText.replace(/^Test\s\d+:/g, `Test ${testNumber + 1}:`);
+            titleTextChanged = true;
+          }
+
+          if (result.nodeName === 'BUTTON') {
+            result.value = `Open Test ${testNumber + 1} Page`;
+            result.innerText = `Open Test ${testNumber + 1} Page`;
+            buttonTextChanged = true;
+          }
+        }
+
+        let reviewPageTitle = document.querySelector('h1');
+        reviewPageTitle.innerText = reviewPageTitle.innerText.replace(/\(\d+\stest(s|)\)/g, `(${testNumber} test${testNumber !== 1 ? 's': ''})`);
+      }
+
       window.filterATs = function(button) {
         const val = button.value;
 
@@ -36,6 +67,7 @@
               at.checked = true;
             }
           }
+          numberTests('.nvda, .jaws, .voiceover_macos');
         }
         else {
           for (let at of document.querySelectorAll('input')) {
@@ -50,12 +82,8 @@
             for (let result of document.querySelectorAll(`.${at.value}`)) {
               result.style.display = 'none';
             }
-
-          }
-
-          for (let result of document.querySelectorAll(`.${val}`)) {
-            result.style.display = 'block';
           }
+          numberTests(`.${val}`);
         }
       };
 
@@ -832,9 +860,9 @@ <h1>Test plan review for pattern: vertical-temperature-slider (21 tests)</h1>
     <fieldset>
       <legend>Filter tests by assistive technology</legend>
       <input type="radio" onclick="filterATs(this)" id="all" value="all" checked="true"><label for="all">All assistive technologies</label>
-        <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
-        <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
-        <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
+      <input type="radio" onclick="filterATs(this)" id="jaws" value="jaws"><label for="jaws">JAWS</label>
+      <input type="radio" onclick="filterATs(this)" id="nvda" value="nvda"><label for="nvda">NVDA</label>
+      <input type="radio" onclick="filterATs(this)" id="voiceover_macos" value="voiceover_macos"><label for="voiceover_macos">VoiceOver for macOS</label>
     </fieldset>
 
     <h2 class="jaws nvda">Test 1: Navigate forwards to a slider in reading mode</h2>
@@ -907,7 +935,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate forwards from here&#39; link, navigate to the &#39;Temperature&#39; slider. using the following commands:
                <ul>
                    <li>Down Arrow, then Down Arrow</li>
@@ -998,7 +1026,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Navigate backwards from here&#39; link, navigate to the &#39;Temperature&#39; slider. using the following commands:
                <ul>
                    <li>Up Arrow, then Up Arrow</li>
@@ -1385,7 +1413,7 @@ <h4>Scripted Instructions</h4>
         <h4>Tester Instructions</h4>
         <p>
           <ol>
-             <li>Insure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
+             <li>Ensure NVDA is in browse mode by pressing Escape. Note: This command has no effect if NVDA is already in browse mode.</li>
              <li>With the reading cursor on the &#39;Temperature&#39; slider, read information about the slider. using the following commands:
                <ul>
                    <li>Insert+Tab</li>