From 24efd4889dd3373417d25c069acecfec75c7bd9d Mon Sep 17 00:00:00 2001
From: Rebecca Meritz <rebecca@meritz.com>
Date: Tue, 1 Dec 2020 12:07:09 -0500
Subject: [PATCH] Change format of generated test files to be comparable (#333)

* Replace scripts.js file with inlined file

* Remove and inline test json file

* Remove fetching command.json via ajax call

* Replace command.json with inlining one command

* Add back generated files

They are needed to generate the reivew pages.

* Stop github action from running twice

I think it once running once for all PRs and once for all PR targets
(which is to support forks).

And then the two commits were collbering each other.

* Generate test and review files automatically

Co-authored-by: rmeritz <rmeritz@users.noreply.github.com>
---
 .../workflows/generate-and-commit-files.yml   |   2 +-
 index.html                                    |   6 +-
 review/checkbox.html                          |  52 ++---
 review/combobox-autocomplete-both.html        |  60 +++---
 review/menubar-editor.html                    |  80 +++----
 scripts/create-example-tests.js               |  55 ++---
 tests/checkbox/scripts.js                     |  44 ----
 ...avigate-to-unchecked-checkbox-reading.html |  81 +++++++-
 ...ate-to-unchecked-checkbox-interaction.html |  81 +++++++-
 ...ate-to-unchecked-checkbox-interaction.html |  80 ++++++-
 ...-navigate-to-checked-checkbox-reading.html |  84 +++++++-
 ...igate-to-checked-checkbox-interaction.html |  84 +++++++-
 ...igate-to-checked-checkbox-interaction.html |  83 +++++++-
 .../test-07-operate-checkbox-reading.html     |  54 ++++-
 .../test-08-operate-checkbox-interaction.html |  54 ++++-
 .../test-09-operate-checkbox-interaction.html |  53 ++++-
 ...st-10-read-unchecked-checkbox-reading.html |  65 +++++-
 ...1-read-unchecked-checkbox-interaction.html |  65 +++++-
 ...2-read-unchecked-checkbox-interaction.html |  64 +++++-
 ...test-13-read-checked-checkbox-reading.html |  67 +++++-
 ...-14-read-checked-checkbox-interaction.html |  67 +++++-
 ...-15-read-checked-checkbox-interaction.html |  66 +++++-
 .../test-16-read-checkbox-group-reading.html  |  58 +++++-
 ...st-17-read-checkbox-group-interaction.html |  58 +++++-
 ...st-18-read-checkbox-group-interaction.html |  57 ++++-
 ...tially-through-checkbox-group-reading.html |  60 +++++-
 ...ly-through-checkbox-group-interaction.html |  59 +++++-
 ...-navigate-into-checkbox-group-reading.html |  80 ++++++-
 ...igate-into-checkbox-group-interaction.html |  80 ++++++-
 ...igate-into-checkbox-group-interaction.html |  79 ++++++-
 ...avigate-out-of-checkbox-group-reading.html |  64 +++++-
 ...ate-out-of-checkbox-group-interaction.html |  64 +++++-
 ...ate-out-of-checkbox-group-interaction.html |  63 +++++-
 tests/combobox-autocomplete-both/scripts.js   | 195 ------------------
 .../test-01-navigate-to-combobox-reading.html |  80 ++++++-
 ...-navigate-by-line-to-combobox-reading.html |  54 ++++-
 ...t-03-navigate-to-combobox-interaction.html |  80 ++++++-
 .../test-04-read-combobox-reading.html        |  63 +++++-
 .../test-05-read-combobox-interaction.html    |  63 +++++-
 .../test-06-navigate-to-combobox-reading.html |  93 ++++++++-
 ...t-07-navigate-to-combobox-interaction.html |  93 ++++++++-
 .../test-08-read-combobox-reading.html        |  76 ++++++-
 .../test-09-read-combobox-interaction.html    |  76 ++++++-
 .../test-10-navigate-to-combobox-reading.html |  94 ++++++++-
 ...-navigate-by-line-to-combobox-reading.html |  58 +++++-
 ...t-12-navigate-to-combobox-interaction.html |  94 ++++++++-
 .../test-13-read-combobox-reading.html        |  77 ++++++-
 .../test-14-read-combobox-interaction.html    |  77 ++++++-
 ...x-with-keys-that-switch-modes-reading.html |  46 ++++-
 .../test-16-activate-combobox-reading.html    |  53 ++++-
 .../test-17-open-combobox-interaction.html    |  62 +++++-
 .../test-18-close-combobox-interaction.html   |  57 ++++-
 ...est-19-activate-states-button-reading.html |  61 +++++-
 ...20-activate-states-button-interaction.html |  60 +++++-
 ...est-21-activate-states-button-reading.html |  57 ++++-
 ...22-activate-states-button-interaction.html |  57 ++++-
 ...-into-popup-from-combobox-interaction.html |  66 +++++-
 ...24-type-in-empty-combobox-interaction.html |  66 +++++-
 ...25-navigate-listbox-popup-interaction.html |  62 +++++-
 ...-read-option-in-listbox-popup-reading.html |  66 +++++-
 ...d-option-in-listbox-popup-interaction.html |  66 +++++-
 ...28-choose-combobox-option-interaction.html |  70 ++++++-
 .../test-29-cancel-selection-interaction.html |  70 ++++++-
 ...ret-movement-from-listbox-interaction.html |  85 +++++++-
 tests/menubar-editor/scripts.js               | 150 --------------
 .../test-01-navigate-to-menubar-reading.html  |  79 ++++++-
 .../test-02-activate-menubar-reading.html     |  46 ++++-
 .../test-03-tab-to-menubar-reading.html       |  69 ++++++-
 ...st-04-navigate-to-menubar-interaction.html |  79 ++++++-
 ...st-05-navigate-to-menubar-interaction.html |  78 ++++++-
 ...vigate-to-menuitem-in-menubar-reading.html |  70 ++++++-
 ...te-to-menuitem-in-menubar-interaction.html |  73 ++++++-
 ...te-to-menuitem-in-menubar-interaction.html |  72 ++++++-
 ...-open-menuitem-in-menubar-interaction.html |  66 +++++-
 ...-open-menuitem-in-menubar-interaction.html |  65 +++++-
 ...1-open-submenu-of-menubar-interaction.html |  73 ++++++-
 ...2-open-submenu-of-menubar-interaction.html |  72 ++++++-
 ...-close-submenu-of-menubar-interaction.html |  62 +++++-
 ...-close-submenu-of-menubar-interaction.html |  61 +++++-
 ...-menuitemradio-in-submenu-interaction.html |  67 +++++-
 ...-menuitemradio-in-submenu-interaction.html |  66 +++++-
 ...-menuitemradio-in-submenu-interaction.html |  67 +++++-
 ...-menuitemradio-in-submenu-interaction.html |  66 +++++-
 ...nuitemcheckbox-in-submenu-interaction.html |  71 ++++++-
 ...nuitemcheckbox-in-submenu-interaction.html |  70 ++++++-
 ...nuitemcheckbox-in-submenu-interaction.html |  71 ++++++-
 ...nuitemcheckbox-in-submenu-interaction.html |  70 ++++++-
 ...t-23-read-menuitem-in-menubar-reading.html |  76 ++++++-
 ...-read-menuitem-in-menubar-interaction.html |  79 ++++++-
 ...-read-menuitem-in-menubar-interaction.html |  78 ++++++-
 ...radio-in-a-group-in-a-submenu-reading.html |  79 ++++++-
 ...o-in-a-group-in-a-submenu-interaction.html |  79 ++++++-
 ...o-in-a-group-in-a-submenu-interaction.html |  78 ++++++-
 ...radio-in-a-group-in-a-submenu-reading.html |  79 ++++++-
 ...o-in-a-group-in-a-submenu-interaction.html |  79 ++++++-
 ...o-in-a-group-in-a-submenu-interaction.html |  78 ++++++-
 ...ckbox-in-a-group-in-a-submenu-reading.html |  79 ++++++-
 ...x-in-a-group-in-a-submenu-interaction.html |  79 ++++++-
 ...x-in-a-group-in-a-submenu-interaction.html |  78 ++++++-
 ...ckbox-in-a-group-in-a-submenu-reading.html |  79 ++++++-
 ...x-in-a-group-in-a-submenu-interaction.html |  79 ++++++-
 ...x-in-a-group-in-a-submenu-interaction.html |  78 ++++++-
 ...isabled-menuitem-in-a-submenu-reading.html |  75 ++++++-
 ...led-menuitem-in-a-submenu-interaction.html |  75 ++++++-
 ...led-menuitem-in-a-submenu-interaction.html |  74 ++++++-
 105 files changed, 6032 insertions(+), 1378 deletions(-)
 delete mode 100644 tests/checkbox/scripts.js
 delete mode 100644 tests/combobox-autocomplete-both/scripts.js
 delete mode 100644 tests/menubar-editor/scripts.js

diff --git a/.github/workflows/generate-and-commit-files.yml b/.github/workflows/generate-and-commit-files.yml
index ea1b9d18c..3169972d7 100644
--- a/.github/workflows/generate-and-commit-files.yml
+++ b/.github/workflows/generate-and-commit-files.yml
@@ -1,6 +1,6 @@
 name: Generate and Commit Files
 
-on: [pull_request, pull_request_target]
+on: [pull_request_target]
 
 jobs:
   generate-and-commit-files:
diff --git a/index.html b/index.html
index 32dbf2e33..53da04336 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@ <h1>Test Patterns for Review</h1>
             <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/a9c11e8" target="_blank">a9c11e8 Execute setup script on popup for review page
+            <td><a href="https://github.com/w3c/aria-at/commit/b2d158a" target="_blank">b2d158a Stop github action from running twice
 </a></td>
           </tr>
           <tr>
@@ -48,7 +48,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/combobox-autocomplete-both/index.html">Index</a></td>
             <td><a href="./review/combobox-autocomplete-both.html">Review</a></td>
             <td>30</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/a9c11e8" target="_blank">a9c11e8 Execute setup script on popup for review page
+            <td><a href="https://github.com/w3c/aria-at/commit/b2d158a" target="_blank">b2d158a Stop github action from running twice
 </a></td>
           </tr>
           <tr>
@@ -56,7 +56,7 @@ <h1>Test Patterns for Review</h1>
             <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/a9c11e8" target="_blank">a9c11e8 Execute setup script on popup for review page
+            <td><a href="https://github.com/w3c/aria-at/commit/b2d158a" target="_blank">b2d158a Stop github action from running twice
 </a></td>
           </tr>
     </table>
diff --git a/review/checkbox.html b/review/checkbox.html
index 6d66ef06d..65e1aa3fb 100644
--- a/review/checkbox.html
+++ b/review/checkbox.html
@@ -187,7 +187,7 @@ <h2>Test 1: Navigate to an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -260,7 +260,7 @@ <h2>Test 2: Navigate to an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -326,7 +326,7 @@ <h2>Test 3: Navigate to an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -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>
@@ -372,7 +372,7 @@ <h2>Test 4: Navigate to a checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -455,7 +455,7 @@ <h2>Test 5: Navigate to a checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -531,7 +531,7 @@ <h2>Test 6: Navigate to a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -582,7 +582,7 @@ <h2>Test 7: Operate a checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-07-operate-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -645,7 +645,7 @@ <h2>Test 8: Operate a checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-08-operate-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -706,7 +706,7 @@ <h2>Test 9: Operate a checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-09-operate-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -748,7 +748,7 @@ <h2>Test 10: Read an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-10-read-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -826,7 +826,7 @@ <h2>Test 11: Read an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-11-read-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -904,7 +904,7 @@ <h2>Test 12: Read an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-12-read-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -954,7 +954,7 @@ <h2>Test 13: Read a checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-13-read-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1032,7 +1032,7 @@ <h2>Test 14: Read a checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-14-read-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1110,7 +1110,7 @@ <h2>Test 15: Read a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-15-read-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1160,7 +1160,7 @@ <h2>Test 16: Read grouping information of a grouped checkbox in reading mode</h2
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1224,7 +1224,7 @@ <h2>Test 17: Read grouping information of a grouped checkbox in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1288,7 +1288,7 @@ <h2>Test 18: Read grouping information of a grouped checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1332,7 +1332,7 @@ <h2>Test 19: Navigate sequentially through a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1401,7 +1401,7 @@ <h2>Test 20: Navigate sequentially through a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -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>
@@ -1447,7 +1447,7 @@ <h2>Test 21: Navigate into a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-21-navigate-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1524,7 +1524,7 @@ <h2>Test 22: Navigate into a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1593,7 +1593,7 @@ <h2>Test 23: Navigate into a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -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>
@@ -1643,7 +1643,7 @@ <h2>Test 24: Navigate out of a checkbox group  in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1712,7 +1712,7 @@ <h2>Test 25: Navigate out of a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1781,7 +1781,7 @@ <h2>Test 26: Navigate out of a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -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/review/combobox-autocomplete-both.html b/review/combobox-autocomplete-both.html
index 6c1de036e..464a2614c 100644
--- a/review/combobox-autocomplete-both.html
+++ b/review/combobox-autocomplete-both.html
@@ -187,7 +187,7 @@ <h2>Test 1: Navigate to empty, editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -257,7 +257,7 @@ <h2>Test 2: Navigate sequentially to empty, editable combobox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -323,7 +323,7 @@ <h2>Test 3: Navigate to empty, editable combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -389,7 +389,7 @@ <h2>Test 4: Read empty, editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-04-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -455,7 +455,7 @@ <h2>Test 5: Read empty, editable combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -521,7 +521,7 @@ <h2>Test 6: Navigate to filled, editable, collapsed  combobox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -603,7 +603,7 @@ <h2>Test 7: Navigate to filled, editable, collapsed  combobox in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -681,7 +681,7 @@ <h2>Test 8: Read filled, editable, collapsed combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-08-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -759,7 +759,7 @@ <h2>Test 9: Read filled, editable, collapsed combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -837,7 +837,7 @@ <h2>Test 10: Navigate to filled, editable, expanded combobox in reading mode</h2
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -919,7 +919,7 @@ <h2>Test 11: Navigate sequentially to filled, editable, expanded combobox in rea
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -987,7 +987,7 @@ <h2>Test 12: Navigate to filled, editable, expanded combobox in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1065,7 +1065,7 @@ <h2>Test 13: Read filled, editable, expanded combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-13-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1143,7 +1143,7 @@ <h2>Test 14: Read filled, editable, expanded combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1221,7 +1221,7 @@ <h2>Test 15: Navigate to editable combobox with commands that switch mode from r
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html?at=jaws">jaws</a></li>
@@ -1281,7 +1281,7 @@ <h2>Test 16: Activate editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1351,7 +1351,7 @@ <h2>Test 17: Open combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1425,7 +1425,7 @@ <h2>Test 18: Close combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1495,7 +1495,7 @@ <h2>Test 19: Open combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html?at=jaws">jaws</a></li>
@@ -1563,7 +1563,7 @@ <h2>Test 20: Open combobox with 'States' button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1606,7 +1606,7 @@ <h2>Test 21: Close combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html?at=jaws">jaws</a></li>
@@ -1678,7 +1678,7 @@ <h2>Test 22: Close combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html?at=jaws">jaws</a></li>
@@ -1748,7 +1748,7 @@ <h2>Test 23: Navigate into popup from empty combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1826,7 +1826,7 @@ <h2>Test 24: Type portion of valid value in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1902,7 +1902,7 @@ <h2>Test 25: Navigate options in popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -1978,7 +1978,7 @@ <h2>Test 26: Read popup item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html?at=jaws">jaws</a></li>
@@ -2053,7 +2053,7 @@ <h2>Test 27: Read popup item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2128,7 +2128,7 @@ <h2>Test 28: Activate option in popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html?at=jaws">jaws</a></li>
@@ -2206,7 +2206,7 @@ <h2>Test 29: Cancel option selection in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html?at=jaws">jaws</a></li>
@@ -2284,7 +2284,7 @@ <h2>Test 30: Initiate caret movement from listbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html?at=jaws">jaws</a></li>
diff --git a/review/menubar-editor.html b/review/menubar-editor.html
index 22739fc68..81b0d7caf 100644
--- a/review/menubar-editor.html
+++ b/review/menubar-editor.html
@@ -187,7 +187,7 @@ <h2>Test 1: Navigate to menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-01-navigate-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -268,7 +268,7 @@ <h2>Test 2: Activate menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-02-activate-menubar-reading.html?at=jaws">jaws</a></li>
@@ -331,7 +331,7 @@ <h2>Test 3: Navigate to menubar with commands that switch mode from reading to i
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-03-tab-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -412,7 +412,7 @@ <h2>Test 4: Navigate to menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-04-navigate-to-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -491,7 +491,7 @@ <h2>Test 5: Navigate to menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-05-navigate-to-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -542,7 +542,7 @@ <h2>Test 6: Navigate to menu item in menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -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>
@@ -611,7 +611,7 @@ <h2>Test 7: Navigate to menu item in menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -690,7 +690,7 @@ <h2>Test 8: Navigate to menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -741,7 +741,7 @@ <h2>Test 9: Navigate to open menu item in menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -820,7 +820,7 @@ <h2>Test 10: Navigate to open menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -870,7 +870,7 @@ <h2>Test 11: Open submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -950,7 +950,7 @@ <h2>Test 12: Open submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1002,7 +1002,7 @@ <h2>Test 13: Close submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1080,7 +1080,7 @@ <h2>Test 14: Close submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1130,7 +1130,7 @@ <h2>Test 15: Navigate to checked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1208,7 +1208,7 @@ <h2>Test 16: Navigate to checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1259,7 +1259,7 @@ <h2>Test 17: Navigate to unchecked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1337,7 +1337,7 @@ <h2>Test 18: Navigate to unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1388,7 +1388,7 @@ <h2>Test 19: Navigate to unchecked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1468,7 +1468,7 @@ <h2>Test 20: Navigate to unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1520,7 +1520,7 @@ <h2>Test 21: Navigate to checked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1606,7 +1606,7 @@ <h2>Test 22: Navigate to checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1661,7 +1661,7 @@ <h2>Test 23: Read menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -1735,7 +1735,7 @@ <h2>Test 24: Read menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1819,7 +1819,7 @@ <h2>Test 25: Read menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1873,7 +1873,7 @@ <h2>Test 26: Read unchecked menu item radio in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -1957,7 +1957,7 @@ <h2>Test 27: Read unchecked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2041,7 +2041,7 @@ <h2>Test 28: Read unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2095,7 +2095,7 @@ <h2>Test 29: Read checked menu item radio in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2179,7 +2179,7 @@ <h2>Test 30: Read checked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2263,7 +2263,7 @@ <h2>Test 31: Read checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2317,7 +2317,7 @@ <h2>Test 32: Read unchecked menu item checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2401,7 +2401,7 @@ <h2>Test 33: Read unchecked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2485,7 +2485,7 @@ <h2>Test 34: Read unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2539,7 +2539,7 @@ <h2>Test 35: Read checked menu item checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2623,7 +2623,7 @@ <h2>Test 36: Read checked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2707,7 +2707,7 @@ <h2>Test 37: Read checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2761,7 +2761,7 @@ <h2>Test 38: Read disabled menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2843,7 +2843,7 @@ <h2>Test 39: Read disabled menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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>
@@ -2925,7 +2925,7 @@ <h2>Test 40: Read disabled menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Tue Nov 17 17:22:14 2020 -0500</li>
+        <li>Lasted edited: Tue Nov 17 10:17:37 2020 -0500</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/scripts/create-example-tests.js b/scripts/create-example-tests.js
index 210c7f66d..d06e7bb6b 100644
--- a/scripts/create-example-tests.js
+++ b/scripts/create-example-tests.js
@@ -24,12 +24,9 @@ const createExampleTests = function (directory) {
   const referencesFile = path.join(testDirectory, 'data', 'references.csv');
   const javascriptDirectory = path.join(testDirectory, 'data', 'js');
   const indexFile = path.join(testDirectory,'index.html');
-  const scriptsFile = path.join(testDirectory,'scripts.js');
 
   const keyDefs = {};
 
-  let scripts = [];
-
   const support = JSON.parse(fse.readFileSync(path.join(rootDirectory, 'tests', 'support.json')));
   let allATKeys = [];
   let allATNames = [];
@@ -171,7 +168,6 @@ const createExampleTests = function (directory) {
 
     });
 
-  //  fs.writeFileSync(fname, JSON.stringify(data));
     fs.writeFileSync(fname, beautify(data, null, 2, 40));
 
     return data;
@@ -181,6 +177,7 @@ const createExampleTests = function (directory) {
   // Create Test File
 
   function createTestFile (test, refs, commands) {
+    let scripts = [];
 
 
     function getModeValue(value) {
@@ -292,13 +289,13 @@ const createExampleTests = function (directory) {
             const lines = data.split(/\r?\n/);
             lines.forEach((line) => {
               if (line.trim().length)
-              script += '\t' + line.trim() + '\n';
+              script += '\t\t\t' + line.trim() + '\n';
             });
         } catch (err) {
             console.error(err);
         }
 
-        scripts.push(`\t${scriptName}: function(testPageDocument){\n${script}}`);
+        scripts.push(`\t\t${scriptName}: function(testPageDocument){\n${script}\t\t}`);
       }
 
       return script;
@@ -316,6 +313,13 @@ const createExampleTests = function (directory) {
       return str;
     }
 
+    function getScripts() {
+      let js = 'var scripts = {\n';
+      js += scripts.join(',\n');
+      js += '\n\t};';
+      return js;
+    }
+
     let task = getTask(test.task);
     let appliesTo = getAppliesToValues(test.appliesTo);
     let mode = getModeValue(test.mode);
@@ -368,23 +372,34 @@ const createExampleTests = function (directory) {
 
     fse.writeFileSync(testJSONFileAbsolute, JSON.stringify(testData, null, 2), 'utf8');
 
+    function getTestJson() {
+      return JSON.stringify(testData, null, 2);
+    }
+
+    function getCommandsJson() {
+      return beautify({[task]: commands[task]}, null, 2, 40);
+    }
+
     let testHTML = `
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>${test.title}</title>
 ${references}
-<script src="scripts.js"></script>
+<script>
+  ${getScripts()}
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["${testJSONFileName}", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = ${getTestJson()};
+    const commandJson = ${getCommandsJson()};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("${refs.reference}");
   });
 </script>
@@ -501,13 +516,6 @@ ${rows}
      fse.writeFileSync(indexFile, indexHTML, 'utf8');
   }
 
-  function createScriptsFile() {
-    let js = 'var scripts = {\n';
-    js += scripts.join(',\n');
-    js += '\n};';
-    fse.writeFileSync(scriptsFile, js, 'utf8');
-  }
-
   // Process CSV files
 
   var refs = {};
@@ -554,7 +562,6 @@ ${rows}
               console.log('Deleting current test files...')
               deleteFilesFromDirectory(testDirectory);
 
-              console.log('Creating AT commands file')
               atCommands = createATCommandFile(atCommands);
 
               console.log('Creating the following test files: ')
@@ -571,8 +578,6 @@ ${rows}
 
               createIndexFile(indexOfURLs);
 
-              createScriptsFile();
-
               if (errorCount) {
                 console.log('\n\n*** ' + errorCount + ' Errors in tests and/or commands ***');
                 console.log(errors);
diff --git a/tests/checkbox/scripts.js b/tests/checkbox/scripts.js
deleted file mode 100644
index 89cffbeb7..000000000
--- a/tests/checkbox/scripts.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var scripts = {
-	checkFirstCheckbox: function(testPageDocument){
-	// Set aria-checked on first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
-},
-	checkFirstCheckbox: function(testPageDocument){
-	// Set aria-checked on first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
-},
-	checkFirstCheckbox: function(testPageDocument){
-	// Set aria-checked on first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
-},
-	moveFocusToFirstCheckbox: function(testPageDocument){
-	// Move focus to first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').focus();
-},
-	moveFocusToFirstCheckbox: function(testPageDocument){
-	// Move focus to first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').focus();
-},
-	moveFocusToFirstCheckbox: function(testPageDocument){
-	// Move focus to first checkbox
-	testPageDocument.querySelector('[role="checkbox"]').focus();
-},
-	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
-	// Move focus and set aria-checked on first checkbox
-	const checkbox = testPageDocument.querySelector('[role="checkbox"]');
-	checkbox.focus();
-	checkbox.setAttribute('aria-checked', 'true');
-},
-	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
-	// Move focus and set aria-checked on first checkbox
-	const checkbox = testPageDocument.querySelector('[role="checkbox"]');
-	checkbox.focus();
-	checkbox.setAttribute('aria-checked', 'true');
-},
-	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
-	// Move focus and set aria-checked on first checkbox
-	const checkbox = testPageDocument.querySelector('[role="checkbox"]');
-	checkbox.focus();
-	checkbox.setAttribute('aria-checked', 'true');
-}
-};
\ No newline at end of file
diff --git a/tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html b/tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html
index aebb0c8a8..c15828354 100644
--- a/tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html
+++ b/tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html
@@ -6,18 +6,81 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-01-navigate-to-unchecked-checkbox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to unchecked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the unchecked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html b/tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html
index 332f7f411..7a907153e 100644
--- a/tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html
+++ b/tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html
@@ -6,18 +6,81 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-02-navigate-to-unchecked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the unchecked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html b/tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html
index 21f7880ba..38a005eb9 100644
--- a/tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html
+++ b/tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html
@@ -6,18 +6,80 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-03-navigate-to-unchecked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the unchecked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html b/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
index 7ebedf82f..35e74ded5 100644
--- a/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
+++ b/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
@@ -6,18 +6,84 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		checkFirstCheckbox: function(testPageDocument){
+			// Set aria-checked on first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-04-navigate-to-checked-checkbox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets the state of the first checkbox to checked",
+  "setupTestPage": "checkFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to checked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html b/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
index 8086918cc..078d74b93 100644
--- a/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
+++ b/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
@@ -6,18 +6,84 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		checkFirstCheckbox: function(testPageDocument){
+			// Set aria-checked on first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-05-navigate-to-checked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets the state of the first checkbox to checked",
+  "setupTestPage": "checkFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html b/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
index 0cb1f6e06..c572dd23d 100644
--- a/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
+++ b/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
@@ -6,18 +6,83 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		checkFirstCheckbox: function(testPageDocument){
+			// Set aria-checked on first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-06-navigate-to-checked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets the state of the first checkbox to checked",
+  "setupTestPage": "checkFirstCheckbox",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked checkbox",
+  "specific_user_instruction": "Navigate to the first checkbox. Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked checkbox": {
+    "reading": {
+      "jaws": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ],
+        [
+          "LEFT_AND_RIGHT",
+          "(with Smart Navigation on)"
+        ]
+      ],
+      "nvda": [
+        [ "X_AND_SHIFT_X" ],
+        [ "F_AND_SHIFT_F" ],
+        [ "TAB_AND_SHIFT_TAB" ],
+        [ "UP_AND_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ],
+        [
+          "CTRL_OPT_CMD_J_AND_SHIFT_CTRL_OPT_CMD_J"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-07-operate-checkbox-reading.html b/tests/checkbox/test-07-operate-checkbox-reading.html
index f3593cc63..49b2744ee 100644
--- a/tests/checkbox/test-07-operate-checkbox-reading.html
+++ b/tests/checkbox/test-07-operate-checkbox-reading.html
@@ -5,18 +5,54 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-07-operate-checkbox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "operate checkbox",
+  "specific_user_instruction": "Check and uncheck the first checkbox.",
+  "output_assertions": [
+    [
+      "1",
+      "Change in state is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "operate checkbox": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "SPACE" ] ],
+      "nvda": [ [ "SPACE" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_SPACE" ],
+        [ "SPACE" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-08-operate-checkbox-interaction.html b/tests/checkbox/test-08-operate-checkbox-interaction.html
index d67512e7e..34a83c60d 100644
--- a/tests/checkbox/test-08-operate-checkbox-interaction.html
+++ b/tests/checkbox/test-08-operate-checkbox-interaction.html
@@ -5,18 +5,54 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-08-operate-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "operate checkbox",
+  "specific_user_instruction": "Check and uncheck the first checkbox.",
+  "output_assertions": [
+    [
+      "1",
+      "Change in state is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "operate checkbox": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "SPACE" ] ],
+      "nvda": [ [ "SPACE" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_SPACE" ],
+        [ "SPACE" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-09-operate-checkbox-interaction.html b/tests/checkbox/test-09-operate-checkbox-interaction.html
index f9067187f..bd4ed3009 100644
--- a/tests/checkbox/test-09-operate-checkbox-interaction.html
+++ b/tests/checkbox/test-09-operate-checkbox-interaction.html
@@ -5,18 +5,53 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-09-operate-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "operate checkbox",
+  "specific_user_instruction": "Check and uncheck the first checkbox.",
+  "output_assertions": [
+    [
+      "1",
+      "Change in state is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "operate checkbox": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "SPACE" ] ],
+      "nvda": [ [ "SPACE" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_SPACE" ],
+        [ "SPACE" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-10-read-unchecked-checkbox-reading.html b/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
index 84a200b43..d87bc9bbd 100644
--- a/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
+++ b/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
@@ -6,18 +6,65 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusToFirstCheckbox: function(testPageDocument){
+			// Move focus to first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-10-read-unchecked-checkbox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox",
+  "setupTestPage": "moveFocusToFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read unchecked checkbox",
+  "specific_user_instruction": "When the reading cursor is on the first checkbox, read the first checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html b/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
index 441cfcd85..9231bac53 100644
--- a/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
+++ b/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
@@ -6,18 +6,65 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusToFirstCheckbox: function(testPageDocument){
+			// Move focus to first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-11-read-unchecked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox",
+  "setupTestPage": "moveFocusToFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked checkbox",
+  "specific_user_instruction": "When the focus is on the first checkbox, read the first checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html b/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
index 44e4d90e9..57418764e 100644
--- a/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
+++ b/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
@@ -6,18 +6,64 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusToFirstCheckbox: function(testPageDocument){
+			// Move focus to first checkbox
+			testPageDocument.querySelector('[role="checkbox"]').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-12-read-unchecked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox",
+  "setupTestPage": "moveFocusToFirstCheckbox",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked checkbox",
+  "specific_user_instruction": "When the focus is on the first checkbox, read the first checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (not checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-13-read-checked-checkbox-reading.html b/tests/checkbox/test-13-read-checked-checkbox-reading.html
index f2327ea45..05f03fdcf 100644
--- a/tests/checkbox/test-13-read-checked-checkbox-reading.html
+++ b/tests/checkbox/test-13-read-checked-checkbox-reading.html
@@ -6,18 +6,67 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusAndCheckFirstCheckbox: function(testPageDocument){
+			// Move focus and set aria-checked on first checkbox
+			const checkbox = testPageDocument.querySelector('[role="checkbox"]');
+			checkbox.focus();
+			checkbox.setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-13-read-checked-checkbox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox and sets its state to checked",
+  "setupTestPage": "moveFocusAndCheckFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read checked checkbox",
+  "specific_user_instruction": "When the reading cursor is on the first checkbox, read the first checkbox.  Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox ( checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-14-read-checked-checkbox-interaction.html b/tests/checkbox/test-14-read-checked-checkbox-interaction.html
index d8d5b9b87..c676abeb8 100644
--- a/tests/checkbox/test-14-read-checked-checkbox-interaction.html
+++ b/tests/checkbox/test-14-read-checked-checkbox-interaction.html
@@ -6,18 +6,67 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusAndCheckFirstCheckbox: function(testPageDocument){
+			// Move focus and set aria-checked on first checkbox
+			const checkbox = testPageDocument.querySelector('[role="checkbox"]');
+			checkbox.focus();
+			checkbox.setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-14-read-checked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox and sets its state to checked",
+  "setupTestPage": "moveFocusAndCheckFirstCheckbox",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read checked checkbox",
+  "specific_user_instruction": "When the focus is on the first checkbox, read the first checkbox.  Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-15-read-checked-checkbox-interaction.html b/tests/checkbox/test-15-read-checked-checkbox-interaction.html
index 23b7a7256..b80486ce8 100644
--- a/tests/checkbox/test-15-read-checked-checkbox-interaction.html
+++ b/tests/checkbox/test-15-read-checked-checkbox-interaction.html
@@ -6,18 +6,66 @@
 <link rel="help" href="https://w3c.github.io/aria/#checkbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		moveFocusAndCheckFirstCheckbox: function(testPageDocument){
+			// Move focus and set aria-checked on first checkbox
+			const checkbox = testPageDocument.querySelector('[role="checkbox"]');
+			checkbox.focus();
+			checkbox.setAttribute('aria-checked', 'true');
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-15-read-checked-checkbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the first checkbox and sets its state to checked",
+  "setupTestPage": "moveFocusAndCheckFirstCheckbox",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read checked checkbox",
+  "specific_user_instruction": "When the focus is on the first checkbox, read the first checkbox.  Note: it should be in the checked state.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'Lettuce' is conveyed"
+    ],
+    [
+      "1",
+      "State of the checkbox (checked) is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked checkbox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-16-read-checkbox-group-reading.html b/tests/checkbox/test-16-read-checkbox-group-reading.html
index aafbc1673..f82b78208 100644
--- a/tests/checkbox/test-16-read-checkbox-group-reading.html
+++ b/tests/checkbox/test-16-read-checkbox-group-reading.html
@@ -6,18 +6,58 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-labelledby">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-16-read-checkbox-group-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read checkbox group",
+  "specific_user_instruction": "When reading cursor is on a checkbox, read its grouping information",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checkbox group": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-17-read-checkbox-group-interaction.html b/tests/checkbox/test-17-read-checkbox-group-interaction.html
index 692f750ce..caa3b7045 100644
--- a/tests/checkbox/test-17-read-checkbox-group-interaction.html
+++ b/tests/checkbox/test-17-read-checkbox-group-interaction.html
@@ -6,18 +6,58 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-labelledby">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-17-read-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read checkbox group",
+  "specific_user_instruction": "When focus is on a checkbox, read its grouping information",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checkbox group": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-18-read-checkbox-group-interaction.html b/tests/checkbox/test-18-read-checkbox-group-interaction.html
index 5af73dd79..949b2a81d 100644
--- a/tests/checkbox/test-18-read-checkbox-group-interaction.html
+++ b/tests/checkbox/test-18-read-checkbox-group-interaction.html
@@ -6,18 +6,57 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-labelledby">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-18-read-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read checkbox group",
+  "specific_user_instruction": "When focus is on a checkbox, read its grouping information",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checkbox group": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html b/tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html
index eaa8963a7..848156032 100644
--- a/tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html
+++ b/tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html
@@ -7,18 +7,60 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-19-navigate-sequentially-through-checkbox-group-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate sequentially through checkbox group",
+  "specific_user_instruction": "Navigate both forward and backward into and out of  the checkbox group.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "1",
+      "Group boundaries at start and end of group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate sequentially through checkbox group": {
+    "reading": {
+      "jaws": [ [ "UP" ], [ "DOWN" ] ],
+      "nvda": [ [ "UP" ], [ "DOWN" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-20-navigate-sequentially-through-checkbox-group-interaction.html b/tests/checkbox/test-20-navigate-sequentially-through-checkbox-group-interaction.html
index 4d5aae40e..23a7cd3b4 100644
--- a/tests/checkbox/test-20-navigate-sequentially-through-checkbox-group-interaction.html
+++ b/tests/checkbox/test-20-navigate-sequentially-through-checkbox-group-interaction.html
@@ -7,18 +7,59 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-20-navigate-sequentially-through-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate sequentially through checkbox group",
+  "specific_user_instruction": "Navigate both forward and backward into and out of  the checkbox group.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "1",
+      "Group boundaries at start and end of group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate sequentially through checkbox group": {
+    "reading": {
+      "jaws": [ [ "UP" ], [ "DOWN" ] ],
+      "nvda": [ [ "UP" ], [ "DOWN" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-21-navigate-into-checkbox-group-reading.html b/tests/checkbox/test-21-navigate-into-checkbox-group-reading.html
index cb46c64f0..537fa689d 100644
--- a/tests/checkbox/test-21-navigate-into-checkbox-group-reading.html
+++ b/tests/checkbox/test-21-navigate-into-checkbox-group-reading.html
@@ -7,18 +7,80 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-21-navigate-into-checkbox-group-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate into checkbox group",
+  "specific_user_instruction": "Navigate from outside the checkbox group to a checkbox inside the group. Test both navigating forward into the start and backward into the end.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate into checkbox group": {
+    "reading": {
+      "jaws": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ],
+      "nvda": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ],
+        [ "CTRL_OPT_CMD_J" ],
+        [ "SHIFT_CTRL_OPT_CMD_J" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html b/tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html
index bf072979d..1c8ef7cd1 100644
--- a/tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html
+++ b/tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html
@@ -7,18 +7,80 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-22-navigate-into-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate into checkbox group",
+  "specific_user_instruction": "Navigate from outside the checkbox group to a checkbox inside the group. Test both navigating forward into the start and backward into the end.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate into checkbox group": {
+    "reading": {
+      "jaws": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ],
+      "nvda": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ],
+        [ "CTRL_OPT_CMD_J" ],
+        [ "SHIFT_CTRL_OPT_CMD_J" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html b/tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html
index c50f771d1..da7f79322 100644
--- a/tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html
+++ b/tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html
@@ -7,18 +7,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-23-navigate-into-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate into checkbox group",
+  "specific_user_instruction": "Navigate from outside the checkbox group to a checkbox inside the group. Test both navigating forward into the start and backward into the end.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "1",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate into checkbox group": {
+    "reading": {
+      "jaws": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ],
+      "nvda": [
+        [ "X" ],
+        [ "SHIFT_X" ],
+        [ "F" ],
+        [ "SHIFT_F" ],
+        [ "TAB" ],
+        [ "SHIFT_TAB" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ],
+        [ "CTRL_OPT_CMD_J" ],
+        [ "SHIFT_CTRL_OPT_CMD_J" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html b/tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html
index 2bc7b880a..32a399a6f 100644
--- a/tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html
+++ b/tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html
@@ -7,18 +7,64 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-24-navigate-out-of-checkbox-group-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate out of checkbox group",
+  "specific_user_instruction": "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.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "2",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate out of checkbox group": {
+    "reading": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html b/tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html
index 6c7a78b5c..0f85f806f 100644
--- a/tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html
+++ b/tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html
@@ -7,18 +7,64 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-25-navigate-out-of-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate out of checkbox group",
+  "specific_user_instruction": "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.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "2",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate out of checkbox group": {
+    "reading": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html b/tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html
index ae1aecf01..a8a79afee 100644
--- a/tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html
+++ b/tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html
@@ -7,18 +7,63 @@
 <link rel="help" href="https://w3c.github.io/aria/#group">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-26-navigate-out-of-checkbox-group-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate out of checkbox group",
+  "specific_user_instruction": "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.",
+  "output_assertions": [
+    [
+      "2",
+      "Role 'group' is conveyed"
+    ],
+    [
+      "2",
+      "Group name 'Sandwich Condiments' is conveyed"
+    ],
+    [
+      "2",
+      "The group boundary is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate out of checkbox group": {
+    "reading": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB" ], [ "SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "SHIFT_TAB" ],
+        [ "CTRL_OPT_RIGHT" ],
+        [ "CTRL_OPT_LEFT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/two-state-checkbox.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/scripts.js b/tests/combobox-autocomplete-both/scripts.js
deleted file mode 100644
index 6f257af2b..000000000
--- a/tests/combobox-autocomplete-both/scripts.js
+++ /dev/null
@@ -1,195 +0,0 @@
-var scripts = {
-	comboboxValueSetCollapsedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'Alabama'
-	// Ensure in collapsed state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'Alabama';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-},
-	comboboxValueSetCollapsedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'Alabama'
-	// Ensure in collapsed state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'Alabama';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-},
-	comboboxValueSetCollapsedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'Alabama'
-	// Ensure in collapsed state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'Alabama';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-},
-	comboboxValueSetCollapsedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'Alabama'
-	// Ensure in collapsed state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'Alabama';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-},
-	comboboxValueSetExpandedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'a'
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'a';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	comboboxValueSetExpandedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'a'
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'a';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	comboboxValueSetExpandedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'a'
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'a';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	comboboxValueSetExpandedState: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'a'
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = 'a';
-	cb.comboboxNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyExpanded: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' to 'Alabama'
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	buttonFocusEmptyExpanded: function(testPageDocument){
-	// Set focus on button
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.buttonNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	buttonFocusEmptyExpanded: function(testPageDocument){
-	// Set focus on button
-	// Ensure in expanded state.
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.buttonNode.focus();
-	cb.filter = cb.comboboxNode.value;
-	cb.filterOptions();
-	cb.open();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-},
-	comboboxFocusEmptyCollapsed: function(testPageDocument){
-	// Set focus on combobox
-	// Set value of 'combobox' is empty
-	// Ensure in collapsed state
-	var cb = testPageDocument.comboboxAutocomplete;
-	cb.comboboxNode.value = '';
-	cb.combobox.focus();
-}
-};
\ No newline at end of file
diff --git a/tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html b/tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html
index 6f52ddfd4..a8103b671 100644
--- a/tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html
@@ -4,18 +4,80 @@
 <title>Navigate to empty, editable combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-01-navigate-to-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html b/tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html
index b1af3ef7f..e1e96078b 100644
--- a/tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html
@@ -4,18 +4,54 @@
 <title>Navigate sequentially to empty, editable combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-02-navigate-by-line-to-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate by line to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate by line to combobox": {
+    "reading": {
+      "jaws": [ [ "DOWN" ], [ "UP" ] ],
+      "nvda": [ [ "DOWN" ], [ "UP" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html b/tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html
index 9660dd116..3f7610852 100644
--- a/tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html
@@ -4,18 +4,80 @@
 <title>Navigate to empty, editable combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-03-navigate-to-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-04-read-combobox-reading.html b/tests/combobox-autocomplete-both/test-04-read-combobox-reading.html
index 4ada7aacf..7ae8f4ce0 100644
--- a/tests/combobox-autocomplete-both/test-04-read-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-04-read-combobox-reading.html
@@ -4,18 +4,63 @@
 <title>Read empty, editable combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-04-read-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read combobox",
+  "specific_user_instruction": "With the reading cursor on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html b/tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html
index ce2f12253..a111f3e11 100644
--- a/tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html
@@ -4,18 +4,63 @@
 <title>Read empty, editable combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-05-read-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read combobox",
+  "specific_user_instruction": "With focus on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html b/tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html
index b1a96bddf..e9c85d4e5 100644
--- a/tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html
@@ -4,18 +4,93 @@
 <title>Navigate to filled, editable, collapsed  combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetCollapsedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'Alabama'
+			// Ensure in collapsed state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'Alabama';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-06-navigate-to-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'Alabama'; ensure in collapsed state.",
+  "setupTestPage": "comboboxValueSetCollapsedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'Alabama' is conveyed."
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html b/tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html
index fec6d8859..f65cfb609 100644
--- a/tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html
@@ -4,18 +4,93 @@
 <title>Navigate to filled, editable, collapsed  combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetCollapsedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'Alabama'
+			// Ensure in collapsed state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'Alabama';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-07-navigate-to-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'Alabama'; ensure in collapsed state.",
+  "setupTestPage": "comboboxValueSetCollapsedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'Alabama' is conveyed."
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-08-read-combobox-reading.html b/tests/combobox-autocomplete-both/test-08-read-combobox-reading.html
index d5b8da413..2f1935a87 100644
--- a/tests/combobox-autocomplete-both/test-08-read-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-08-read-combobox-reading.html
@@ -4,18 +4,76 @@
 <title>Read filled, editable, collapsed combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetCollapsedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'Alabama'
+			// Ensure in collapsed state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'Alabama';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-08-read-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'Alabama'; ensure in collapsed state.",
+  "setupTestPage": "comboboxValueSetCollapsedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read combobox",
+  "specific_user_instruction": "With the reading cursor on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'Alabama' is conveyed."
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html b/tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html
index d28b69b6a..705cfbe4b 100644
--- a/tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html
@@ -4,18 +4,76 @@
 <title>Read filled, editable, collapsed combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetCollapsedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'Alabama'
+			// Ensure in collapsed state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'Alabama';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-09-read-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'Alabama'; ensure in collapsed state.",
+  "setupTestPage": "comboboxValueSetCollapsedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read combobox",
+  "specific_user_instruction": "With focus on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'Alabama' is conveyed."
+    ],
+    [
+      "2",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html b/tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html
index f9ae79c7b..11b9e861d 100644
--- a/tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html
@@ -4,18 +4,94 @@
 <title>Navigate to filled, editable, expanded combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetExpandedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'a'
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'a';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-10-navigate-to-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'A'; ensure in expanded state.",
+  "setupTestPage": "comboboxValueSetExpandedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "2",
+      "Expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html b/tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html
index 7feb79dd2..97dba9c1f 100644
--- a/tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html
@@ -4,18 +4,58 @@
 <title>Navigate sequentially to filled, editable, expanded combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-11-navigate-by-line-to-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate by line to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "2",
+      "Expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate by line to combobox": {
+    "reading": {
+      "jaws": [ [ "DOWN" ], [ "UP" ] ],
+      "nvda": [ [ "DOWN" ], [ "UP" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html b/tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html
index 9bfad3d5e..539368380 100644
--- a/tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html
@@ -4,18 +4,94 @@
 <title>Navigate to filled, editable, expanded combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetExpandedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'a'
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'a';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-12-navigate-to-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'A'; ensure in expanded state.",
+  "setupTestPage": "comboboxValueSetExpandedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to combobox",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "2",
+      "Expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox": {
+    "reading": {
+      "jaws": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "C_AND_SHIFT_C" ],
+        [ "E_AND_SHIFT_E" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "voiceover_macos": [
+        [ "F_AND_SHIFT_F" ],
+        [ "LEFT_AND_RIGHT" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB_AND_SHIFT_TAB" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-13-read-combobox-reading.html b/tests/combobox-autocomplete-both/test-13-read-combobox-reading.html
index ae02609b0..cee4ed0e5 100644
--- a/tests/combobox-autocomplete-both/test-13-read-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-13-read-combobox-reading.html
@@ -4,18 +4,77 @@
 <title>Read filled, editable, expanded combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetExpandedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'a'
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'a';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-13-read-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'A'; ensure in expanded state.",
+  "setupTestPage": "comboboxValueSetExpandedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read combobox",
+  "specific_user_instruction": "With the reading cursor on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "2",
+      "Expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html b/tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html
index 7d782e707..6c514d8e2 100644
--- a/tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html
@@ -4,18 +4,77 @@
 <title>Read filled, editable, expanded combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxValueSetExpandedState: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'a'
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = 'a';
+			cb.comboboxNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-14-read-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; set value of 'combobox' to 'A'; ensure in expanded state.",
+  "setupTestPage": "comboboxValueSetExpandedState",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read combobox",
+  "specific_user_instruction": "With focus on the combobox; read the combobox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "2",
+      "Expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "read combobox": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html b/tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html
index 90e11d818..208523d8e 100644
--- a/tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html
+++ b/tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html
@@ -4,18 +4,46 @@
 <title>Navigate to editable combobox with commands that switch mode from reading to interaction</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to combobox with keys that switch modes",
+  "specific_user_instruction": "Navigate to the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "The screen reader switches to mode that allows text input"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to combobox with keys that switch modes": {
+    "reading": {
+      "jaws": [ [ "TAB_AND_SHIFT_TAB" ] ],
+      "nvda": [ [ "TAB_AND_SHIFT_TAB" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html b/tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html
index 70ebd61f0..90259305d 100644
--- a/tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html
+++ b/tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html
@@ -4,18 +4,53 @@
 <title>Activate editable combobox in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-16-activate-combobox-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "activate combobox",
+  "specific_user_instruction": "Activate the 'State' combobox",
+  "output_assertions": [
+    [
+      "1",
+      "The screen reader switches to mode that allows text input"
+    ]
+  ]
+};
+    const commandJson = {
+  "activate combobox": {
+    "reading": {
+      "jaws": [ [ "ENTER" ] ],
+      "nvda": [ [ "ENTER" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html b/tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html
index 8ff05d5d9..de9307a80 100644
--- a/tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html
@@ -4,18 +4,62 @@
 <title>Open combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-17-open-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; ensure it is empty and collapsed.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "open combobox",
+  "specific_user_instruction": "Display the popup from empty combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Expanded state of combobox is conveyed"
+    ],
+    [
+      "2",
+      "Name 'States' is conveyed for the popup."
+    ],
+    [
+      "2",
+      "Number of options available is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "open combobox": {
+    "interaction": {
+      "jaws": [ [ "ALT_DOWN" ] ],
+      "nvda": [ [ "ALT_DOWN" ] ],
+      "voiceover_macos": [ [ "ALT_DOWN" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html b/tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html
index 1b5160a11..42d0d149a 100644
--- a/tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html
@@ -4,18 +4,57 @@
 <title>Close combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyExpanded: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' to 'Alabama'
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-18-close-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; ensure it is empty and expanded.",
+  "setupTestPage": "comboboxFocusEmptyExpanded",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "close combobox",
+  "specific_user_instruction": "Collapse the combobox popup",
+  "output_assertions": [
+    [
+      "1",
+      "Collapsed state of combobox is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "close combobox": {
+    "interaction": {
+      "jaws": [ [ "ESC" ] ],
+      "nvda": [ [ "ESC" ] ],
+      "voiceover_macos": [ [ "ESC" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html b/tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html
index d8f192538..37b1dd66f 100644
--- a/tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html
+++ b/tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html
@@ -4,18 +4,61 @@
 <title>Open combobox with 'States' button in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-19-activate-states-button-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "activate states button",
+  "specific_user_instruction": "Activate the button that displays the list of states.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "activate states button": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [ [ "CTRL_OPT_SPACE" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html b/tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html
index d4517d73d..db8dbe147 100644
--- a/tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html
+++ b/tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html
@@ -4,18 +4,60 @@
 <title>Open combobox with 'States' button</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-20-activate-states-button-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "activate states button",
+  "specific_user_instruction": "Activate the button that displays the list of states.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "expanded state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "activate states button": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [ [ "CTRL_OPT_SPACE" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html b/tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html
index 923b7c0ac..653c964a9 100644
--- a/tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html
+++ b/tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html
@@ -4,18 +4,57 @@
 <title>Close combobox with 'States' button in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		buttonFocusEmptyExpanded: function(testPageDocument){
+			// Set focus on button
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.buttonNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-21-activate-states-button-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on 'States' button; Ensure combobox is expanded.",
+  "setupTestPage": "buttonFocusEmptyExpanded",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "activate states button",
+  "specific_user_instruction": "Activate the button that hides the list of states.",
+  "output_assertions": [
+    [
+      "1",
+      "Collapsed state is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "activate states button": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [ [ "CTRL_OPT_SPACE" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html b/tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html
index 7e3b956df..1d833426f 100644
--- a/tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html
+++ b/tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html
@@ -4,18 +4,57 @@
 <title>Close combobox with 'States' button in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		buttonFocusEmptyExpanded: function(testPageDocument){
+			// Set focus on button
+			// Ensure in expanded state.
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.buttonNode.focus();
+			cb.filter = cb.comboboxNode.value;
+			cb.filterOptions();
+			cb.open();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-22-activate-states-button-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on 'States' button; Ensure combobox is expanded.",
+  "setupTestPage": "buttonFocusEmptyExpanded",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "activate states button",
+  "specific_user_instruction": "Activate the button that hides the list of states.",
+  "output_assertions": [
+    [
+      "1",
+      "Collapsed state is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "activate states button": {
+    "reading": {
+      "jaws": [ [ "ENTER" ], [ "SPACE" ] ],
+      "nvda": [ [ "ENTER" ], [ "SPACE" ] ]
+    },
+    "interaction": {
+      "voiceover_macos": [ [ "CTRL_OPT_SPACE" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html b/tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html
index dde44228a..abd26e8ef 100644
--- a/tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html
@@ -4,18 +4,66 @@
 <title>Navigate into popup from empty combobox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-23-navigate-into-popup-from-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; ensure it is empty.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate into popup from combobox",
+  "specific_user_instruction": "Navigate into the popup from the empty combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'listbox' is conveyed for the popup."
+    ],
+    [
+      "2",
+      "Name 'States' is conveyed for the popup."
+    ],
+    [
+      "1",
+      "Name of focused option is conveyed; e.g.; 'Alabama' if first option; 'Wyoming' if last option."
+    ],
+    [
+      "1",
+      "Position in set of the focused option is conveyed; e.g.; 1 of 56 if first option; 56 of 56 if last option."
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate into popup from combobox": {
+    "interaction": {
+      "jaws": [ [ "DOWN" ], [ "UP" ] ],
+      "nvda": [ [ "DOWN" ], [ "UP" ] ],
+      "voiceover_macos": [ [ "DOWN" ], [ "UP" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html b/tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html
index 79ac578dd..3c9408685 100644
--- a/tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html
@@ -4,18 +4,66 @@
 <title>Type portion of valid value in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-24-type-in-empty-combobox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; ensure it is empty.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "type in empty combobox",
+  "specific_user_instruction": "Type 'a' in the empty combobox",
+  "output_assertions": [
+    [
+      "1",
+      "Either 1) The selected text 'labama' is conveyed or 2) The entire value 'Alabama' is conveyed."
+    ],
+    [
+      "1",
+      "The selected state of of the value option 'Alabama' is conveyed."
+    ],
+    [
+      "1",
+      "The combobox state change from collapsed to expanded is conveyed"
+    ],
+    [
+      "2",
+      "The position in set of the selected option is conveyed; e.g.; 1 of 4 suggestions."
+    ]
+  ]
+};
+    const commandJson = {
+  "type in empty combobox": {
+    "interaction": {
+      "jaws": [ [ "A" ] ],
+      "nvda": [ [ "A" ] ],
+      "voiceover_macos": [ [ "A" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html b/tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html
index 227146927..2849e7f19 100644
--- a/tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html
+++ b/tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html
@@ -4,18 +4,62 @@
 <title>Navigate options in popup in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-25-navigate-listbox-popup-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; press down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate listbox popup",
+  "specific_user_instruction": "Navigate through options in the popup listbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name of the focused option is conveyed; e.g.; 'American Samoa'"
+    ],
+    [
+      "2",
+      "Role listbox or role option is conveyed"
+    ],
+    [
+      "2",
+      "The position in set of the focused option is conveyed; e.g.; 3 of 56"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate listbox popup": {
+    "interaction": {
+      "jaws": [ [ "DOWN" ], [ "UP" ] ],
+      "nvda": [ [ "DOWN" ], [ "UP" ] ],
+      "voiceover_macos": [ [ "DOWN" ], [ "UP" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html b/tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html
index 578959105..beae1aba1 100644
--- a/tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html
+++ b/tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html
@@ -4,18 +4,66 @@
 <title>Read popup item in reading mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-26-read-option-in-listbox-popup-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; press down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read option in listbox popup",
+  "specific_user_instruction": "With focus on an item in the popup listbox; read the item.",
+  "output_assertions": [
+    [
+      "1",
+      "Name of focused option is conveyed; e.g.; 'Alaska'"
+    ],
+    [
+      "2",
+      "Role listbox or role option is conveyed"
+    ],
+    [
+      "2",
+      "The position in set of the focused option is conveyed; e.g.; 2 of 56"
+    ]
+  ]
+};
+    const commandJson = {
+  "read option in listbox popup": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html b/tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html
index 22a85f08a..49738bc5c 100644
--- a/tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html
+++ b/tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html
@@ -4,18 +4,66 @@
 <title>Read popup item in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-27-read-option-in-listbox-popup-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; press down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read option in listbox popup",
+  "specific_user_instruction": "With focus on an item in the popup listbox; read the item.",
+  "output_assertions": [
+    [
+      "1",
+      "Name of focused option is conveyed; e.g.; 'Alaska'"
+    ],
+    [
+      "2",
+      "Role listbox or role option is conveyed"
+    ],
+    [
+      "2",
+      "The position in set of the focused option is conveyed; e.g.; 2 of 56"
+    ]
+  ]
+};
+    const commandJson = {
+  "read option in listbox popup": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [ [ "INS_TAB" ] ],
+      "voiceover_macos": [ [ "CTRL_OPT_F4" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html b/tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html
index 40baeb6b1..1e3abfce1 100644
--- a/tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html
+++ b/tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html
@@ -4,18 +4,70 @@
 <title>Activate option in popup in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-28-choose-combobox-option-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; press down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "choose combobox option",
+  "specific_user_instruction": "Choose 'Alaska' from the listbox.",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'Alaska' is conveyed."
+    ],
+    [
+      "1",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "choose combobox option": {
+    "interaction": {
+      "jaws": [ [ "ENTER" ] ],
+      "nvda": [ [ "ENTER" ] ],
+      "voiceover_macos": [ [ "ENTER" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html b/tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html
index 45e454f21..9266622ec 100644
--- a/tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html
+++ b/tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html
@@ -4,18 +4,70 @@
 <title>Cancel option selection in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-29-cancel-selection-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; type 'A'; down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "cancel selection",
+  "specific_user_instruction": "Collapse the combobox popup",
+  "output_assertions": [
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "1",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "1",
+      "Ability to enter text is conveyed"
+    ],
+    [
+      "1",
+      "Value 'A' is conveyed."
+    ],
+    [
+      "1",
+      "Collapsed state is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "cancel selection": {
+    "interaction": {
+      "jaws": [ [ "ESC" ] ],
+      "nvda": [ [ "ESC" ] ],
+      "voiceover_macos": [ [ "ESC" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html b/tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html
index 3c3dae29c..debf1ae67 100644
--- a/tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html
+++ b/tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html
@@ -4,18 +4,85 @@
 <title>Initiate caret movement from listbox in interaction mode</title>
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/combobox/combobox-autocomplete-both.html">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		comboboxFocusEmptyCollapsed: function(testPageDocument){
+			// Set focus on combobox
+			// Set value of 'combobox' is empty
+			// Ensure in collapsed state
+			var cb = testPageDocument.comboboxAutocomplete;
+			cb.comboboxNode.value = '';
+			cb.combobox.focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-30-initiate-caret-movement-from-listbox-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "Set focus on combobox; press down arrow 2 times.",
+  "setupTestPage": "comboboxFocusEmptyCollapsed",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "initiate caret movement from listbox",
+  "specific_user_instruction": "Start caret movement in the textbox while focus is in the listbox",
+  "output_assertions": [
+    [
+      "1",
+      "Caret position is conveyed"
+    ],
+    [
+      "1",
+      "Role 'combobox' is conveyed"
+    ],
+    [
+      "2",
+      "Name 'State' is conveyed"
+    ],
+    [
+      "2",
+      "Value 'Alaska' is conveyed."
+    ]
+  ]
+};
+    const commandJson = {
+  "initiate caret movement from listbox": {
+    "interaction": {
+      "jaws": [
+        [ "LEFT" ],
+        [ "RIGHT" ],
+        [ "HOME" ],
+        [ "END" ],
+        [ "CMD_LEFT", "(Mac)" ],
+        [ "CMD_RIGHT", "(Mac)" ]
+      ],
+      "nvda": [
+        [ "LEFT" ],
+        [ "RIGHT" ],
+        [ "HOME" ],
+        [ "END" ],
+        [ "CMD_LEFT", "(Mac)" ],
+        [ "CMD_RIGHT", "(Mac)" ]
+      ],
+      "voiceover_macos": [
+        [ "LEFT" ],
+        [ "RIGHT" ],
+        [ "CMD_LEFT", "(Mac)" ],
+        [ "CMD_RIGHT", "(Mac)" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/combobox-autocomplete-both.html");
   });
 </script>
diff --git a/tests/menubar-editor/scripts.js b/tests/menubar-editor/scripts.js
deleted file mode 100644
index 289aae4c0..000000000
--- a/tests/menubar-editor/scripts.js
+++ /dev/null
@@ -1,150 +0,0 @@
-var scripts = {
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusontextalign: function(testPageDocument){
-	// Move focus to the "Text Align" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
-},
-	focusontextalign: function(testPageDocument){
-	// Move focus to the "Text Align" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
-},
-	focusontextalign: function(testPageDocument){
-	// Move focus to the "Text Align" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
-},
-	focusontextalign: function(testPageDocument){
-	// Move focus to the "Text Align" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonfont: function(testPageDocument){
-	// Move focus to the "Font" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonsize: function(testPageDocument){
-	// Move focus to the "Size" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
-},
-	focusonsize: function(testPageDocument){
-	// Move focus to the "Size" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonstylecolor: function(testPageDocument){
-	// Move focus to the "Style/Color" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
-},
-	focusonfirstlink: function(testPageDocument){
-	// Move focus to the link just before the meunbar
-	testPageDocument.querySelector('a').focus();
-},
-	focusonsize: function(testPageDocument){
-	// Move focus to the "Size" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
-},
-	focusonsize: function(testPageDocument){
-	// Move focus to the "Size" menu item
-	testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
-}
-};
\ No newline at end of file
diff --git a/tests/menubar-editor/test-01-navigate-to-menubar-reading.html b/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
index d80870b9b..7b7ce4a47 100644
--- a/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
+++ b/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
@@ -5,18 +5,79 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menubar">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-01-navigate-to-menubar-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to menubar",
+  "specific_user_instruction": "Navigate to the 'Text Formatting' menubar",
+  "output_assertions": [
+    [
+      "1",
+      "The role 'menubar' is conveyed"
+    ],
+    [
+      "1",
+      "The menubar name 'Text Formatting' is conveyed"
+    ],
+    [
+      "1",
+      "The menu item name \"Font\" is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menubar": {
+    "reading": {
+      "jaws": [
+        [ "UP_AND_DOWN" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "UP_AND_DOWN" ],
+        [ "INS_DOWN_OR_CAPS_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ] ],
+      "nvda": [ [ "TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "CTRL_OPT_RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-02-activate-menubar-reading.html b/tests/menubar-editor/test-02-activate-menubar-reading.html
index a1e947c50..407c5f0fe 100644
--- a/tests/menubar-editor/test-02-activate-menubar-reading.html
+++ b/tests/menubar-editor/test-02-activate-menubar-reading.html
@@ -5,18 +5,46 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menubar">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-02-activate-menubar-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "activate menubar",
+  "specific_user_instruction": "Navigate to the 'Font\" menu item in the 'Text Formatting' menubar example with down arrow. | Activate the 'Font' menu",
+  "output_assertions": [
+    [
+      "1",
+      "Change of mode from reading to interaction is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "activate menubar": {
+    "reading": {
+      "jaws": [ [ "SPACE" ], [ "ENTER" ] ],
+      "nvda": [ [ "SPACE" ], [ "ENTER" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-03-tab-to-menubar-reading.html b/tests/menubar-editor/test-03-tab-to-menubar-reading.html
index 0c5780de3..83168b832 100644
--- a/tests/menubar-editor/test-03-tab-to-menubar-reading.html
+++ b/tests/menubar-editor/test-03-tab-to-menubar-reading.html
@@ -5,18 +5,69 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menubar">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-03-tab-to-menubar-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "tab to menubar",
+  "specific_user_instruction": "Navigate to the 'Text Formatting' menubar",
+  "output_assertions": [
+    [
+      "1",
+      "Change of mode from reading to interaction is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menubar' is conveyed"
+    ],
+    [
+      "1",
+      "The menubar name 'Text Formatting' is conveyed"
+    ],
+    [
+      "1",
+      "The menu item name \"Font\" is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "tab to menubar": {
+    "reading": {
+      "jaws": [ [ "TAB" ] ],
+      "nvda": [ [ "TAB" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html b/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
index ac9d0af59..40f7179d3 100644
--- a/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
+++ b/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
@@ -5,18 +5,79 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menubar">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-04-navigate-to-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to menubar",
+  "specific_user_instruction": "Navigate to the 'Text Formatting' menubar",
+  "output_assertions": [
+    [
+      "1",
+      "The role 'menubar' is conveyed"
+    ],
+    [
+      "1",
+      "The menubar name 'Text Formatting' is conveyed"
+    ],
+    [
+      "1",
+      "The menu item name \"Font\" is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menubar": {
+    "reading": {
+      "jaws": [
+        [ "UP_AND_DOWN" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "UP_AND_DOWN" ],
+        [ "INS_DOWN_OR_CAPS_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ] ],
+      "nvda": [ [ "TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "CTRL_OPT_RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html b/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
index 1ea59beb7..b7d5faeb0 100644
--- a/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
+++ b/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
@@ -5,18 +5,78 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menubar">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-05-navigate-to-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to menubar",
+  "specific_user_instruction": "Navigate to the 'Text Formatting' menubar",
+  "output_assertions": [
+    [
+      "1",
+      "The role 'menubar' is conveyed"
+    ],
+    [
+      "1",
+      "The menubar name 'Text Formatting' is conveyed"
+    ],
+    [
+      "1",
+      "The menu item name \"Font\" is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menubar": {
+    "reading": {
+      "jaws": [
+        [ "UP_AND_DOWN" ],
+        [ "F_AND_SHIFT_F" ]
+      ],
+      "nvda": [
+        [ "UP_AND_DOWN" ],
+        [ "INS_DOWN_OR_CAPS_DOWN" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "TAB" ] ],
+      "nvda": [ [ "TAB" ] ],
+      "voiceover_macos": [
+        [ "TAB" ],
+        [ "CTRL_OPT_RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html b/tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html
index 2e00805e0..69d7d2e60 100644
--- a/tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html
+++ b/tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html
@@ -5,18 +5,70 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-06-navigate-to-menuitem-in-menubar-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "navigate to menuitem in menubar",
+  "specific_user_instruction": "Navigate to 'Text Formatting' menu with down arrow| Navigate to 'Style/Color' menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Style/Color' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menuitem' is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "DOWN" ] ],
+      "nvda": [ [ "INS_NUMPAD_6" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "RIGHT" ] ],
+      "nvda": [ [ "RIGHT" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_RIGHT" ],
+        [ "RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
index 093b3daa6..e62261602 100644
--- a/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
@@ -5,18 +5,73 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-07-navigate-to-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to menuitem in menubar",
+  "specific_user_instruction": "Navigate to 'Style/Color' menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Style/Color' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menuitem' is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "DOWN" ] ],
+      "nvda": [ [ "INS_NUMPAD_6" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "RIGHT" ] ],
+      "nvda": [ [ "RIGHT" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_RIGHT" ],
+        [ "RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
index 4c15af328..c3bff7a0c 100644
--- a/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
@@ -5,18 +5,72 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-08-navigate-to-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to menuitem in menubar",
+  "specific_user_instruction": "Navigate to 'Style/Color' menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Style/Color' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menuitem' is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "DOWN" ] ],
+      "nvda": [ [ "INS_NUMPAD_6" ] ]
+    },
+    "interaction": {
+      "jaws": [ [ "RIGHT" ] ],
+      "nvda": [ [ "RIGHT" ] ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_RIGHT" ],
+        [ "RIGHT" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
index d726e5909..4e152da60 100644
--- a/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
@@ -5,18 +5,66 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-09-navigate-to-open-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to open menuitem in menubar",
+  "specific_user_instruction": "Open 'Font' menu with down arrow. | Navigate to 'Style/Color' menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Style/Color' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menuitem' is conveyed"
+    ],
+    [
+      "2",
+      " Open state of the submenu is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to open menuitem in menubar": {
+    "interaction": {
+      "jaws": [ [ "RIGHT" ] ],
+      "nvda": [ [ "RIGHT" ] ],
+      "voiceover_macos": [ [ "RIGHT" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
index 63a4b0d52..8553b4e53 100644
--- a/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
@@ -5,18 +5,65 @@
 <link rel="help" href="https://w3c.github.io/aria-practices/examples/menubar/menubar-2/menubar-2.html">
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-10-navigate-to-open-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to open menuitem in menubar",
+  "specific_user_instruction": "Open 'Font' menu with down arrow. | Navigate to 'Style/Color' menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Style/Color' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menuitem' is conveyed"
+    ],
+    [
+      "2",
+      " Open state of the submenu is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to open menuitem in menubar": {
+    "interaction": {
+      "jaws": [ [ "RIGHT" ] ],
+      "nvda": [ [ "RIGHT" ] ],
+      "voiceover_macos": [ [ "RIGHT" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html b/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
index 13d0fde4b..d55fe0f7a 100644
--- a/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
+++ b/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
@@ -6,18 +6,73 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusontextalign: function(testPageDocument){
+			// Move focus to the "Text Align" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-11-open-submenu-of-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Text Align' menu item",
+  "setupTestPage": "focusontextalign",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "open submenu of menubar",
+  "specific_user_instruction": "Open 'Text Align' submenu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Left' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "open submenu of menubar": {
+    "interaction": {
+      "jaws": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ]
+      ],
+      "nvda": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ]
+      ],
+      "voiceover_macos": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ],
+        [
+          "CTRL_OPT_SPACE_THEN_CTRL_OPT_RIGHT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html b/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
index 86a870fcf..6a52ebf23 100644
--- a/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
+++ b/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
@@ -6,18 +6,72 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusontextalign: function(testPageDocument){
+			// Move focus to the "Text Align" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-12-open-submenu-of-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Text Align' menu item",
+  "setupTestPage": "focusontextalign",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "open submenu of menubar",
+  "specific_user_instruction": "Open 'Text Align' submenu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Left' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "open submenu of menubar": {
+    "interaction": {
+      "jaws": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ]
+      ],
+      "nvda": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ]
+      ],
+      "voiceover_macos": [
+        [ "ENTER" ],
+        [ "SPACE" ],
+        [ "DOWN" ],
+        [
+          "CTRL_OPT_SPACE_THEN_CTRL_OPT_RIGHT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html b/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
index 2b6c6d5c2..c19945b6e 100644
--- a/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
+++ b/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
@@ -6,18 +6,62 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusontextalign: function(testPageDocument){
+			// Move focus to the "Text Align" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-13-close-submenu-of-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Text Align' menu item",
+  "setupTestPage": "focusontextalign",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "close submenu of menubar",
+  "specific_user_instruction": "Open 'Text Align' submenu. | Close the menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Text Align' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar  are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "close submenu of menubar": {
+    "interaction": {
+      "jaws": [ [ "ESC" ] ],
+      "nvda": [ [ "ESC" ] ],
+      "voiceover_macos": [ [ "ESC" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html b/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
index f1f272410..e05d470ed 100644
--- a/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
+++ b/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
@@ -6,18 +6,61 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusontextalign: function(testPageDocument){
+			// Move focus to the "Text Align" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-14-close-submenu-of-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Text Align' menu item",
+  "setupTestPage": "focusontextalign",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "close submenu of menubar",
+  "specific_user_instruction": "Open 'Text Align' submenu. | Close the menu",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Text Align' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar  are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "close submenu of menubar": {
+    "interaction": {
+      "jaws": [ [ "ESC" ] ],
+      "nvda": [ [ "ESC" ] ],
+      "voiceover_macos": [ [ "ESC" ] ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html b/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
index 43e06ff20..917a1fe3b 100644
--- a/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
@@ -6,18 +6,67 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked menuitemradio in submenu",
+  "specific_user_instruction": "Open \"Font\" menu with down arrow. | Navigate to 'Sans-serif' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Sans-serif' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked menuitemradio in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html b/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
index 2e7418a2e..184ba1922 100644
--- a/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
@@ -6,18 +6,66 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked menuitemradio in submenu",
+  "specific_user_instruction": "Open \"Font\" menu with down arrow. | Navigate to 'Sans-serif' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Sans-serif' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked menuitemradio in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html b/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
index d6698a097..8d1c6563c 100644
--- a/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
@@ -6,18 +6,67 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked menuitemradio in submenu",
+  "specific_user_instruction": "Open \"Font\" menu with down arrow. | Navigate to 'Monospace' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Monospace' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked menuitemradio in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html b/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
index de879fe15..d9c8682ac 100644
--- a/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
@@ -6,18 +6,66 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfont: function(testPageDocument){
+			// Move focus to the "Font" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Font' menu item",
+  "setupTestPage": "focusonfont",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked menuitemradio in submenu",
+  "specific_user_instruction": "Open \"Font\" menu with down arrow. | Navigate to 'Monospace' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Monospace' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked menuitemradio in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html b/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
index 466e4b777..018845480 100644
--- a/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
@@ -6,18 +6,71 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked menuitemcheckbox in submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ],
+    [
+      "2",
+      " The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked menuitemcheckbox in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html b/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
index df51863db..94e69cda7 100644
--- a/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
@@ -6,18 +6,70 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to unchecked menuitemcheckbox in submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ],
+    [
+      "2",
+      " The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to unchecked menuitemcheckbox in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html b/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
index e0c8cc0ef..67ad50b96 100644
--- a/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
@@ -6,18 +6,71 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked menuitemcheckbox in submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | \nNavigate to 'Italic' menu item and check it by pressing enter. (the menu will close.) | \nRe-open \"Style/Color\" menu with down arrow. | \nNavigate to 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ],
+    [
+      "2",
+      " The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked menuitemcheckbox in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html b/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
index 4212971b1..ec9325eb4 100644
--- a/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
+++ b/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
@@ -6,18 +6,70 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "navigate to checked menuitemcheckbox in submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | \nNavigate to 'Italic' menu item and check it by pressing enter. (the menu will close.) | \nRe-open \"Style/Color\" menu with down arrow. | \nNavigate to 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu are conveyed"
+    ],
+    [
+      "2",
+      " The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "navigate to checked menuitemcheckbox in submenu": {
+    "interaction": {
+      "jaws": [ [ "UP_AND_DOWN" ] ],
+      "nvda": [ [ "UP_AND_DOWN" ] ],
+      "voiceover_macos": [
+        [ "UP_AND_DOWN" ],
+        [
+          "CTRL_OPT_RIGHT_AND_CTRL_OPT_LEFT"
+        ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html b/tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html
index be5b02300..014057429 100644
--- a/tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html
+++ b/tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html
@@ -8,18 +8,76 @@
 <link rel="help" href="https://w3c.github.io/aria/#aria-haspopup">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-23-read-menuitem-in-menubar-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "",
+  "setupTestPage": "",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read menuitem in menubar",
+  "specific_user_instruction": "Navigate to the 'Text Formatting' menubar. | Navigate to the size menu item in the menubar. | Read 'Size' menu item",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Size' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
index 2ede31d21..1aee8cca8 100644
--- a/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#aria-haspopup">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonsize: function(testPageDocument){
+			// Move focus to the "Size" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-24-read-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Size' menu item",
+  "setupTestPage": "focusonsize",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read menuitem in menubar",
+  "specific_user_instruction": "Read the  'Size' menu item in the menubar",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Size' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html b/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
index c488435f1..0a0df315b 100644
--- a/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
+++ b/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
@@ -8,18 +8,78 @@
 <link rel="help" href="https://w3c.github.io/aria/#aria-haspopup">
 <link rel="help" href="https://w3c.github.io/aria/#aria-expanded">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonsize: function(testPageDocument){
+			// Move focus to the "Size" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-25-read-menuitem-in-menubar-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Size' menu item",
+  "setupTestPage": "focusonsize",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read menuitem in menubar",
+  "specific_user_instruction": "Read the  'Size' menu item in the menubar",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Size' is conveyed"
+    ],
+    [
+      "1",
+      "Availability of a submenu is conveyed"
+    ],
+    [
+      "2",
+      " Closed state of the submenu is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menubar are conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read menuitem in menubar": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html b/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
index 366824b31..c70a82419 100644
--- a/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
+++ b/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read unchecked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Tab to 'Text Formatting' menubar. | Navigate to 'Style/Color' menu item with right arrow. | Open 'Style/Color' menu with down arrow. | Navigate to 'Blue' menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  'Blue' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Blue' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 87a026eaf..9356d8633 100644
--- a/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Blue' menu item radio with down arrow. | Read the  'Blue' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Blue' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 2c826ee51..99cb474d0 100644
--- a/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,78 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Blue' menu item radio with down arrow. | Read the  'Blue' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Blue' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html b/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
index 5096700f2..c7b055380 100644
--- a/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
+++ b/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read checked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Tab to 'Text Formatting' menubar. | Navigate to 'Style/Color' menu item with right arrow. | Open 'Style/Color' menu with down arrow. | Navigate to 'Black' menu item radio with down arrow. | Activate the screen reader reading cursor. | Read the  'Black' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Black' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index b92e01361..c44a4125f 100644
--- a/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read checked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Black' menu item radio with down arrow. | Read the  'Black' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Black' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 550f6c583..b51d13d5d 100644
--- a/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,78 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemradio">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read checked menuitemradio in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Black' menu item radio with down arrow. | Read the  'Black' menu item radio",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Black' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item radio' is conveyed"
+    ],
+    [
+      "1",
+      "The checked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Text Color' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Text Color' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemradio in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html b/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
index 5e13c649b..ceaeefe89 100644
--- a/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
+++ b/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read unchecked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Tab to 'Text Formatting' menubar. | Navigate to 'Style/Color' menu item with right arrow. | Open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item checkbox with down arrow. | Activate the screen reader reading cursor. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 92fe2d65e..9d874a63d 100644
--- a/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Italic' menu item checkbox with down arrow. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index fc5cb0733..38202481a 100644
--- a/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,78 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read unchecked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Open \"Style/Color\" menu with down arrow. | Navigate to 'Italic' menu item checkbox with down arrow. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read unchecked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html b/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
index be566e253..a87c6d395 100644
--- a/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
+++ b/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read checked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Tab to 'Text Formatting' menubar. | Navigate to 'Style/Color' menu item with right arrow. | Open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item checkbox and check it by pressing enter. (the menu will close.) | Re-open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item checkbox. | Activate the screen reader reading cursor. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index fd832d96f..5fc0c919e 100644
--- a/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,79 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read checked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item and check it by pressing enter. (the menu will close.) | Re-open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 7e4a02892..965dae414 100644
--- a/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -8,18 +8,78 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitemcheckbox">
 <link rel="help" href="https://w3c.github.io/aria/#aria-checked">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonstylecolor: function(testPageDocument){
+			// Move focus to the "Style/Color" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Style/Color' menu item",
+  "setupTestPage": "focusonstylecolor",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read checked menuitemcheckbox in a group in a submenu",
+  "specific_user_instruction": "Open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item and check it by pressing enter. (the menu will close.) | Re-open 'Style/Color' menu with down arrow. | Navigate to 'Italic' menu item. | Read the 'Italic' menu item checkbox",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Italic' is conveyed"
+    ],
+    [
+      "1",
+      "The role 'menu item checkbox' is conveyed"
+    ],
+    [
+      "1",
+      "The unchecked state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the 'Font Style ' group are conveyed"
+    ],
+    [
+      "1",
+      "The name and role of the 'Font Style' group are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read checked menuitemcheckbox in a group in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html b/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
index 7b05199bb..37cee9705 100644
--- a/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
+++ b/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
@@ -8,18 +8,75 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-disabled">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonfirstlink: function(testPageDocument){
+			// Move focus to the link just before the meunbar
+			testPageDocument.querySelector('a').focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-38-read-disabled-menuitem-in-a-submenu-reading.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on a link just before the menubar",
+  "setupTestPage": "focusonfirstlink",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "reading",
+  "task": "read disabled menuitem in a submenu",
+  "specific_user_instruction": "Tab to 'Text Formatting' menubar. | Navigate to 'Size' menu item with right arrow. | Open 'Size' menu with  down arrow. | Navigate to 'X-Small' with down arrow. | Activate 'X-Small'. with Enter. | Open 'Size' menu with down arrow. | Activate the screen reader reading cursor. | Read the 'Smaller' menu item",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Smaller' is conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ],
+    [
+      "1",
+      "The disabled state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu  are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read disabled menuitem in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html b/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
index 6f89a2ace..de49d2a16 100644
--- a/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
@@ -8,18 +8,75 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-disabled">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonsize: function(testPageDocument){
+			// Move focus to the "Size" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-39-read-disabled-menuitem-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Size' menu item",
+  "setupTestPage": "focusonsize",
+  "applies_to": [
+    "jaws",
+    "nvda"
+  ],
+  "mode": "interaction",
+  "task": "read disabled menuitem in a submenu",
+  "specific_user_instruction": "Open 'Size' menu with  down arrow. | Navigate to 'X-Small' with down arrow. | Activate 'X-Small'. with Enter. | Open 'Size' menu with down arrow. | Read the 'Smaller' menu item",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Smaller' is conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ],
+    [
+      "1",
+      "The disabled state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu  are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read disabled menuitem in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>
diff --git a/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html b/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
index b1bab7b84..ca0678c65 100644
--- a/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
+++ b/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
@@ -8,18 +8,74 @@
 <link rel="help" href="https://w3c.github.io/aria/#menuitem">
 <link rel="help" href="https://w3c.github.io/aria/#aria-disabled">
 
-<script src="scripts.js"></script>
+<script>
+  var scripts = {
+		focusonsize: function(testPageDocument){
+			// Move focus to the "Size" menu item
+			testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
+		}
+	};
+</script>
 <script type="module">
   import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
 
-  Promise.all(["test-40-read-disabled-menuitem-in-a-submenu-interaction.json", '../support.json', 'commands.json'].map(url =>
-    fetch(url)
-      .then(response => response.json()) // parse the JSON from the server
-  ))
-  .then(data => {
-    // do something with the data
-    initialize(data[1], data[2]);
-    verifyATBehavior(data[0]);
+  new Promise((resolve) => {
+    fetch('../support.json')
+      .then(response => resolve(response.json()))
+    })
+  .then(supportJson => {
+    const testJson = {
+  "setup_script_description": "sets focus on the 'Size' menu item",
+  "setupTestPage": "focusonsize",
+  "applies_to": [
+    "voiceover_macos"
+  ],
+  "mode": "interaction",
+  "task": "read disabled menuitem in a submenu",
+  "specific_user_instruction": "Open 'Size' menu with  down arrow. | Navigate to 'X-Small' with down arrow. | Activate 'X-Small'. with Enter. | Open 'Size' menu with down arrow. | Read the 'Smaller' menu item",
+  "output_assertions": [
+    [
+      "1",
+      "The name 'Smaller' is conveyed"
+    ],
+    [
+      "2",
+      " The role 'menu item' is conveyed"
+    ],
+    [
+      "1",
+      "The disabled state is conveyed"
+    ],
+    [
+      "2",
+      " The position of the item and number of items in the menu  are conveyed"
+    ]
+  ]
+};
+    const commandJson = {
+  "read disabled menuitem in a submenu": {
+    "reading": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ]
+    },
+    "interaction": {
+      "jaws": [ [ "INS_TAB" ], [ "INS_UP" ] ],
+      "nvda": [
+        [ "INS_TAB" ],
+        [ "INS_NUMPAD_5" ]
+      ],
+      "voiceover_macos": [
+        [ "CTRL_OPT_F3" ],
+        [ "CTRL_OPT_F4" ]
+      ]
+    }
+  }
+};
+    initialize(supportJson, commandJson);
+    verifyATBehavior(testJson);
     displayTestPageAndInstructions("reference/menubar-editor.html");
   });
 </script>