From 795955fa8c452de22ee4f8b8b1cb4e5a7db994c9 Mon Sep 17 00:00:00 2001
From: mzgoddard <mzgoddard@users.noreply.github.com>
Date: Tue, 28 Sep 2021 15:05:22 +0000
Subject: [PATCH] Generate test and review files automatically

---
 build/index.html                              |  32 +--
 build/review/checkbox-tri-state.html          | 109 ++++-----
 build/review/checkbox.html                    | 113 ++++------
 .../combobox-autocomplete-both-updated.html   | 213 ++++++++----------
 build/review/combobox-select-only.html        | 137 +++++------
 build/review/command-button.html              |  79 +++----
 build/review/disclosure-faq.html              | 113 ++++------
 build/review/disclosure-navigation.html       | 157 ++++++-------
 ...menu-button-actions-active-descendant.html | 113 ++++------
 build/review/menu-button-actions.html         | 113 ++++------
 build/review/menubar-editor.html              | 141 ++++++------
 build/review/minimal-data-grid.html           | 171 +++++++-------
 build/review/modal-dialog.html                | 119 +++++-----
 .../radiogroup-aria-activedescendant.html     | 139 ++++++------
 build/review/radiogroup-roving-tabindex.html  | 139 ++++++------
 build/review/tabs-manual-activation.html      | 119 +++++-----
 build/review/toggle-button.html               | 109 ++++-----
 ...tri-state.moveFocusAfterFirstCheckbox.html | 104 +++++++++
 ...ri-state.moveFocusBeforeFirstCheckbox.html | 104 +++++++++
 ...te.moveFocusToAndUncheckFirstCheckbox.html | 106 +++++++++
 ...ox-tri-state.moveFocusToFirstCheckbox.html | 104 +++++++++
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...to-partially-checked-checkbox-reading.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...to-partially-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...te-partially-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...te-unchecked-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...nchecked-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...nchecked-checked-checkbox-interaction.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...ad-partially-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...artially-checked-checkbox-interaction.html |   2 +-
 ...checkbox-group-reading-jaws.collected.json |   2 +-
 ...checkbox-group-reading-nvda.collected.json |   2 +-
 .../test-16-read-checkbox-group-reading.html  |   2 +-
 ...kbox-group-interaction-jaws.collected.json |   2 +-
 ...kbox-group-interaction-nvda.collected.json |   2 +-
 ...st-17-read-checkbox-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...st-18-read-checkbox-group-interaction.html |   2 +-
 ...checkbox-group-reading-jaws.collected.json |   2 +-
 ...checkbox-group-reading-nvda.collected.json |   2 +-
 ...-forwards-into-checkbox-group-reading.html |   2 +-
 ...checkbox-group-reading-jaws.collected.json |   2 +-
 ...checkbox-group-reading-nvda.collected.json |   2 +-
 ...ckwards-out-of-checkbox-group-reading.html |   2 +-
 ...kbox-group-interaction-jaws.collected.json |   2 +-
 ...kbox-group-interaction-nvda.collected.json |   2 +-
 ...wards-into-checkbox-group-interaction.html |   2 +-
 ...kbox-group-interaction-jaws.collected.json |   2 +-
 ...kbox-group-interaction-nvda.collected.json |   2 +-
 ...rds-out-of-checkbox-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...wards-into-checkbox-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...rds-out-of-checkbox-group-interaction.html |   2 +-
 .../checkbox-1.checkFirstCheckbox.html        |  69 ++++++
 ...kbox-1.moveFocusAndCheckFirstCheckbox.html |  71 ++++++
 .../checkbox-1.moveFocusToFirstCheckbox.html  |  69 ++++++
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...-navigate-to-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...igate-to-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...igate-to-checked-checkbox-interaction.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...st-10-read-unchecked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...1-read-unchecked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...2-read-unchecked-checkbox-interaction.html |   2 +-
 ...ecked-checkbox-reading-jaws.collected.json |   2 +-
 ...ecked-checkbox-reading-nvda.collected.json |   2 +-
 ...test-13-read-checked-checkbox-reading.html |   2 +-
 ...d-checkbox-interaction-jaws.collected.json |   2 +-
 ...d-checkbox-interaction-nvda.collected.json |   2 +-
 ...-14-read-checked-checkbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-15-read-checked-checkbox-interaction.html |   2 +-
 ...ocomplete-both.moveFocusAfterCombobox.html | 135 +++++++++++
 ...ocusAfterComboboxAndSetValueToAlabama.html | 136 +++++++++++
 ...complete-both.moveFocusBeforeCombobox.html | 134 +++++++++++
 ...cusBeforeComboboxAndSetValueToAlabama.html | 135 +++++++++++
 ...lete-both.moveFocusToAlabamaInListbox.html | 138 ++++++++++++
 ...InListboxAndSetInputCursorAtBeginning.html | 139 ++++++++++++
 ...labamaInListboxAndSetInputCursorAtEnd.html | 143 ++++++++++++
 ...plete-both.moveFocusToAlaskaInListbox.html | 138 ++++++++++++
 ...ete-both.moveFocusToAndExpandCombobox.html | 135 +++++++++++
 ...ocusToAndExpandComboboxAndSetValueToA.html | 137 +++++++++++
 ...AndSetValueToAWithInputTextDeselected.html | 136 +++++++++++
 ...AndExpandComboboxAndSetValueToAlabama.html | 137 +++++++++++
 ...autocomplete-both.moveFocusToCombobox.html | 134 +++++++++++
 ...oth.moveFocusToComboboxAndSetValueToA.html | 136 +++++++++++
 ...veFocusToComboboxAndSetValueToAlabama.html | 136 +++++++++++
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...s-to-empty-collapsed-combobox-reading.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...s-to-empty-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...bout-empty-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...-filled-in-collapsed-combobox-reading.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...-filled-in-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...-filled-in-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...open-empty-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-empty-collapsed-combobox-interaction.html |   2 +-
 ...apsed-combobox-reading-jaws.collected.json |   2 +-
 ...apsed-combobox-reading-nvda.collected.json |   2 +-
 ...-filled-in-collapsed-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...led-in-collapsed-combobox-interaction.html |   2 +-
 ...-character-interaction-jaws.collected.json |   2 +-
 ...-character-interaction-nvda.collected.json |   2 +-
 ...bobox-by-typing-character-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...bobox-by-typing-character-interaction.html |   2 +-
 ...-character-interaction-jaws.collected.json |   2 +-
 ...-character-interaction-nvda.collected.json |   2 +-
 ...bobox-by-typing-character-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...bobox-by-typing-character-interaction.html |   2 +-
 ...anded-combobox-reading-jaws.collected.json |   2 +-
 ...anded-combobox-reading-nvda.collected.json |   2 +-
 ...about-empty-expanded-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...t-empty-expanded-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-empty-expanded-combobox-interaction.html |   2 +-
 ...anded-combobox-reading-jaws.collected.json |   2 +-
 ...anded-combobox-reading-nvda.collected.json |   2 +-
 ...t-filled-in-expanded-combobox-reading.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...lled-in-expanded-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...lled-in-expanded-combobox-interaction.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...n-empty-expanded-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...n-empty-expanded-combobox-interaction.html |   2 +-
 ...d-combobox-interaction-jaws.collected.json |   2 +-
 ...d-combobox-interaction-nvda.collected.json |   2 +-
 ...lled-in-expanded-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...lled-in-expanded-combobox-interaction.html |   2 +-
 ...empty-combobox-reading-jaws.collected.json |   2 +-
 ...empty-combobox-reading-nvda.collected.json |   2 +-
 .../test-39-close-empty-combobox-reading.html |   2 +-
 ...y-combobox-interaction-jaws.collected.json |   2 +-
 ...y-combobox-interaction-nvda.collected.json |   2 +-
 ...t-40-close-empty-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-41-close-empty-combobox-interaction.html |   2 +-
 ...ed-in-combobox-reading-jaws.collected.json |   2 +-
 ...ed-in-combobox-reading-nvda.collected.json |   2 +-
 ...t-42-close-filled-in-combobox-reading.html |   2 +-
 ...n-combobox-interaction-jaws.collected.json |   2 +-
 ...n-combobox-interaction-nvda.collected.json |   2 +-
 ...-close-filled-in-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-close-filled-in-combobox-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...s-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...s-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...ation-about-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ion-about-a-listbox-popup-interaction.html |   2 +-
 ...r-to-right-interaction-jaws.collected.json |   2 +-
 ...r-to-right-interaction-nvda.collected.json |   2 +-
 ...g-editing-cursor-to-right-interaction.html |   2 +-
 ...or-to-left-interaction-jaws.collected.json |   2 +-
 ...or-to-left-interaction-nvda.collected.json |   2 +-
 ...ng-editing-cursor-to-left-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...g-editing-cursor-to-right-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ng-editing-cursor-to-left-interaction.html |   2 +-
 ...of-textbox-interaction-jaws.collected.json |   2 +-
 ...of-textbox-interaction-nvda.collected.json |   2 +-
 ...-cursor-to-end-of-textbox-interaction.html |   2 +-
 ...of-textbox-interaction-jaws.collected.json |   2 +-
 ...of-textbox-interaction-nvda.collected.json |   2 +-
 ...r-to-beginning-of-textbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-cursor-to-end-of-textbox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...r-to-beginning-of-textbox-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...ox-select-only.moveFocusAfterCombobox.html |  74 ++++++
 ...x-select-only.moveFocusBeforeCombobox.html |  74 ++++++
 ...bobox-select-only.moveFocusToCombobox.html |  74 ++++++
 .../combobox-select-only.openListbox.html     |  75 ++++++
 ...mbobox-select-only.openListboxToApple.html |  76 +++++++
 ...mbobox-select-only.openListboxToGuava.html |  76 +++++++
 ...-select-only.openListboxToHuckleberry.html |  76 +++++++
 ...-only-combobox-reading-jaws.collected.json |   2 +-
 ...-only-combobox-reading-nvda.collected.json |   2 +-
 ...ollapsed-select-only-combobox-reading.html |   2 +-
 ...-only-combobox-reading-jaws.collected.json |   2 +-
 ...-only-combobox-reading-nvda.collected.json |   2 +-
 ...ollapsed-select-only-combobox-reading.html |   2 +-
 ...y-combobox-interaction-jaws.collected.json |   2 +-
 ...y-combobox-interaction-nvda.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...y-combobox-interaction-jaws.collected.json |   2 +-
 ...y-combobox-interaction-nvda.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...-only-combobox-reading-jaws.collected.json |   2 +-
 ...-only-combobox-reading-nvda.collected.json |   2 +-
 ...ollapsed-select-only-combobox-reading.html |   2 +-
 ...y-combobox-interaction-jaws.collected.json |   2 +-
 ...y-combobox-interaction-nvda.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...-only-combobox-reading-jaws.collected.json |   2 +-
 ...-only-combobox-reading-nvda.collected.json |   2 +-
 ...ollapsed-select-only-combobox-reading.html |   2 +-
 ...y-combobox-interaction-jaws.collected.json |   2 +-
 ...y-combobox-interaction-nvda.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...psed-select-only-combobox-interaction.html |   2 +-
 ...rst-option-interaction-jaws.collected.json |   2 +-
 ...rst-option-interaction-nvda.collected.json |   2 +-
 ...-combobox-to-first-option-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-combobox-to-first-option-interaction.html |   2 +-
 ...fic-option-interaction-jaws.collected.json |   2 +-
 ...fic-option-interaction-nvda.collected.json |   2 +-
 ...mbobox-to-specific-option-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...mbobox-to-specific-option-interaction.html |   2 +-
 ...ast-option-interaction-jaws.collected.json |   2 +-
 ...ast-option-interaction-nvda.collected.json |   2 +-
 ...y-combobox-to-last-option-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...y-combobox-to-last-option-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...ation-about-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ation-about-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...o-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...o-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...o-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...o-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...c-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...c-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...-options-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...-options-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-options-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-options-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-option-in-listbox-popup-interaction.html |   2 +-
 ...tbox-popup-interaction-jaws.collected.json |   2 +-
 ...tbox-popup-interaction-nvda.collected.json |   2 +-
 ...st-37-close-listbox-popup-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...st-38-close-listbox-popup-interaction.html |   2 +-
 .../button.setFocusAfterButton.html           |  59 +++++
 .../button.setFocusBeforeButton.html          |  59 +++++
 .../button.setFocusOnButton.html              |  59 +++++
 ...ards-to-button-reading-jaws.collected.json |   2 +-
 ...ards-to-button-reading-nvda.collected.json |   2 +-
 ...1-navigate-forwards-to-button-reading.html |   2 +-
 ...ards-to-button-reading-jaws.collected.json |   2 +-
 ...ards-to-button-reading-nvda.collected.json |   2 +-
 ...-navigate-backwards-to-button-reading.html |   2 +-
 ...-to-button-interaction-jaws.collected.json |   2 +-
 ...-to-button-interaction-nvda.collected.json |   2 +-
 ...vigate-forwards-to-button-interaction.html |   2 +-
 ...-to-button-interaction-jaws.collected.json |   2 +-
 ...-to-button-interaction-nvda.collected.json |   2 +-
 ...igate-backwards-to-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...vigate-forwards-to-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...igate-backwards-to-button-interaction.html |   2 +-
 ...n-about-button-reading-jaws.collected.json |   2 +-
 ...n-about-button-reading-nvda.collected.json |   2 +-
 ...read-information-about-button-reading.html |   2 +-
 ...out-button-interaction-jaws.collected.json |   2 +-
 ...out-button-interaction-nvda.collected.json |   2 +-
 ...-information-about-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-information-about-button-interaction.html |   2 +-
 ...oveFocusAfterAndExpandFirstDisclosure.html |  99 ++++++++
 ...ure-faq.moveFocusAfterFirstDisclosure.html |  95 ++++++++
 ...veFocusBeforeAndExpandFirstDisclosure.html |  99 ++++++++
 ...re-faq.moveFocusBeforeFirstDisclosure.html |  95 ++++++++
 ...q.moveFocusToAndExpandFirstDisclosure.html | 101 +++++++++
 ...losure-faq.moveFocusToFirstDisclosure.html |  95 ++++++++
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...o-collapsed-disclosure-button-reading.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...o-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...to-expanded-disclosure-button-reading.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...to-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...t-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...ut-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...e-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...te-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...uestion-answer-reading-jaws.collected.json |   2 +-
 ...uestion-answer-reading-nvda.collected.json |   2 +-
 ...on-to-text-of-question-answer-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...o-text-of-question-answer-interaction.html |   2 +-
 ...veFocusBeforeAndExpandFirstDisclosure.html | 132 +++++++++++
 ...gation.moveFocusBeforeFirstDisclosure.html | 131 +++++++++++
 ...n.moveFocusToAndExpandFirstDisclosure.html | 132 +++++++++++
 ...xpandFirstDisclosureAndSetCurrentPage.html | 133 +++++++++++
 ...navigation.moveFocusToFirstDisclosure.html | 131 +++++++++++
 ...gation.moveFocusToFirstLinkInDropdown.html | 132 +++++++++++
 ...avigation.moveFocusToSecondDisclosure.html | 131 +++++++++++
 ...ation.moveFocusToSecondLinkInDropdown.html | 132 +++++++++++
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...o-collapsed-disclosure-button-reading.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...o-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...to-expanded-disclosure-button-reading.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...to-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...t-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...ut-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...e-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...te-expanded-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...xpanded-disclosure-button-interaction.html |   2 +-
 ...nk-in-dropdown-reading-jaws.collected.json |   2 +-
 ...nk-in-dropdown-reading-nvda.collected.json |   2 +-
 ...re-button-to-link-in-dropdown-reading.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...utton-to-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...utton-to-link-in-dropdown-interaction.html |   2 +-
 ...rent-page-link-reading-jaws.collected.json |   2 +-
 ...rent-page-link-reading-nvda.collected.json |   2 +-
 ...e-button-to-current-page-link-reading.html |   2 +-
 ...-page-link-interaction-jaws.collected.json |   2 +-
 ...-page-link-interaction-nvda.collected.json |   2 +-
 ...tton-to-current-page-link-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...tton-to-current-page-link-interaction.html |   2 +-
 ...closure-button-reading-jaws.collected.json |   2 +-
 ...closure-button-reading-nvda.collected.json |   2 +-
 ...o-collapsed-disclosure-button-reading.html |   2 +-
 ...ure-button-interaction-jaws.collected.json |   2 +-
 ...ure-button-interaction-nvda.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...llapsed-disclosure-button-interaction.html |   2 +-
 ...nk-in-dropdown-reading-jaws.collected.json |   2 +-
 ...nk-in-dropdown-reading-nvda.collected.json |   2 +-
 ...-forwards-to-link-in-dropdown-reading.html |   2 +-
 ...nk-in-dropdown-reading-jaws.collected.json |   2 +-
 ...nk-in-dropdown-reading-nvda.collected.json |   2 +-
 ...backwards-to-link-in-dropdown-reading.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...wards-to-link-in-dropdown-interaction.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...wards-to-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...wards-to-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...wards-to-link-in-dropdown-interaction.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...to-first-link-in-dropdown-interaction.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...-to-last-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-first-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-last-link-in-dropdown-interaction.html |   2 +-
 ...nk-in-dropdown-reading-jaws.collected.json |   2 +-
 ...nk-in-dropdown-reading-nvda.collected.json |   2 +-
 ...-44-activate-link-in-dropdown-reading.html |   2 +-
 ...n-dropdown-interaction-jaws.collected.json |   2 +-
 ...n-dropdown-interaction-nvda.collected.json |   2 +-
 ...activate-link-in-dropdown-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...activate-link-in-dropdown-interaction.html |   2 +-
 ...endant.openMenuAndSetFocusToFirstItem.html |  81 +++++++
 ...cendant.openMenuAndSetFocusToLastItem.html |  81 +++++++
 ...ve-descendant.setFocusAfterMenuButton.html |  80 +++++++
 ...e-descendant.setFocusBeforeMenuButton.html |  80 +++++++
 ...ctive-descendant.setFocusOnMenuButton.html |  80 +++++++
 ...to-menu-button-reading-jaws.collected.json |   2 +-
 ...to-menu-button-reading-nvda.collected.json |   2 +-
 ...igate-forwards-to-menu-button-reading.html |   2 +-
 ...to-menu-button-reading-jaws.collected.json |   2 +-
 ...to-menu-button-reading-nvda.collected.json |   2 +-
 ...gate-backwards-to-menu-button-reading.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...e-forwards-to-menu-button-interaction.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...-backwards-to-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-forwards-to-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-backwards-to-menu-button-interaction.html |   2 +-
 ...ut-menu-button-reading-jaws.collected.json |   2 +-
 ...ut-menu-button-reading-nvda.collected.json |   2 +-
 ...information-about-menu-button-reading.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...rmation-about-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...rmation-about-menu-button-interaction.html |   2 +-
 ...t-10-open-menu-reading-jaws.collected.json |   2 +-
 ...t-10-open-menu-reading-nvda.collected.json |   2 +-
 .../test-10-open-menu-reading.html            |   2 +-
 ...-open-menu-interaction-jaws.collected.json |   2 +-
 ...-open-menu-interaction-nvda.collected.json |   2 +-
 .../test-11-open-menu-interaction.html        |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 .../test-12-open-menu-interaction.html        |   2 +-
 ...-last-item-interaction-jaws.collected.json |   2 +-
 ...-last-item-interaction-nvda.collected.json |   2 +-
 ...13-open-menu-to-last-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...14-open-menu-to-last-item-interaction.html |   2 +-
 ...-menu-item-interaction-jaws.collected.json |   2 +-
 ...-menu-item-interaction-nvda.collected.json |   2 +-
 ...formation-about-menu-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...formation-about-menu-item-interaction.html |   2 +-
 ...em-in-menu-interaction-jaws.collected.json |   2 +-
 ...em-in-menu-interaction-nvda.collected.json |   2 +-
 ...ate-to-first-item-in-menu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-first-item-in-menu-interaction.html |   2 +-
 ...em-in-menu-interaction-jaws.collected.json |   2 +-
 ...em-in-menu-interaction-nvda.collected.json |   2 +-
 ...gate-to-last-item-in-menu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-last-item-in-menu-interaction.html |   2 +-
 ...-character-interaction-jaws.collected.json |   2 +-
 ...-character-interaction-nvda.collected.json |   2 +-
 ...-menu-by-typing-character-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-menu-by-typing-character-interaction.html |   2 +-
 ...-menu-item-interaction-jaws.collected.json |   2 +-
 ...-menu-item-interaction-nvda.collected.json |   2 +-
 ...est-23-activate-menu-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...est-24-activate-menu-item-interaction.html |   2 +-
 ...close-menu-interaction-jaws.collected.json |   2 +-
 ...close-menu-interaction-nvda.collected.json |   2 +-
 .../test-25-close-menu-interaction.html       |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 .../test-26-close-menu-interaction.html       |   2 +-
 ...ctions.openMenuAndSetFocusToFirstItem.html |  78 +++++++
 ...actions.openMenuAndSetFocusToLastItem.html |  78 +++++++
 ...utton-actions.setFocusAfterMenuButton.html |  77 +++++++
 ...tton-actions.setFocusBeforeMenuButton.html |  77 +++++++
 ...u-button-actions.setFocusOnMenuButton.html |  77 +++++++
 ...to-menu-button-reading-jaws.collected.json |   2 +-
 ...to-menu-button-reading-nvda.collected.json |   2 +-
 ...igate-forwards-to-menu-button-reading.html |   2 +-
 ...to-menu-button-reading-jaws.collected.json |   2 +-
 ...to-menu-button-reading-nvda.collected.json |   2 +-
 ...gate-backwards-to-menu-button-reading.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...e-forwards-to-menu-button-interaction.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...-backwards-to-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-forwards-to-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-backwards-to-menu-button-interaction.html |   2 +-
 ...ut-menu-button-reading-jaws.collected.json |   2 +-
 ...ut-menu-button-reading-nvda.collected.json |   2 +-
 ...information-about-menu-button-reading.html |   2 +-
 ...enu-button-interaction-jaws.collected.json |   2 +-
 ...enu-button-interaction-nvda.collected.json |   2 +-
 ...rmation-about-menu-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...rmation-about-menu-button-interaction.html |   2 +-
 ...t-10-open-menu-reading-jaws.collected.json |   2 +-
 ...t-10-open-menu-reading-nvda.collected.json |   2 +-
 .../test-10-open-menu-reading.html            |   2 +-
 ...-open-menu-interaction-jaws.collected.json |   2 +-
 ...-open-menu-interaction-nvda.collected.json |   2 +-
 .../test-11-open-menu-interaction.html        |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 .../test-12-open-menu-interaction.html        |   2 +-
 ...-last-item-interaction-jaws.collected.json |   2 +-
 ...-last-item-interaction-nvda.collected.json |   2 +-
 ...13-open-menu-to-last-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...14-open-menu-to-last-item-interaction.html |   2 +-
 ...-menu-item-interaction-jaws.collected.json |   2 +-
 ...-menu-item-interaction-nvda.collected.json |   2 +-
 ...formation-about-menu-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...formation-about-menu-item-interaction.html |   2 +-
 ...em-in-menu-interaction-jaws.collected.json |   2 +-
 ...em-in-menu-interaction-nvda.collected.json |   2 +-
 ...ate-to-first-item-in-menu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-first-item-in-menu-interaction.html |   2 +-
 ...em-in-menu-interaction-jaws.collected.json |   2 +-
 ...em-in-menu-interaction-nvda.collected.json |   2 +-
 ...gate-to-last-item-in-menu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-last-item-in-menu-interaction.html |   2 +-
 ...-character-interaction-jaws.collected.json |   2 +-
 ...-character-interaction-nvda.collected.json |   2 +-
 ...-menu-by-typing-character-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-menu-by-typing-character-interaction.html |   2 +-
 ...-menu-item-interaction-jaws.collected.json |   2 +-
 ...-menu-item-interaction-nvda.collected.json |   2 +-
 ...est-23-activate-menu-item-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...est-24-activate-menu-item-interaction.html |   2 +-
 ...close-menu-interaction-jaws.collected.json |   2 +-
 ...close-menu-interaction-nvda.collected.json |   2 +-
 .../test-25-close-menu-interaction.html       |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 .../test-26-close-menu-interaction.html       |   2 +-
 .../menubar-editor.focusonfirstlink.html      | 140 ++++++++++++
 .../menubar-editor.focusonfont.html           | 140 ++++++++++++
 .../menubar-editor.focusonsize.html           | 140 ++++++++++++
 .../menubar-editor.focusonstylecolor.html     | 140 ++++++++++++
 .../menubar-editor.focusontextalign.html      | 140 ++++++++++++
 ...ate-to-menubar-reading-jaws.collected.json |   2 +-
 ...ate-to-menubar-reading-nvda.collected.json |   2 +-
 .../test-01-navigate-to-menubar-reading.html  |   2 +-
 ...tab-to-menubar-reading-jaws.collected.json |   2 +-
 ...tab-to-menubar-reading-nvda.collected.json |   2 +-
 .../test-03-tab-to-menubar-reading.html       |   2 +-
 ...to-menubar-interaction-jaws.collected.json |   2 +-
 ...to-menubar-interaction-nvda.collected.json |   2 +-
 ...st-04-navigate-to-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...st-05-navigate-to-menubar-interaction.html |   2 +-
 ...in-menubar-interaction-jaws.collected.json |   2 +-
 ...in-menubar-interaction-nvda.collected.json |   2 +-
 ...te-to-menuitem-in-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...te-to-menuitem-in-menubar-interaction.html |   2 +-
 ...in-menubar-interaction-jaws.collected.json |   2 +-
 ...in-menubar-interaction-nvda.collected.json |   2 +-
 ...-open-menuitem-in-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-open-menuitem-in-menubar-interaction.html |   2 +-
 ...of-menubar-interaction-jaws.collected.json |   2 +-
 ...of-menubar-interaction-nvda.collected.json |   2 +-
 ...1-open-submenu-of-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...2-open-submenu-of-menubar-interaction.html |   2 +-
 ...of-menubar-interaction-jaws.collected.json |   2 +-
 ...of-menubar-interaction-nvda.collected.json |   2 +-
 ...-close-submenu-of-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-close-submenu-of-menubar-interaction.html |   2 +-
 ...in-submenu-interaction-jaws.collected.json |   2 +-
 ...in-submenu-interaction-nvda.collected.json |   2 +-
 ...-menuitemradio-in-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-menuitemradio-in-submenu-interaction.html |   2 +-
 ...in-submenu-interaction-jaws.collected.json |   2 +-
 ...in-submenu-interaction-nvda.collected.json |   2 +-
 ...-menuitemradio-in-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-menuitemradio-in-submenu-interaction.html |   2 +-
 ...in-submenu-interaction-jaws.collected.json |   2 +-
 ...in-submenu-interaction-nvda.collected.json |   2 +-
 ...nuitemcheckbox-in-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...nuitemcheckbox-in-submenu-interaction.html |   2 +-
 ...in-submenu-interaction-jaws.collected.json |   2 +-
 ...in-submenu-interaction-nvda.collected.json |   2 +-
 ...nuitemcheckbox-in-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...nuitemcheckbox-in-submenu-interaction.html |   2 +-
 ...in-menubar-interaction-jaws.collected.json |   2 +-
 ...in-menubar-interaction-nvda.collected.json |   2 +-
 ...-read-menuitem-in-menubar-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-read-menuitem-in-menubar-interaction.html |   2 +-
 ...p-in-a-submenu-reading-jaws.collected.json |   2 +-
 ...p-in-a-submenu-reading-nvda.collected.json |   2 +-
 ...radio-in-a-group-in-a-submenu-reading.html |   2 +-
 ...-a-submenu-interaction-jaws.collected.json |   2 +-
 ...-a-submenu-interaction-nvda.collected.json |   2 +-
 ...o-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...o-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...p-in-a-submenu-reading-jaws.collected.json |   2 +-
 ...p-in-a-submenu-reading-nvda.collected.json |   2 +-
 ...radio-in-a-group-in-a-submenu-reading.html |   2 +-
 ...-a-submenu-interaction-jaws.collected.json |   2 +-
 ...-a-submenu-interaction-nvda.collected.json |   2 +-
 ...o-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...o-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...p-in-a-submenu-reading-jaws.collected.json |   2 +-
 ...p-in-a-submenu-reading-nvda.collected.json |   2 +-
 ...ckbox-in-a-group-in-a-submenu-reading.html |   2 +-
 ...-a-submenu-interaction-jaws.collected.json |   2 +-
 ...-a-submenu-interaction-nvda.collected.json |   2 +-
 ...x-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...x-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...p-in-a-submenu-reading-jaws.collected.json |   2 +-
 ...p-in-a-submenu-reading-nvda.collected.json |   2 +-
 ...ckbox-in-a-group-in-a-submenu-reading.html |   2 +-
 ...-a-submenu-interaction-jaws.collected.json |   2 +-
 ...-a-submenu-interaction-nvda.collected.json |   2 +-
 ...x-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...x-in-a-group-in-a-submenu-interaction.html |   2 +-
 ...m-in-a-submenu-reading-jaws.collected.json |   2 +-
 ...m-in-a-submenu-reading-nvda.collected.json |   2 +-
 ...isabled-menuitem-in-a-submenu-reading.html |   2 +-
 ...-a-submenu-interaction-jaws.collected.json |   2 +-
 ...-a-submenu-interaction-nvda.collected.json |   2 +-
 ...led-menuitem-in-a-submenu-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...led-menuitem-in-a-submenu-interaction.html |   2 +-
 .../dataGrids.setFocusAfterGrid.html          | 128 +++++++++++
 .../dataGrids.setFocusBeforeGrid.html         | 128 +++++++++++
 .../dataGrids.setFocusOnFifthDataCell.html    | 129 +++++++++++
 .../dataGrids.setFocusOnFirstDataCell.html    | 129 +++++++++++
 .../dataGrids.setFocusOnFirstLinkedCell.html  | 129 +++++++++++
 .../dataGrids.setFocusOnFourthDataCell.html   | 129 +++++++++++
 .../dataGrids.setFocusOnLastDataCell.html     | 129 +++++++++++
 .../dataGrids.setFocusOnSecondDataCell.html   | 129 +++++++++++
 .../dataGrids.setFocusOnSecondLinkedCell.html | 129 +++++++++++
 .../dataGrids.setFocusOnSixthDataCell.html    | 129 +++++++++++
 ...rwards-to-grid-reading-jaws.collected.json |   2 +-
 ...rwards-to-grid-reading-nvda.collected.json |   2 +-
 ...-01-navigate-forwards-to-grid-reading.html |   2 +-
 ...kwards-to-grid-reading-jaws.collected.json |   2 +-
 ...kwards-to-grid-reading-nvda.collected.json |   2 +-
 ...02-navigate-backwards-to-grid-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...navigate-forwards-to-grid-interaction.html |   2 +-
 ...to-end-of-grid-reading-jaws.collected.json |   2 +-
 ...to-end-of-grid-reading-nvda.collected.json |   2 +-
 ...-04-navigate-into-end-of-grid-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...navigate-into-end-of-grid-interaction.html |   2 +-
 ...ards-into-grid-reading-jaws.collected.json |   2 +-
 ...ards-into-grid-reading-nvda.collected.json |   2 +-
 ...move-focus-forwards-into-grid-reading.html |   2 +-
 ...ards-into-grid-reading-jaws.collected.json |   2 +-
 ...ards-into-grid-reading-nvda.collected.json |   2 +-
 ...ove-focus-backwards-into-grid-reading.html |   2 +-
 ...-into-grid-interaction-jaws.collected.json |   2 +-
 ...-into-grid-interaction-nvda.collected.json |   2 +-
 ...-focus-forwards-into-grid-interaction.html |   2 +-
 ...-into-grid-interaction-jaws.collected.json |   2 +-
 ...-into-grid-interaction-nvda.collected.json |   2 +-
 ...focus-backwards-into-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-focus-forwards-into-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...focus-backwards-into-grid-interaction.html |   2 +-
 ...bout-grid-cell-reading-jaws.collected.json |   2 +-
 ...bout-grid-cell-reading-nvda.collected.json |   2 +-
 ...d-information-about-grid-cell-reading.html |   2 +-
 ...-grid-cell-interaction-jaws.collected.json |   2 +-
 ...-grid-cell-interaction-nvda.collected.json |   2 +-
 ...formation-about-grid-cell-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...formation-about-grid-cell-interaction.html |   2 +-
 ...ontaining-link-reading-jaws.collected.json |   2 +-
 ...ontaining-link-reading-nvda.collected.json |   2 +-
 ...out-grid-cell-containing-link-reading.html |   2 +-
 ...ining-link-interaction-jaws.collected.json |   2 +-
 ...ining-link-interaction-nvda.collected.json |   2 +-
 ...grid-cell-containing-link-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...grid-cell-containing-link-interaction.html |   2 +-
 ...-colum-in-grid-reading-jaws.collected.json |   2 +-
 ...-colum-in-grid-reading-nvda.collected.json |   2 +-
 ...avigate-to-next-colum-in-grid-reading.html |   2 +-
 ...um-in-grid-interaction-jaws.collected.json |   2 +-
 ...um-in-grid-interaction-nvda.collected.json |   2 +-
 ...ate-to-next-colum-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-next-colum-in-grid-interaction.html |   2 +-
 ...-colum-in-grid-reading-jaws.collected.json |   2 +-
 ...-colum-in-grid-reading-nvda.collected.json |   2 +-
 ...ate-to-previous-colum-in-grid-reading.html |   2 +-
 ...um-in-grid-interaction-jaws.collected.json |   2 +-
 ...um-in-grid-interaction-nvda.collected.json |   2 +-
 ...to-previous-colum-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-previous-colum-in-grid-interaction.html |   2 +-
 ...g-link-in-grid-reading-jaws.collected.json |   2 +-
 ...g-link-in-grid-reading-nvda.collected.json |   2 +-
 ...colum-containing-link-in-grid-reading.html |   2 +-
 ...nk-in-grid-interaction-jaws.collected.json |   2 +-
 ...nk-in-grid-interaction-nvda.collected.json |   2 +-
 ...m-containing-link-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...m-containing-link-in-grid-interaction.html |   2 +-
 ...g-link-in-grid-reading-jaws.collected.json |   2 +-
 ...g-link-in-grid-reading-nvda.collected.json |   2 +-
 ...colum-containing-link-in-grid-reading.html |   2 +-
 ...nk-in-grid-interaction-jaws.collected.json |   2 +-
 ...nk-in-grid-interaction-nvda.collected.json |   2 +-
 ...m-containing-link-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...m-containing-link-in-grid-interaction.html |   2 +-
 ...g-link-in-grid-reading-jaws.collected.json |   2 +-
 ...g-link-in-grid-reading-nvda.collected.json |   2 +-
 ...m-cel-containing-link-in-grid-reading.html |   2 +-
 ...nk-in-grid-interaction-jaws.collected.json |   2 +-
 ...nk-in-grid-interaction-nvda.collected.json |   2 +-
 ...l-containing-link-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...l-containing-link-in-grid-interaction.html |   2 +-
 ...g-link-in-grid-reading-jaws.collected.json |   2 +-
 ...g-link-in-grid-reading-nvda.collected.json |   2 +-
 ...m-cel-containing-link-in-grid-reading.html |   2 +-
 ...nk-in-grid-interaction-jaws.collected.json |   2 +-
 ...nk-in-grid-interaction-nvda.collected.json |   2 +-
 ...l-containing-link-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...l-containing-link-in-grid-interaction.html |   2 +-
 ...xt-row-in-grid-reading-jaws.collected.json |   2 +-
 ...xt-row-in-grid-reading-nvda.collected.json |   2 +-
 ...-navigate-to-next-row-in-grid-reading.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...igate-to-next-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...igate-to-next-row-in-grid-interaction.html |   2 +-
 ...us-row-in-grid-reading-jaws.collected.json |   2 +-
 ...us-row-in-grid-reading-nvda.collected.json |   2 +-
 ...igate-to-previous-row-in-grid-reading.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...e-to-previous-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-to-previous-row-in-grid-interaction.html |   2 +-
 ...xt-row-in-grid-reading-jaws.collected.json |   2 +-
 ...xt-row-in-grid-reading-nvda.collected.json |   2 +-
 ...ning-link-on-next-row-in-grid-reading.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...-link-on-next-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-link-on-next-row-in-grid-interaction.html |   2 +-
 ...us-row-in-grid-reading-jaws.collected.json |   2 +-
 ...us-row-in-grid-reading-nvda.collected.json |   2 +-
 ...-link-on-previous-row-in-grid-reading.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...k-on-previous-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...k-on-previous-row-in-grid-interaction.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...first-cell-of-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...first-cell-of-row-in-grid-interaction.html |   2 +-
 ...ow-in-grid-interaction-jaws.collected.json |   2 +-
 ...ow-in-grid-interaction-nvda.collected.json |   2 +-
 ...-last-cell-of-row-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-last-cell-of-row-in-grid-interaction.html |   2 +-
 ...ll-in-grid-interaction-jaws.collected.json |   2 +-
 ...ll-in-grid-interaction-nvda.collected.json |   2 +-
 ...ate-to-first-cell-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-first-cell-in-grid-interaction.html |   2 +-
 ...ll-in-grid-interaction-jaws.collected.json |   2 +-
 ...ll-in-grid-interaction-nvda.collected.json |   2 +-
 ...gate-to-last-cell-in-grid-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-last-cell-in-grid-interaction.html |   2 +-
 ...g.moveFocusToAddDeliveryAddressButton.html | 194 ++++++++++++++++
 ...eliveryAddressDialogAndFocusAddButton.html | 195 ++++++++++++++++
 ...veryAddressDialogAndFocusCancelButton.html | 195 ++++++++++++++++
 ...liveryAddressDialogAndFocusFirstInput.html | 195 ++++++++++++++++
 ...essAddedDialogAndFocusYourProfileLink.html | 196 ++++++++++++++++
 ...cationResultDialogAndFocusCloseButton.html | 196 ++++++++++++++++
 ...n-modal-dialog-reading-jaws.collected.json |   2 +-
 ...n-modal-dialog-reading-nvda.collected.json |   2 +-
 .../test-01-open-modal-dialog-reading.html    |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...test-02-open-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...test-03-open-modal-dialog-interaction.html |   2 +-
 ...e-modal-dialog-reading-jaws.collected.json |   2 +-
 ...e-modal-dialog-reading-nvda.collected.json |   2 +-
 .../test-04-close-modal-dialog-reading.html   |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...est-05-close-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...est-06-close-modal-dialog-interaction.html |   2 +-
 ...g-using-button-reading-jaws.collected.json |   2 +-
 ...g-using-button-reading-nvda.collected.json |   2 +-
 ...ose-modal-dialog-using-button-reading.html |   2 +-
 ...ing-button-interaction-jaws.collected.json |   2 +-
 ...ing-button-interaction-nvda.collected.json |   2 +-
 ...modal-dialog-using-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...modal-dialog-using-button-interaction.html |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...e-element-in-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-element-in-modal-dialog-interaction.html |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...e-element-in-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-element-in-modal-dialog-interaction.html |   2 +-
 ...f-modal-dialog-reading-jaws.collected.json |   2 +-
 ...f-modal-dialog-reading-nvda.collected.json |   2 +-
 ...-to-beginning-of-modal-dialog-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...beginning-of-modal-dialog-interaction.html |   2 +-
 ...f-modal-dialog-reading-jaws.collected.json |   2 +-
 ...f-modal-dialog-reading-nvda.collected.json |   2 +-
 ...vigate-to-end-of-modal-dialog-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...te-to-end-of-modal-dialog-interaction.html |   2 +-
 ...d-modal-dialog-reading-jaws.collected.json |   2 +-
 ...d-modal-dialog-reading-nvda.collected.json |   2 +-
 ...t-18-open-nested-modal-dialog-reading.html |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...-open-nested-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-open-nested-modal-dialog-interaction.html |   2 +-
 ...d-modal-dialog-reading-jaws.collected.json |   2 +-
 ...d-modal-dialog-reading-nvda.collected.json |   2 +-
 ...-21-close-nested-modal-dialog-reading.html |   2 +-
 ...dal-dialog-interaction-jaws.collected.json |   2 +-
 ...dal-dialog-interaction-nvda.collected.json |   2 +-
 ...close-nested-modal-dialog-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...close-nested-modal-dialog-interaction.html |   2 +-
 ...g-using-button-reading-jaws.collected.json |   2 +-
 ...g-using-button-reading-nvda.collected.json |   2 +-
 ...ted-modal-dialog-using-button-reading.html |   2 +-
 ...ing-button-interaction-jaws.collected.json |   2 +-
 ...ing-button-interaction-nvda.collected.json |   2 +-
 ...modal-dialog-using-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...modal-dialog-using-button-interaction.html |   2 +-
 ...log-using-link-reading-jaws.collected.json |   2 +-
 ...log-using-link-reading-nvda.collected.json |   2 +-
 ...ested-modal-dialog-using-link-reading.html |   2 +-
 ...using-link-interaction-jaws.collected.json |   2 +-
 ...using-link-interaction-nvda.collected.json |   2 +-
 ...d-modal-dialog-using-link-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...d-modal-dialog-using-link-interaction.html |   2 +-
 ...RadioButtonAndSetFocusAfterRadioGroup.html |  87 +++++++
 ...adioButtonAndSetFocusBeforeRadioGroup.html |  88 ++++++++
 ...RadioButtonAndSetFocusAfterRadioGroup.html |  87 +++++++
 ...ivedescendant.setFocusAfterRadioGroup.html |  78 +++++++
 ...vedescendant.setFocusBeforeRadioGroup.html |  79 +++++++
 ...nt.setFocusOnAndCheckFirstRadioButton.html |  87 +++++++
 ...descendant.setFocusOnFirstRadioButton.html |  86 +++++++
 ...escendant.setFocusOnSecondRadioButton.html |  86 +++++++
 ...descendant.setFocusOnThirdRadioButton.html |  86 +++++++
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...of-radio-group-reading-jaws.collected.json |   2 +-
 ...of-radio-group-reading-nvda.collected.json |   2 +-
 ...e-out-of-start-of-radio-group-reading.html |   2 +-
 ...adio-group-interaction-jaws.collected.json |   2 +-
 ...adio-group-interaction-nvda.collected.json |   2 +-
 ...t-of-start-of-radio-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-of-start-of-radio-group-interaction.html |   2 +-
 ...of-radio-group-reading-jaws.collected.json |   2 +-
 ...of-radio-group-reading-nvda.collected.json |   2 +-
 ...ate-out-of-end-of-radio-group-reading.html |   2 +-
 ...adio-group-interaction-jaws.collected.json |   2 +-
 ...adio-group-interaction-nvda.collected.json |   2 +-
 ...out-of-end-of-radio-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...out-of-end-of-radio-group-interaction.html |   2 +-
 ...d-radio-button-reading-jaws.collected.json |   2 +-
 ...d-radio-button-reading-nvda.collected.json |   2 +-
 ...-about-unchecked-radio-button-reading.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...ut-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ut-unchecked-radio-button-interaction.html |   2 +-
 ...d-radio-button-reading-jaws.collected.json |   2 +-
 ...d-radio-button-reading-nvda.collected.json |   2 +-
 ...on-about-checked-radio-button-reading.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...bout-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...bout-checked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...gate-to-next-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-next-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...-to-previous-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-previous-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...ate-to-first-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-first-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...gate-to-last-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-last-radio-button-interaction.html |   2 +-
 ...k-radio-button-reading-jaws.collected.json |   2 +-
 ...k-radio-button-reading-nvda.collected.json |   2 +-
 .../test-37-check-radio-button-reading.html   |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...est-38-check-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...est-39-check-radio-button-interaction.html |   2 +-
 ...RadioButtonAndSetFocusAfterRadioGroup.html |  75 ++++++
 ...adioButtonAndSetFocusBeforeRadioGroup.html |  76 +++++++
 ...RadioButtonAndSetFocusAfterRadioGroup.html |  76 +++++++
 .../radio.setFocusAfterRadioGroup.html        |  68 ++++++
 .../radio.setFocusBeforeRadioGroup.html       |  69 ++++++
 ...io.setFocusOnAndCheckFirstRadioButton.html |  75 ++++++
 .../radio.setFocusOnFirstRadioButton.html     |  74 ++++++
 .../radio.setFocusOnSecondRadioButton.html    |  74 ++++++
 .../radio.setFocusOnThirdRadioButton.html     |  75 ++++++
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...utton-in-group-reading-jaws.collected.json |   2 +-
 ...utton-in-group-reading-nvda.collected.json |   2 +-
 ...checked-radio-button-in-group-reading.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ked-radio-button-in-group-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...to-unchecked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...s-to-checked-radio-button-interaction.html |   2 +-
 ...of-radio-group-reading-jaws.collected.json |   2 +-
 ...of-radio-group-reading-nvda.collected.json |   2 +-
 ...e-out-of-start-of-radio-group-reading.html |   2 +-
 ...adio-group-interaction-jaws.collected.json |   2 +-
 ...adio-group-interaction-nvda.collected.json |   2 +-
 ...t-of-start-of-radio-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...t-of-start-of-radio-group-interaction.html |   2 +-
 ...of-radio-group-reading-jaws.collected.json |   2 +-
 ...of-radio-group-reading-nvda.collected.json |   2 +-
 ...ate-out-of-end-of-radio-group-reading.html |   2 +-
 ...adio-group-interaction-jaws.collected.json |   2 +-
 ...adio-group-interaction-nvda.collected.json |   2 +-
 ...out-of-end-of-radio-group-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...out-of-end-of-radio-group-interaction.html |   2 +-
 ...d-radio-button-reading-jaws.collected.json |   2 +-
 ...d-radio-button-reading-nvda.collected.json |   2 +-
 ...-about-unchecked-radio-button-reading.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...ut-unchecked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ut-unchecked-radio-button-interaction.html |   2 +-
 ...d-radio-button-reading-jaws.collected.json |   2 +-
 ...d-radio-button-reading-nvda.collected.json |   2 +-
 ...on-about-checked-radio-button-reading.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...bout-checked-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...bout-checked-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...gate-to-next-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-next-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...-to-previous-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-previous-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...ate-to-first-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-to-first-radio-button-interaction.html |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...gate-to-last-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-to-last-radio-button-interaction.html |   2 +-
 ...k-radio-button-reading-jaws.collected.json |   2 +-
 ...k-radio-button-reading-nvda.collected.json |   2 +-
 .../test-37-check-radio-button-reading.html   |   2 +-
 ...dio-button-interaction-jaws.collected.json |   2 +-
 ...dio-button-interaction-nvda.collected.json |   2 +-
 ...est-38-check-radio-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...est-39-check-radio-button-interaction.html |   2 +-
 build/tests/resources/aria-at-test-window.mjs |  42 ++--
 build/tests/resources/at-commands.mjs         | 110 ---------
 ...activateThirdTabAndSetFocusOnTabpanel.html |  92 ++++++++
 .../tabs.setFocusAfterTabpanel.html           |  77 +++++++
 .../tabs.setFocusBeforeTablist.html           |  77 +++++++
 .../tabs.setFocusOnFirstTab.html              |  77 +++++++
 .../tabs.setFocusOnSecondTab.html             |  77 +++++++
 .../tabs.setFocusOnThirdTab.html              |  77 +++++++
 ...ds-to-tab-list-reading-jaws.collected.json |   2 +-
 ...ds-to-tab-list-reading-nvda.collected.json |   2 +-
 ...navigate-forwards-to-tab-list-reading.html |   2 +-
 ...ds-to-tab-list-reading-jaws.collected.json |   2 +-
 ...ds-to-tab-list-reading-nvda.collected.json |   2 +-
 ...avigate-backwards-to-tab-list-reading.html |   2 +-
 ...o-tab-list-interaction-jaws.collected.json |   2 +-
 ...o-tab-list-interaction-nvda.collected.json |   2 +-
 ...gate-forwards-to-tab-list-interaction.html |   2 +-
 ...o-tab-list-interaction-jaws.collected.json |   2 +-
 ...o-tab-list-interaction-nvda.collected.json |   2 +-
 ...ate-backwards-to-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...gate-forwards-to-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-backwards-to-tab-list-interaction.html |   2 +-
 ...ab-in-tab-list-reading-jaws.collected.json |   2 +-
 ...ab-in-tab-list-reading-nvda.collected.json |   2 +-
 ...rmation-about-tab-in-tab-list-reading.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...ion-about-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ion-about-tab-in-tab-list-interaction.html |   2 +-
 ...ab-in-tab-list-reading-jaws.collected.json |   2 +-
 ...ab-in-tab-list-reading-nvda.collected.json |   2 +-
 ...igate-to-next-tab-in-tab-list-reading.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...e-to-next-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-to-next-tab-in-tab-list-interaction.html |   2 +-
 ...ab-in-tab-list-reading-jaws.collected.json |   2 +-
 ...ab-in-tab-list-reading-nvda.collected.json |   2 +-
 ...e-to-previous-tab-in-tab-list-reading.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...-previous-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-previous-tab-in-tab-list-interaction.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...-to-first-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-first-tab-in-tab-list-interaction.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...e-to-last-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...e-to-last-tab-in-tab-list-interaction.html |   2 +-
 ...-tab-panel-interaction-jaws.collected.json |   2 +-
 ...-tab-panel-interaction-nvda.collected.json |   2 +-
 ...ate-forwards-to-tab-panel-interaction.html |   2 +-
 ...-tab-panel-interaction-jaws.collected.json |   2 +-
 ...-tab-panel-interaction-nvda.collected.json |   2 +-
 ...te-backwards-to-tab-panel-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-forwards-to-tab-panel-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...te-backwards-to-tab-panel-interaction.html |   2 +-
 ...ab-in-tab-list-reading-jaws.collected.json |   2 +-
 ...ab-in-tab-list-reading-nvda.collected.json |   2 +-
 ...t-24-activate-tab-in-tab-list-reading.html |   2 +-
 ...n-tab-list-interaction-jaws.collected.json |   2 +-
 ...n-tab-list-interaction-nvda.collected.json |   2 +-
 ...-activate-tab-in-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-activate-tab-in-tab-list-interaction.html |   2 +-
 ...-from-tab-list-reading-jaws.collected.json |   2 +-
 ...-from-tab-list-reading-nvda.collected.json |   2 +-
 ...t-27-delete-tab-from-tab-list-reading.html |   2 +-
 ...m-tab-list-interaction-jaws.collected.json |   2 +-
 ...m-tab-list-interaction-nvda.collected.json |   2 +-
 ...-delete-tab-from-tab-list-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-delete-tab-from-tab-list-interaction.html |   2 +-
 .../button.setFocusAfterButton.html           |  98 ++++++++
 .../button.setFocusBeforeButton.html          |  98 ++++++++
 .../button.setFocusOnButton.html              |  98 ++++++++
 ....setFocusOnButtonAndSetStateToPressed.html | 101 +++++++++
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...-to-not-pressed-toggle-button-reading.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...-to-not-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...ards-to-pressed-toggle-button-reading.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...ards-to-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...-to-pressed-toggle-button-interaction.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...-to-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...-to-pressed-toggle-button-interaction.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...out-not-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...n-about-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...out-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...out-pressed-toggle-button-interaction.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...ate-not-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...not-pressed-toggle-button-interaction.html |   2 +-
 ...-toggle-button-reading-jaws.collected.json |   2 +-
 ...-toggle-button-reading-nvda.collected.json |   2 +-
 ...operate-pressed-toggle-button-reading.html |   2 +-
 ...gle-button-interaction-jaws.collected.json |   2 +-
 ...gle-button-interaction-nvda.collected.json |   2 +-
 ...ate-pressed-toggle-button-interaction.html |   2 +-
 ...interaction-voiceover_macos.collected.json |   2 +-
 ...ate-pressed-toggle-button-interaction.html |   2 +-
 1511 files changed, 13618 insertions(+), 2686 deletions(-)
 create mode 100644 build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html
 create mode 100644 build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html
 create mode 100644 build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html
 create mode 100644 build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToFirstCheckbox.html
 create mode 100644 build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html
 create mode 100644 build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html
 create mode 100644 build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html
 create mode 100644 build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.moveFocusAfterCombobox.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.moveFocusBeforeCombobox.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.moveFocusToCombobox.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.openListbox.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.openListboxToApple.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.openListboxToGuava.html
 create mode 100644 build/tests/combobox-select-only/reference/combobox-select-only.openListboxToHuckleberry.html
 create mode 100644 build/tests/command-button/reference/2021-3-29_132754/button.setFocusAfterButton.html
 create mode 100644 build/tests/command-button/reference/2021-3-29_132754/button.setFocusBeforeButton.html
 create mode 100644 build/tests/command-button/reference/2021-3-29_132754/button.setFocusOnButton.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html
 create mode 100644 build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondDisclosure.html
 create mode 100644 build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html
 create mode 100644 build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html
 create mode 100644 build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html
 create mode 100644 build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html
 create mode 100644 build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html
 create mode 100644 build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html
 create mode 100644 build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html
 create mode 100644 build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html
 create mode 100644 build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html
 create mode 100644 build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html
 create mode 100644 build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html
 create mode 100644 build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html
 create mode 100644 build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfont.html
 create mode 100644 build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonsize.html
 create mode 100644 build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html
 create mode 100644 build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusontextalign.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html
 create mode 100644 build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html
 create mode 100644 build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html
 create mode 100644 build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html
 create mode 100644 build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html
 delete mode 100644 build/tests/resources/at-commands.mjs
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html
 create mode 100644 build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html
 create mode 100644 build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusAfterButton.html
 create mode 100644 build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusBeforeButton.html
 create mode 100644 build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButton.html
 create mode 100644 build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html

diff --git a/build/index.html b/build/index.html
index 67d10afbe..cb1acb95e 100644
--- a/build/index.html
+++ b/build/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/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -48,7 +48,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/checkbox-tri-state/index.html">Index</a></td>
             <td><a href="./review/checkbox-tri-state.html">Review</a></td>
             <td>24</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -56,7 +56,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/combobox-autocomplete-both-updated/index.html">Index</a></td>
             <td><a href="./review/combobox-autocomplete-both-updated.html">Review</a></td>
             <td>76</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -64,7 +64,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/combobox-select-only/index.html">Index</a></td>
             <td><a href="./review/combobox-select-only.html">Review</a></td>
             <td>38</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -72,7 +72,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/command-button/index.html">Index</a></td>
             <td><a href="./review/command-button.html">Review</a></td>
             <td>9</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -80,7 +80,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/disclosure-faq/index.html">Index</a></td>
             <td><a href="./review/disclosure-faq.html">Review</a></td>
             <td>26</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -88,7 +88,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/disclosure-navigation/index.html">Index</a></td>
             <td><a href="./review/disclosure-navigation.html">Review</a></td>
             <td>46</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -96,7 +96,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/menu-button-actions/index.html">Index</a></td>
             <td><a href="./review/menu-button-actions.html">Review</a></td>
             <td>26</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -104,7 +104,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/menu-button-actions-active-descendant/index.html">Index</a></td>
             <td><a href="./review/menu-button-actions-active-descendant.html">Review</a></td>
             <td>26</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -112,7 +112,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/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -120,7 +120,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/minimal-data-grid/index.html">Index</a></td>
             <td><a href="./review/minimal-data-grid.html">Review</a></td>
             <td>55</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -128,7 +128,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/modal-dialog/index.html">Index</a></td>
             <td><a href="./review/modal-dialog.html">Review</a></td>
             <td>29</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -136,7 +136,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/radiogroup-aria-activedescendant/index.html">Index</a></td>
             <td><a href="./review/radiogroup-aria-activedescendant.html">Review</a></td>
             <td>39</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -144,7 +144,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/radiogroup-roving-tabindex/index.html">Index</a></td>
             <td><a href="./review/radiogroup-roving-tabindex.html">Review</a></td>
             <td>39</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -152,7 +152,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/tabs-manual-activation/index.html">Index</a></td>
             <td><a href="./review/tabs-manual-activation.html">Review</a></td>
             <td>29</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
           <tr>
@@ -160,7 +160,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/toggle-button/index.html">Index</a></td>
             <td><a href="./review/toggle-button.html">Review</a></td>
             <td>24</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/970bff9" target="_blank">970bff9 Remove reference to non-existend &#39;npm run start&#39;
+            <td><a href="https://github.com/w3c/aria-at/commit/fabf50f" target="_blank">fabf50f fixup! render reference page as template for scripts
 </a></td>
           </tr>
     </table>
diff --git a/build/review/checkbox-tri-state.html b/build/review/checkbox-tri-state.html
index 051e3009f..cbc051eed 100644
--- a/build/review/checkbox-tri-state.html
+++ b/build/review/checkbox-tri-state.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a partially checked checkbox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -725,7 +712,7 @@ <h2>Test 2: Navigate backwards to a partially checked checkbox in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -807,7 +794,7 @@ <h2>Test 3: Navigate forwards to a partially checked checkbox in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -883,7 +870,7 @@ <h2>Test 4: Navigate backwards to a partially checked checkbox in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -959,7 +946,7 @@ <h2>Test 5: Navigate forwards to a partially checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1010,7 +997,7 @@ <h2>Test 6: Navigate backwards to a partially checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1061,7 +1048,7 @@ <h2>Test 7: Operate a partially checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1132,7 +1119,7 @@ <h2>Test 8: Operate a partially checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1203,7 +1190,7 @@ <h2>Test 9: Operate a partially checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1250,7 +1237,7 @@ <h2>Test 10: Operate an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1322,7 +1309,7 @@ <h2>Test 11: Operate an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1394,7 +1381,7 @@ <h2>Test 12: Operate an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1442,7 +1429,7 @@ <h2>Test 13: Read a partially checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1520,7 +1507,7 @@ <h2>Test 14: Read a partially checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1598,7 +1585,7 @@ <h2>Test 15: Read a partially checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1648,7 +1635,7 @@ <h2>Test 16: Read grouping information of a grouped, partially checked checkbox
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1720,7 +1707,7 @@ <h2>Test 17: Read grouping information of a grouped, partially checked checkbox
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1792,7 +1779,7 @@ <h2>Test 18: Read grouping information of a grouped, partially checked checkbox<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1839,7 +1826,7 @@ <h2>Test 19: Navigate forwards into a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1917,7 +1904,7 @@ <h2>Test 20: Navigate backwards out of a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1991,7 +1978,7 @@ <h2>Test 21: Navigate forwards into a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2065,7 +2052,7 @@ <h2>Test 22: Navigate backwards out of a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2139,7 +2126,7 @@ <h2>Test 23: Navigate forwards into a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2186,7 +2173,7 @@ <h2>Test 24: Navigate backwards out of a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/checkbox.html b/build/review/checkbox.html
index ea64d8d38..fc6500e56 100644
--- a/build/review/checkbox.html
+++ b/build/review/checkbox.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -716,7 +703,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -782,7 +769,7 @@ <h2>Test 3: Navigate to an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -828,7 +815,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -911,7 +898,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -987,7 +974,7 @@ <h2>Test 6: Navigate to a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1038,7 +1025,7 @@ <h2>Test 7: Operate a checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-07-operate-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1101,7 +1088,7 @@ <h2>Test 8: Operate a checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-08-operate-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1162,7 +1149,7 @@ <h2>Test 9: Operate a checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-09-operate-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1204,7 +1191,7 @@ <h2>Test 10: Read an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-10-read-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1282,7 +1269,7 @@ <h2>Test 11: Read an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-11-read-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1360,7 +1347,7 @@ <h2>Test 12: Read an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-12-read-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1410,7 +1397,7 @@ <h2>Test 13: Read a checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-13-read-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1488,7 +1475,7 @@ <h2>Test 14: Read a checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-14-read-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1566,7 +1553,7 @@ <h2>Test 15: Read a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-15-read-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1616,7 +1603,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1680,7 +1667,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1744,7 +1731,7 @@ <h2>Test 18: Read grouping information of a grouped checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1788,7 +1775,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1857,7 +1844,7 @@ <h2>Test 20: Navigate sequentially through a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</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>
@@ -1903,7 +1890,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-21-navigate-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1980,7 +1967,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2049,7 +2036,7 @@ <h2>Test 23: Navigate into a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2099,7 +2086,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -2168,7 +2155,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -2237,7 +2224,7 @@ <h2>Test 26: Navigate out of a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/combobox-autocomplete-both-updated.html b/build/review/combobox-autocomplete-both-updated.html
index 10610e935..c860946e8 100644
--- a/build/review/combobox-autocomplete-both-updated.html
+++ b/build/review/combobox-autocomplete-both-updated.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to an empty, collapsed combobox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -732,7 +719,7 @@ <h2>Test 2: Navigate backwards to an empty, collapsed combobox in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -821,7 +808,7 @@ <h2>Test 3: Navigate forwards to an empty, collapsed combobox in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -902,7 +889,7 @@ <h2>Test 4: Navigate backwards to an empty, collapsed combobox in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -983,7 +970,7 @@ <h2>Test 5: Navigate forwards to an empty, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1037,7 +1024,7 @@ <h2>Test 6: Navigate backwards to an empty, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1091,7 +1078,7 @@ <h2>Test 7: Read information about an empty, collapsed combobox in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1174,7 +1161,7 @@ <h2>Test 8: Read information about an empty, collapsed combobox in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1255,7 +1242,7 @@ <h2>Test 9: Read information about an empty, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1308,7 +1295,7 @@ <h2>Test 10: Navigate forwards to a filled in, collapsed combobox in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1401,7 +1388,7 @@ <h2>Test 11: Navigate backwards to a filled in, collapsed combobox in reading mo
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1494,7 +1481,7 @@ <h2>Test 12: Navigate forwards to a filled in, collapsed combobox in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1579,7 +1566,7 @@ <h2>Test 13: Navigate backwards to a filled in, collapsed combobox in interactio
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1664,7 +1651,7 @@ <h2>Test 14: Navigate forwards to a filled in, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1720,7 +1707,7 @@ <h2>Test 15: Navigate backwards to a filled in, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1776,7 +1763,7 @@ <h2>Test 16: Read information about a filled in, collapsed combobox in reading m
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1863,7 +1850,7 @@ <h2>Test 17: Read information about a filled in, collapsed combobox in interacti
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1948,7 +1935,7 @@ <h2>Test 18: Read information about a filled in, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2003,7 +1990,7 @@ <h2>Test 19: Open an empty, collapsed combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2076,7 +2063,7 @@ <h2>Test 20: Open an empty, collapsed combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2149,7 +2136,7 @@ <h2>Test 21: Open an empty, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2196,7 +2183,7 @@ <h2>Test 22: Open a filled in, collapsed combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2269,7 +2256,7 @@ <h2>Test 23: Open a filled in, collapsed combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2342,7 +2329,7 @@ <h2>Test 24: Open a filled in, collapsed combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2389,7 +2376,7 @@ <h2>Test 25: Open an empty, collapsed combobox by typing a character in interact
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2464,7 +2451,7 @@ <h2>Test 26: Open an empty, collapsed combobox by typing a character</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2512,7 +2499,7 @@ <h2>Test 27: Open a filled in, collapsed combobox by typing a character in inter
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2587,7 +2574,7 @@ <h2>Test 28: Open a filled in, collapsed combobox by typing a character</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2635,7 +2622,7 @@ <h2>Test 29: Read information about an empty, expanded combobox in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2718,7 +2705,7 @@ <h2>Test 30: Read information about an empty, expanded combobox in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -2799,7 +2786,7 @@ <h2>Test 31: Read information about an empty, expanded combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2852,7 +2839,7 @@ <h2>Test 32: Read information about a filled in, expanded combobox in reading mo
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html?at=jaws">jaws</a></li>
@@ -2939,7 +2926,7 @@ <h2>Test 33: Read information about a filled in, expanded combobox in interactio
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3024,7 +3011,7 @@ <h2>Test 34: Read information about a filled in, expanded combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3079,7 +3066,7 @@ <h2>Test 35: Narrow down the matching options in an empty, expanded combobox in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3151,7 +3138,7 @@ <h2>Test 36: Narrow down the matching options in an empty, expanded combobox</h2
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3197,7 +3184,7 @@ <h2>Test 37: Narrow down the matching options in a filled in, expanded combobox
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3269,7 +3256,7 @@ <h2>Test 38: Narrow down the matching options in a filled in, expanded combobox<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3315,7 +3302,7 @@ <h2>Test 39: Close an empty combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html?at=jaws">jaws</a></li>
@@ -3386,7 +3373,7 @@ <h2>Test 40: Close an empty combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3459,7 +3446,7 @@ <h2>Test 41: Close an empty combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3506,7 +3493,7 @@ <h2>Test 42: Close a filled in combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html?at=jaws">jaws</a></li>
@@ -3577,7 +3564,7 @@ <h2>Test 43: Close a filled in combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -3650,7 +3637,7 @@ <h2>Test 44: Close a filled in combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3697,7 +3684,7 @@ <h2>Test 45: Navigate from an empty, collapsed combobox to the first option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3784,7 +3771,7 @@ <h2>Test 46: Navigate from an empty, collapsed combobox to the first option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3840,7 +3827,7 @@ <h2>Test 47: Navigate from an empty, collapsed combobox to the last option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3925,7 +3912,7 @@ <h2>Test 48: Navigate from an empty, collapsed combobox to the last option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3980,7 +3967,7 @@ <h2>Test 49: Navigate from a filled in, collapsed combobox to the first option i
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4067,7 +4054,7 @@ <h2>Test 50: Navigate from a filled in, collapsed combobox to the first option i
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4123,7 +4110,7 @@ <h2>Test 51: Navigate from a filled in, collapsed combobox to the last option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4210,7 +4197,7 @@ <h2>Test 52: Navigate from a filled in, collapsed combobox to the last option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4266,7 +4253,7 @@ <h2>Test 53: Navigate from an empty, expanded combobox to the first option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4351,7 +4338,7 @@ <h2>Test 54: Navigate from an empty, expanded combobox to the first option in a
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4406,7 +4393,7 @@ <h2>Test 55: Navigate from an empty, expanded combobox to the last option in a l
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4491,7 +4478,7 @@ <h2>Test 56: Navigate from an empty, expanded combobox to the last option in a l
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4546,7 +4533,7 @@ <h2>Test 57: Navigate from a filled in, expanded combobox to the first option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4631,7 +4618,7 @@ <h2>Test 58: Navigate from a filled in, expanded combobox to the first option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4686,7 +4673,7 @@ <h2>Test 59: Navigate from a filled in, expanded combobox to the last option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4771,7 +4758,7 @@ <h2>Test 60: Navigate from a filled in, expanded combobox to the last option in
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4826,7 +4813,7 @@ <h2>Test 61: Navigate to the next option in a listbox popup in interaction mode<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -4913,7 +4900,7 @@ <h2>Test 62: Navigate to the next option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4970,7 +4957,7 @@ <h2>Test 63: Navigate to the  previous option in a listbox popup in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5057,7 +5044,7 @@ <h2>Test 64: Navigate to the  previous option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5114,7 +5101,7 @@ <h2>Test 65: Read information about a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5198,7 +5185,7 @@ <h2>Test 66: Read information about a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5253,7 +5240,7 @@ <h2>Test 67: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html?at=jaws">jaws</a></li>
@@ -5338,7 +5325,7 @@ <h2>Test 68: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html?at=jaws">jaws</a></li>
@@ -5423,7 +5410,7 @@ <h2>Test 69: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5477,7 +5464,7 @@ <h2>Test 70: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5531,7 +5518,7 @@ <h2>Test 71: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html?at=jaws">jaws</a></li>
@@ -5616,7 +5603,7 @@ <h2>Test 72: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html?at=jaws">jaws</a></li>
@@ -5701,7 +5688,7 @@ <h2>Test 73: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5755,7 +5742,7 @@ <h2>Test 74: Navigate out of a listbox popup by moving the editing cursor to the
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -5809,7 +5796,7 @@ <h2>Test 75: Select an option in a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -5895,7 +5882,7 @@ <h2>Test 76: Select an option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/combobox-select-only.html b/build/review/combobox-select-only.html
index 3605d8d43..b553dc3df 100644
--- a/build/review/combobox-select-only.html
+++ b/build/review/combobox-select-only.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a collapsed select-only combobox in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -728,7 +715,7 @@ <h2>Test 2: Navigate backwards to a collapsed select-only combobox in reading mo
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -813,7 +800,7 @@ <h2>Test 3: Navigate forwards to a collapsed select-only combobox in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -892,7 +879,7 @@ <h2>Test 4: Navigate backwards to a collapsed select-only combobox in interactio
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -971,7 +958,7 @@ <h2>Test 5: Navigate forwards to a collapsed select-only combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1024,7 +1011,7 @@ <h2>Test 6: Navigate backwards to a collapsed select-only combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1077,7 +1064,7 @@ <h2>Test 7: Read information about a collapsed select-only combobox in reading m
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1158,7 +1145,7 @@ <h2>Test 8: Read information about a collapsed select-only combobox in interacti
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1237,7 +1224,7 @@ <h2>Test 9: Read information about a collapsed select-only combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1289,7 +1276,7 @@ <h2>Test 10: Open a collapsed select-only combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1376,7 +1363,7 @@ <h2>Test 11: Open a collapsed select-only combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1471,7 +1458,7 @@ <h2>Test 12: Open a collapsed select-only combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1532,7 +1519,7 @@ <h2>Test 13: Open a collapsed select-only combobox to the first option in intera
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=jaws">jaws</a></li>
@@ -1619,7 +1606,7 @@ <h2>Test 14: Open a collapsed select-only combobox to the first option</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1675,7 +1662,7 @@ <h2>Test 15: Open a collapsed select-only combobox to a specific option in inter
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html?at=jaws">jaws</a></li>
@@ -1762,7 +1749,7 @@ <h2>Test 16: Open a collapsed select-only combobox to a specific option</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1818,7 +1805,7 @@ <h2>Test 17: Open a collapsed select-only combobox to the last option in interac
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html?at=jaws">jaws</a></li>
@@ -1905,7 +1892,7 @@ <h2>Test 18: Open a collapsed select-only combobox to the last option</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1961,7 +1948,7 @@ <h2>Test 19: Read information about a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2045,7 +2032,7 @@ <h2>Test 20: Read information about a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2100,7 +2087,7 @@ <h2>Test 21: Navigate forwards to an option in a listbox popup in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2178,7 +2165,7 @@ <h2>Test 22: Navigate backwards to an option in a listbox popup in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2256,7 +2243,7 @@ <h2>Test 23: Navigate forwards to an option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2308,7 +2295,7 @@ <h2>Test 24: Navigate backwards to an option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2360,7 +2347,7 @@ <h2>Test 25: Navigate to a specific option in a listbox popup in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2438,7 +2425,7 @@ <h2>Test 26: Navigate to a specific option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2488,7 +2475,7 @@ <h2>Test 27: Navigate to the first option in a listbox popup in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2566,7 +2553,7 @@ <h2>Test 28: Navigate to the last option in a listbox popup in interaction mode<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2644,7 +2631,7 @@ <h2>Test 29: Navigate to the first option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2694,7 +2681,7 @@ <h2>Test 30: Navigate to the last option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2744,7 +2731,7 @@ <h2>Test 31: Navigate forwards by ten options in a listbox popup in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2822,7 +2809,7 @@ <h2>Test 32: Navigate backwards by ten options in a listbox popup in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2900,7 +2887,7 @@ <h2>Test 33: Navigate forwards by ten options in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2950,7 +2937,7 @@ <h2>Test 34: Navigate backwards by ten options in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3000,7 +2987,7 @@ <h2>Test 35: Select an option in a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3083,7 +3070,7 @@ <h2>Test 36: Select an option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3137,7 +3124,7 @@ <h2>Test 37: Close a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-37-close-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -3216,7 +3203,7 @@ <h2>Test 38: Close a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-38-close-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/command-button.html b/build/review/command-button.html
index 1d3024aab..399da1abf 100644
--- a/build/review/command-button.html
+++ b/build/review/command-button.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-01-navigate-forwards-to-button-reading.html?at=jaws">jaws</a></li>
@@ -722,7 +709,7 @@ <h2>Test 2: Navigate backwards to a button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-02-navigate-backwards-to-button-reading.html?at=jaws">jaws</a></li>
@@ -801,7 +788,7 @@ <h2>Test 3: Navigate forwards to a button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-03-navigate-forwards-to-button-interaction.html?at=jaws">jaws</a></li>
@@ -874,7 +861,7 @@ <h2>Test 4: Navigate backwards to a button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-04-navigate-backwards-to-button-interaction.html?at=jaws">jaws</a></li>
@@ -947,7 +934,7 @@ <h2>Test 5: Navigate forwards to a button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-05-navigate-forwards-to-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -996,7 +983,7 @@ <h2>Test 6: Navigate backwards to a button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-06-navigate-backwards-to-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1045,7 +1032,7 @@ <h2>Test 7: Read information about a button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-07-read-information-about-button-reading.html?at=jaws">jaws</a></li>
@@ -1120,7 +1107,7 @@ <h2>Test 8: Read information about a button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-08-read-information-about-button-interaction.html?at=jaws">jaws</a></li>
@@ -1195,7 +1182,7 @@ <h2>Test 9: Read information about a button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/command-button/test-09-read-information-about-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/disclosure-faq.html b/build/review/disclosure-faq.html
index eae380d37..8dccb4a87 100644
--- a/build/review/disclosure-faq.html
+++ b/build/review/disclosure-faq.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a collapsed disclosure button in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -724,7 +711,7 @@ <h2>Test 2: Navigate backwards to a collapsed disclosure button in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -805,7 +792,7 @@ <h2>Test 3: Navigate forwards to a collapsed disclosure button in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -880,7 +867,7 @@ <h2>Test 4: Navigate backwards to a collapsed disclosure button in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -955,7 +942,7 @@ <h2>Test 5: Navigate forwards to a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1005,7 +992,7 @@ <h2>Test 6: Navigate backwards to a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1055,7 +1042,7 @@ <h2>Test 7: Navigate forwards to an expanded disclosure button in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1136,7 +1123,7 @@ <h2>Test 8: Navigate backwards to an expanded disclosure button in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1217,7 +1204,7 @@ <h2>Test 9: Navigate forwards to an expanded disclosure button in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1292,7 +1279,7 @@ <h2>Test 10: Navigate backwards to an expanded disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1367,7 +1354,7 @@ <h2>Test 11: Navigate forwards to an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1417,7 +1404,7 @@ <h2>Test 12: Navigate backwards to an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1467,7 +1454,7 @@ <h2>Test 13: Read information about a collapsed disclosure button in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1544,7 +1531,7 @@ <h2>Test 14: Read information about a collapsed disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1619,7 +1606,7 @@ <h2>Test 15: Read information about a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1668,7 +1655,7 @@ <h2>Test 16: Read information about an expanded disclosure button in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1745,7 +1732,7 @@ <h2>Test 17: Read information about an expanded disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1820,7 +1807,7 @@ <h2>Test 18: Read information about an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1869,7 +1856,7 @@ <h2>Test 19: Operate a collapsed disclosure button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1942,7 +1929,7 @@ <h2>Test 20: Operate a collapsed disclosure button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2015,7 +2002,7 @@ <h2>Test 21: Operate a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2063,7 +2050,7 @@ <h2>Test 22: Operate an expanded disclosure button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2136,7 +2123,7 @@ <h2>Test 23: Operate an expanded disclosure button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2209,7 +2196,7 @@ <h2>Test 24: Operate an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2257,7 +2244,7 @@ <h2>Test 25: Navigate from an expanded disclosure button to the text of a questi
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html?at=jaws">jaws</a></li>
@@ -2328,7 +2315,7 @@ <h2>Test 26: Navigate from an expanded disclosure button to the text of a questi
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/disclosure-navigation.html b/build/review/disclosure-navigation.html
index ac013741a..d57e72f84 100644
--- a/build/review/disclosure-navigation.html
+++ b/build/review/disclosure-navigation.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
-
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
-
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+      };
+
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
+
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a collapsed disclosure button in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -724,7 +711,7 @@ <h2>Test 2: Navigate backwards to a collapsed disclosure button in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -805,7 +792,7 @@ <h2>Test 3: Navigate forwards to a collapsed disclosure button in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -880,7 +867,7 @@ <h2>Test 4: Navigate backwards to a collapsed disclosure button in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -961,7 +948,7 @@ <h2>Test 5: Navigate forwards to a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1011,7 +998,7 @@ <h2>Test 6: Navigate backwards to a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1061,7 +1048,7 @@ <h2>Test 7: Navigate forwards to an expanded disclosure button in reading mode</
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1142,7 +1129,7 @@ <h2>Test 8: Navigate backwards to an expanded disclosure button in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1223,7 +1210,7 @@ <h2>Test 9: Navigate forwards to an expanded disclosure button in interaction mo
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1298,7 +1285,7 @@ <h2>Test 10: Navigate backwards to an expanded disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1379,7 +1366,7 @@ <h2>Test 11: Navigate forwards to an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1428,7 +1415,7 @@ <h2>Test 12: Navigate backwards to an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1478,7 +1465,7 @@ <h2>Test 13: Read information about a collapsed disclosure button in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1555,7 +1542,7 @@ <h2>Test 14: Read information about a collapsed disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1630,7 +1617,7 @@ <h2>Test 15: Read information about a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1679,7 +1666,7 @@ <h2>Test 16: Read information about an expanded disclosure button in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1756,7 +1743,7 @@ <h2>Test 17: Read information about an expanded disclosure button in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -1831,7 +1818,7 @@ <h2>Test 18: Read information about an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1880,7 +1867,7 @@ <h2>Test 19: Operate a collapsed disclosure button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -1953,7 +1940,7 @@ <h2>Test 20: Operate a collapsed disclosure button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2026,7 +2013,7 @@ <h2>Test 21: Operate a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2074,7 +2061,7 @@ <h2>Test 22: Operate an expanded disclosure button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2147,7 +2134,7 @@ <h2>Test 23: Operate an expanded disclosure button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2220,7 +2207,7 @@ <h2>Test 24: Operate an expanded disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2268,7 +2255,7 @@ <h2>Test 25: Navigate from an expanded disclosure button to a link in the associ
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -2349,7 +2336,7 @@ <h2>Test 26: Navigate from an expanded disclosure button to a link in the associ
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -2427,7 +2414,7 @@ <h2>Test 27: Navigate from an expanded disclosure button to a link in the associ
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2478,7 +2465,7 @@ <h2>Test 28: Navigate from an expanded disclosure button to the current page lin
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html?at=jaws">jaws</a></li>
@@ -2562,7 +2549,7 @@ <h2>Test 29: Navigate from an expanded disclosure button to the current page lin
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html?at=jaws">jaws</a></li>
@@ -2643,7 +2630,7 @@ <h2>Test 30: Navigate from an expanded disclosure button to the current page lin
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2696,7 +2683,7 @@ <h2>Test 31: Navigate from a dropdown to a collapsed disclosure button in readin
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html?at=jaws">jaws</a></li>
@@ -2771,7 +2758,7 @@ <h2>Test 32: Navigate from a dropdown to a collapsed disclosure button in intera
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html?at=jaws">jaws</a></li>
@@ -2846,7 +2833,7 @@ <h2>Test 33: Navigate from a dropdown to a collapsed disclosure button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2894,7 +2881,7 @@ <h2>Test 34: Navigate forwards to a link in a dropdown in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -2971,7 +2958,7 @@ <h2>Test 35: Navigate backwards to a link in a dropdown in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -3048,7 +3035,7 @@ <h2>Test 36: Navigate forwards to a link in a dropdown in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3124,7 +3111,7 @@ <h2>Test 37: Navigate backwards to a link in a dropdown in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3200,7 +3187,7 @@ <h2>Test 38: Navigate forwards to a link in a dropdown</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3250,7 +3237,7 @@ <h2>Test 39: Navigate backwards to a link in a dropdown</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3300,7 +3287,7 @@ <h2>Test 40: Navigate to the first link in a dropdown in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3372,7 +3359,7 @@ <h2>Test 41: Navigate to the last link in a dropdown in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3444,7 +3431,7 @@ <h2>Test 42: Navigate to the first link in a dropdown</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3490,7 +3477,7 @@ <h2>Test 43: Navigate to the last link in a dropdown</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3536,7 +3523,7 @@ <h2>Test 44: Activate a link in a dropdown in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html?at=jaws">jaws</a></li>
@@ -3612,7 +3599,7 @@ <h2>Test 45: Activate a link in a dropdown in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html?at=jaws">jaws</a></li>
@@ -3688,7 +3675,7 @@ <h2>Test 46: Activate a link in a dropdown</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menu-button-actions-active-descendant.html b/build/review/menu-button-actions-active-descendant.html
index 7a64722d1..e87f431d8 100644
--- a/build/review/menu-button-actions-active-descendant.html
+++ b/build/review/menu-button-actions-active-descendant.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -722,7 +709,7 @@ <h2>Test 2: Navigate backwards to a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -801,7 +788,7 @@ <h2>Test 3: Navigate forwards to a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -874,7 +861,7 @@ <h2>Test 4: Navigate backwards to a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -947,7 +934,7 @@ <h2>Test 5: Navigate forwards to a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -996,7 +983,7 @@ <h2>Test 6: Navigate backwards to a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1045,7 +1032,7 @@ <h2>Test 7: Read information about a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1120,7 +1107,7 @@ <h2>Test 8: Read information about a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1195,7 +1182,7 @@ <h2>Test 9: Read information about a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1243,7 +1230,7 @@ <h2>Test 10: Open a menu in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html?at=jaws">jaws</a></li>
@@ -1329,7 +1316,7 @@ <h2>Test 11: Open a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1417,7 +1404,7 @@ <h2>Test 12: Open a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1473,7 +1460,7 @@ <h2>Test 13: Open a menu to the last item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html?at=jaws">jaws</a></li>
@@ -1557,7 +1544,7 @@ <h2>Test 14: Open a menu to the last item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1611,7 +1598,7 @@ <h2>Test 15: Read information about a menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -1691,7 +1678,7 @@ <h2>Test 16: Read information about a menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1742,7 +1729,7 @@ <h2>Test 17: Navigate to the first item in a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1822,7 +1809,7 @@ <h2>Test 18: Navigate to the first item in a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1873,7 +1860,7 @@ <h2>Test 19: Navigate to the last item in a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1953,7 +1940,7 @@ <h2>Test 20: Navigate to the last item in a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2004,7 +1991,7 @@ <h2>Test 21: Navigate to an item in a menu by typing a character in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2082,7 +2069,7 @@ <h2>Test 22: Navigate to an item in a menu by typing a character</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2132,7 +2119,7 @@ <h2>Test 23: Activate a menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -2205,7 +2192,7 @@ <h2>Test 24: Activate a menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2253,7 +2240,7 @@ <h2>Test 25: Close a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2326,7 +2313,7 @@ <h2>Test 26: Close a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menu-button-actions.html b/build/review/menu-button-actions.html
index b0caa6f64..93116271e 100644
--- a/build/review/menu-button-actions.html
+++ b/build/review/menu-button-actions.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -722,7 +709,7 @@ <h2>Test 2: Navigate backwards to a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -801,7 +788,7 @@ <h2>Test 3: Navigate forwards to a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -874,7 +861,7 @@ <h2>Test 4: Navigate backwards to a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -947,7 +934,7 @@ <h2>Test 5: Navigate forwards to a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -996,7 +983,7 @@ <h2>Test 6: Navigate backwards to a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1045,7 +1032,7 @@ <h2>Test 7: Read information about a menu button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html?at=jaws">jaws</a></li>
@@ -1120,7 +1107,7 @@ <h2>Test 8: Read information about a menu button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html?at=jaws">jaws</a></li>
@@ -1195,7 +1182,7 @@ <h2>Test 9: Read information about a menu button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1243,7 +1230,7 @@ <h2>Test 10: Open a menu in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-10-open-menu-reading.html?at=jaws">jaws</a></li>
@@ -1328,7 +1315,7 @@ <h2>Test 11: Open a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-11-open-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1415,7 +1402,7 @@ <h2>Test 12: Open a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-12-open-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1471,7 +1458,7 @@ <h2>Test 13: Open a menu to the last item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html?at=jaws">jaws</a></li>
@@ -1554,7 +1541,7 @@ <h2>Test 14: Open a menu to the last item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1607,7 +1594,7 @@ <h2>Test 15: Read information about a menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -1686,7 +1673,7 @@ <h2>Test 16: Read information about a menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1736,7 +1723,7 @@ <h2>Test 17: Navigate to the first item in a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1815,7 +1802,7 @@ <h2>Test 18: Navigate to the first item in a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1865,7 +1852,7 @@ <h2>Test 19: Navigate to the last item in a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html?at=jaws">jaws</a></li>
@@ -1944,7 +1931,7 @@ <h2>Test 20: Navigate to the last item in a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1994,7 +1981,7 @@ <h2>Test 21: Navigate to an item in a menu by typing a character in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html?at=jaws">jaws</a></li>
@@ -2071,7 +2058,7 @@ <h2>Test 22: Navigate to an item in a menu by typing a character</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2120,7 +2107,7 @@ <h2>Test 23: Activate a menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-23-activate-menu-item-interaction.html?at=jaws">jaws</a></li>
@@ -2193,7 +2180,7 @@ <h2>Test 24: Activate a menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-24-activate-menu-item-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2241,7 +2228,7 @@ <h2>Test 25: Close a menu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-25-close-menu-interaction.html?at=jaws">jaws</a></li>
@@ -2314,7 +2301,7 @@ <h2>Test 26: Close a menu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menu-button-actions/test-26-close-menu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/menubar-editor.html b/build/review/menubar-editor.html
index ff3cb40a2..80cbb2e18 100644
--- a/build/review/menubar-editor.html
+++ b/build/review/menubar-editor.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate to menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-01-navigate-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -724,7 +711,7 @@ <h2>Test 2: Activate menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-02-activate-menubar-reading.html?at=jaws">jaws</a></li>
@@ -787,7 +774,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-03-tab-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -868,7 +855,7 @@ <h2>Test 4: Navigate to menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-04-navigate-to-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -947,7 +934,7 @@ <h2>Test 5: Navigate to menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-05-navigate-to-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -998,7 +985,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -1067,7 +1054,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1146,7 +1133,7 @@ <h2>Test 8: Navigate to menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1197,7 +1184,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1276,7 +1263,7 @@ <h2>Test 10: Navigate to open menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1326,7 +1313,7 @@ <h2>Test 11: Open submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1406,7 +1393,7 @@ <h2>Test 12: Open submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1458,7 +1445,7 @@ <h2>Test 13: Close submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1536,7 +1523,7 @@ <h2>Test 14: Close submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1586,7 +1573,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -1664,7 +1651,7 @@ <h2>Test 16: Navigate to checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1715,7 +1702,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -1793,7 +1780,7 @@ <h2>Test 18: Navigate to unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1844,7 +1831,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -1924,7 +1911,7 @@ <h2>Test 20: Navigate to unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1976,7 +1963,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2062,7 +2049,7 @@ <h2>Test 22: Navigate to checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2117,7 +2104,7 @@ <h2>Test 23: Read menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -2191,7 +2178,7 @@ <h2>Test 24: Read menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -2275,7 +2262,7 @@ <h2>Test 25: Read menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2329,7 +2316,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -2413,7 +2400,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2497,7 +2484,7 @@ <h2>Test 28: Read unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2551,7 +2538,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -2635,7 +2622,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2719,7 +2706,7 @@ <h2>Test 31: Read checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2773,7 +2760,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -2857,7 +2844,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -2941,7 +2928,7 @@ <h2>Test 34: Read unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2995,7 +2982,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -3079,7 +3066,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>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -3163,7 +3150,7 @@ <h2>Test 37: Read checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3217,7 +3204,7 @@ <h2>Test 38: Read disabled menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html?at=jaws">jaws</a></li>
@@ -3299,7 +3286,7 @@ <h2>Test 39: Read disabled menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html?at=jaws">jaws</a></li>
@@ -3381,7 +3368,7 @@ <h2>Test 40: Read disabled menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/minimal-data-grid.html b/build/review/minimal-data-grid.html
index 44908bbfa..23b43e053 100644
--- a/build/review/minimal-data-grid.html
+++ b/build/review/minimal-data-grid.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -727,7 +714,7 @@ <h2>Test 2: Navigate backwards to a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html?at=jaws">jaws</a></li>
@@ -809,7 +796,7 @@ <h2>Test 3: Navigate forwards to a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -862,7 +849,7 @@ <h2>Test 4: Navigate into the end of a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html?at=jaws">jaws</a></li>
@@ -947,7 +934,7 @@ <h2>Test 5: Navigate into the end of a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1000,7 +987,7 @@ <h2>Test 6: Move focus forwards into a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html?at=jaws">jaws</a></li>
@@ -1084,7 +1071,7 @@ <h2>Test 7: Move focus backwards into a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html?at=jaws">jaws</a></li>
@@ -1168,7 +1155,7 @@ <h2>Test 8: Move focus forwards into a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html?at=jaws">jaws</a></li>
@@ -1252,7 +1239,7 @@ <h2>Test 9: Move focus backwards into a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html?at=jaws">jaws</a></li>
@@ -1336,7 +1323,7 @@ <h2>Test 10: Move focus forwards into a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1389,7 +1376,7 @@ <h2>Test 11: Move focus backwards into a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1442,7 +1429,7 @@ <h2>Test 12: Read information about a grid cell in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html?at=jaws">jaws</a></li>
@@ -1518,7 +1505,7 @@ <h2>Test 13: Read information about a grid cell in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html?at=jaws">jaws</a></li>
@@ -1594,7 +1581,7 @@ <h2>Test 14: Read information about a grid cell</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1642,7 +1629,7 @@ <h2>Test 15: Read information about a grid cell containing a link in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html?at=jaws">jaws</a></li>
@@ -1720,7 +1707,7 @@ <h2>Test 16: Read information about a grid cell containing a link in interaction
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html?at=jaws">jaws</a></li>
@@ -1798,7 +1785,7 @@ <h2>Test 17: Read information about a grid cell containing a link</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1847,7 +1834,7 @@ <h2>Test 18: Navigate to the next colum in a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -1921,7 +1908,7 @@ <h2>Test 19: Navigate to the next colum in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -1995,7 +1982,7 @@ <h2>Test 20: Navigate to the next colum in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2044,7 +2031,7 @@ <h2>Test 21: Navigate to the previous colum in a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2118,7 +2105,7 @@ <h2>Test 22: Navigate to the previous colum in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2192,7 +2179,7 @@ <h2>Test 23: Navigate to the previous colum in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2241,7 +2228,7 @@ <h2>Test 24: Navigate to the next colum containing a link in a grid in reading m
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2320,7 +2307,7 @@ <h2>Test 25: Navigate to the next colum containing a link in a grid in interacti
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2397,7 +2384,7 @@ <h2>Test 26: Navigate to the next colum containing a link in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2448,7 +2435,7 @@ <h2>Test 27: Navigate to the previous colum containing a link in a grid in readi
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2527,7 +2514,7 @@ <h2>Test 28: Navigate to the previous colum containing a link in a grid in inter
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2603,7 +2590,7 @@ <h2>Test 29: Navigate to the previous colum containing a link in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2654,7 +2641,7 @@ <h2>Test 30: Navigate to the next column from a cel containing a link in a grid
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2728,7 +2715,7 @@ <h2>Test 31: Navigate to the next column from a cel containing a link in a grid
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2802,7 +2789,7 @@ <h2>Test 32: Navigate to the next column from a cel containing a link in a grid<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2851,7 +2838,7 @@ <h2>Test 33: Navigate to the previous column from a cel containing a link in a g
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -2925,7 +2912,7 @@ <h2>Test 34: Navigate to the previous column from a cel containing a link in a g
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -2999,7 +2986,7 @@ <h2>Test 35: Navigate to the previous column from a cel containing a link in a g
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3049,7 +3036,7 @@ <h2>Test 36: Navigate to the next row in a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3123,7 +3110,7 @@ <h2>Test 37: Navigate to the next row in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3197,7 +3184,7 @@ <h2>Test 38: Navigate to the next row in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3245,7 +3232,7 @@ <h2>Test 39: Navigate to the previous row in a grid in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3319,7 +3306,7 @@ <h2>Test 40: Navigate to the previous row in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3393,7 +3380,7 @@ <h2>Test 41: Navigate to the previous row in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3441,7 +3428,7 @@ <h2>Test 42: Navigate to a cell containing a link on the next row in a grid in r
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3517,7 +3504,7 @@ <h2>Test 43: Navigate to a cell containing a link on the next row in a grid in i
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3593,7 +3580,7 @@ <h2>Test 44: Navigate to a cell containing a link on the next row in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3642,7 +3629,7 @@ <h2>Test 45: Navigate to a cell containing a link on the previous row in a grid
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html?at=jaws">jaws</a></li>
@@ -3718,7 +3705,7 @@ <h2>Test 46: Navigate to a cell containing a link on the previous row in a grid
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3794,7 +3781,7 @@ <h2>Test 47: Navigate to a cell containing a link on the previous row in a grid<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3843,7 +3830,7 @@ <h2>Test 48: Navigate to the first cell of a row in a grid in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -3917,7 +3904,7 @@ <h2>Test 49: Navigate to the first cell of a row in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3964,7 +3951,7 @@ <h2>Test 50: Navigate to the last cell of a row in a grid in interaction mode</h
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4038,7 +4025,7 @@ <h2>Test 51: Navigate to the last cell of a row in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4085,7 +4072,7 @@ <h2>Test 52: Navigate to the first cell in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4159,7 +4146,7 @@ <h2>Test 53: Navigate to the first cell in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -4206,7 +4193,7 @@ <h2>Test 54: Navigate to the last cell in a grid in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html?at=jaws">jaws</a></li>
@@ -4280,7 +4267,7 @@ <h2>Test 55: Navigate to the last cell in a grid</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/modal-dialog.html b/build/review/modal-dialog.html
index 72d7cd5b1..4ca0ce1eb 100644
--- a/build/review/modal-dialog.html
+++ b/build/review/modal-dialog.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Open a modal dialog in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-01-open-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -723,7 +710,7 @@ <h2>Test 2: Open a modal dialog in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-02-open-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -803,7 +790,7 @@ <h2>Test 3: Open a Modal Dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-03-open-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -855,7 +842,7 @@ <h2>Test 4: Close a modal dialog in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-04-close-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -927,7 +914,7 @@ <h2>Test 5: Close a modal dialog in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-05-close-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -999,7 +986,7 @@ <h2>Test 6: Close a modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-06-close-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1045,7 +1032,7 @@ <h2>Test 7: Close a modal dialog using a button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html?at=jaws">jaws</a></li>
@@ -1119,7 +1106,7 @@ <h2>Test 8: Close a modal dialog using a button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html?at=jaws">jaws</a></li>
@@ -1193,7 +1180,7 @@ <h2>Test 9: Close a modal dialog using a button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1241,7 +1228,7 @@ <h2>Test 10: Navigate to the last focusable element in a modal dialog in interac
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1313,7 +1300,7 @@ <h2>Test 11: Navigate to the last focusable element in a modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1359,7 +1346,7 @@ <h2>Test 12: Navigate to the first focusable element in a modal dialog in intera
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1431,7 +1418,7 @@ <h2>Test 13: Navigate to the first focusable element in a modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1477,7 +1464,7 @@ <h2>Test 14: Navigate to the beginning of a modal dialog in reading mode </h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1551,7 +1538,7 @@ <h2>Test 15: Navigate to the beginning of a modal dialog </h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1598,7 +1585,7 @@ <h2>Test 16: Navigate to the end of a modal dialog in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1670,7 +1657,7 @@ <h2>Test 17: Navigate to the end of a modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1716,7 +1703,7 @@ <h2>Test 18: Open a nested modal dialog in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -1799,7 +1786,7 @@ <h2>Test 19: Open a nested modal dialog in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -1882,7 +1869,7 @@ <h2>Test 20: Open a nested modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1936,7 +1923,7 @@ <h2>Test 21: Close a nested modal dialog in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html?at=jaws">jaws</a></li>
@@ -2014,7 +2001,7 @@ <h2>Test 22: Close a nested modal dialog in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html?at=jaws">jaws</a></li>
@@ -2092,7 +2079,7 @@ <h2>Test 23: Close a nested modal dialog</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2142,7 +2129,7 @@ <h2>Test 24: Close a nested modal dialog using a button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html?at=jaws">jaws</a></li>
@@ -2222,7 +2209,7 @@ <h2>Test 25: Close a nested modal dialog using a button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html?at=jaws">jaws</a></li>
@@ -2302,7 +2289,7 @@ <h2>Test 26: Close a nested modal dialog using a button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2354,7 +2341,7 @@ <h2>Test 27: Open a nested modal dialog using a link in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html?at=jaws">jaws</a></li>
@@ -2435,7 +2422,7 @@ <h2>Test 28: Open a nested modal dialog using a link in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html?at=jaws">jaws</a></li>
@@ -2516,7 +2503,7 @@ <h2>Test 29: Open a nested modal dialog using a link</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/radiogroup-aria-activedescendant.html b/build/review/radiogroup-aria-activedescendant.html
index 586a4643b..9de2ca56e 100644
--- a/build/review/radiogroup-aria-activedescendant.html
+++ b/build/review/radiogroup-aria-activedescendant.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate to the first unchecked radio button in a group in reading m
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -734,7 +721,7 @@ <h2>Test 2: Navigate to the first unchecked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -791,7 +778,7 @@ <h2>Test 3: navigate to the last unchecked radio button in a group in reading mo
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -882,7 +869,7 @@ <h2>Test 4: Navigate to the last unchecked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -939,7 +926,7 @@ <h2>Test 5: Navigate to the first checked radio button in a group in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1030,7 +1017,7 @@ <h2>Test 6: Navigate to the first checked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1087,7 +1074,7 @@ <h2>Test 7: Navigate to the last checked radio button in a group in reading mode
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1178,7 +1165,7 @@ <h2>Test 8: Navigate to the last checked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1235,7 +1222,7 @@ <h2>Test 9: Navigate forwards to an unchecked radio button in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1322,7 +1309,7 @@ <h2>Test 10: Navigate forwards to an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1378,7 +1365,7 @@ <h2>Test 11: Navigate backwards to an unchecked radio button in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1465,7 +1452,7 @@ <h2>Test 12: Navigate backwards to an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1521,7 +1508,7 @@ <h2>Test 13: Navigate forwards to a checked radio button in interaction mode</h2
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1608,7 +1595,7 @@ <h2>Test 14: Navigate forwards to a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1664,7 +1651,7 @@ <h2>Test 15: Navigate backwards to a checked radio button in interaction mode</h
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1751,7 +1738,7 @@ <h2>Test 16: Navigate backwards to a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1807,7 +1794,7 @@ <h2>Test 17: Navigate out of the start of a radio group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -1889,7 +1876,7 @@ <h2>Test 18: Navigate out of the start of a radio group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -1969,7 +1956,7 @@ <h2>Test 19: Navigate out of the start of a radio group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2021,7 +2008,7 @@ <h2>Test 20: Navigate out of the end of a radio group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2103,7 +2090,7 @@ <h2>Test 21: Navigate out of the end of a radio group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2183,7 +2170,7 @@ <h2>Test 22: Navigate out of the end of a radio group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2235,7 +2222,7 @@ <h2>Test 23: Read information about an unchecked radio button in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2318,7 +2305,7 @@ <h2>Test 24: Read information about an unchecked radio button in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2401,7 +2388,7 @@ <h2>Test 25: Read information about an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2454,7 +2441,7 @@ <h2>Test 26: Read information about a checked radio button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2537,7 +2524,7 @@ <h2>Test 27: Read information about a checked radio button in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2620,7 +2607,7 @@ <h2>Test 28: Read information about a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2673,7 +2660,7 @@ <h2>Test 29: Navigate to the next radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2756,7 +2743,7 @@ <h2>Test 30: Navigate to the next radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2810,7 +2797,7 @@ <h2>Test 31: Navigate to the previous radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2893,7 +2880,7 @@ <h2>Test 32: Navigate to the previous radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2947,7 +2934,7 @@ <h2>Test 33: Navigate to the first radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3030,7 +3017,7 @@ <h2>Test 34: Navigate to the first radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3083,7 +3070,7 @@ <h2>Test 35: Navigate to the last radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3166,7 +3153,7 @@ <h2>Test 36: Navigate to the last radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3219,7 +3206,7 @@ <h2>Test 37: Check a radio button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -3290,7 +3277,7 @@ <h2>Test 38: Check a radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3361,7 +3348,7 @@ <h2>Test 39: Check a radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/radiogroup-roving-tabindex.html b/build/review/radiogroup-roving-tabindex.html
index c47f03c18..3377d549a 100644
--- a/build/review/radiogroup-roving-tabindex.html
+++ b/build/review/radiogroup-roving-tabindex.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate to the first unchecked radio button in a group in reading m
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -733,7 +720,7 @@ <h2>Test 2: Navigate to the first unchecked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -789,7 +776,7 @@ <h2>Test 3: navigate to the last unchecked radio button in a group in reading mo
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -879,7 +866,7 @@ <h2>Test 4: Navigate to the last unchecked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -935,7 +922,7 @@ <h2>Test 5: Navigate to the first checked radio button in a group in reading mod
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1025,7 +1012,7 @@ <h2>Test 6: Navigate to the first checked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1081,7 +1068,7 @@ <h2>Test 7: Navigate to the last checked radio button in a group in reading mode
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html?at=jaws">jaws</a></li>
@@ -1171,7 +1158,7 @@ <h2>Test 8: Navigate to the last checked radio button in a group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1227,7 +1214,7 @@ <h2>Test 9: Navigate forwards to an unchecked radio button in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1313,7 +1300,7 @@ <h2>Test 10: Navigate forwards to an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1368,7 +1355,7 @@ <h2>Test 11: Navigate backwards to an unchecked radio button in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1454,7 +1441,7 @@ <h2>Test 12: Navigate backwards to an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1509,7 +1496,7 @@ <h2>Test 13: Navigate forwards to a checked radio button in interaction mode</h2
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1595,7 +1582,7 @@ <h2>Test 14: Navigate forwards to a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1650,7 +1637,7 @@ <h2>Test 15: Navigate backwards to a checked radio button in interaction mode</h
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -1736,7 +1723,7 @@ <h2>Test 16: Navigate backwards to a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1791,7 +1778,7 @@ <h2>Test 17: Navigate out of the start of a radio group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -1873,7 +1860,7 @@ <h2>Test 18: Navigate out of the start of a radio group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -1953,7 +1940,7 @@ <h2>Test 19: Navigate out of the start of a radio group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2005,7 +1992,7 @@ <h2>Test 20: Navigate out of the end of a radio group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html?at=jaws">jaws</a></li>
@@ -2087,7 +2074,7 @@ <h2>Test 21: Navigate out of the end of a radio group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html?at=jaws">jaws</a></li>
@@ -2167,7 +2154,7 @@ <h2>Test 22: Navigate out of the end of a radio group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2219,7 +2206,7 @@ <h2>Test 23: Read information about an unchecked radio button in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2301,7 +2288,7 @@ <h2>Test 24: Read information about an unchecked radio button in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2383,7 +2370,7 @@ <h2>Test 25: Read information about an unchecked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2435,7 +2422,7 @@ <h2>Test 26: Read information about a checked radio button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -2517,7 +2504,7 @@ <h2>Test 27: Read information about a checked radio button in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2599,7 +2586,7 @@ <h2>Test 28: Read information about a checked radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2651,7 +2638,7 @@ <h2>Test 29: Navigate to the next radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2733,7 +2720,7 @@ <h2>Test 30: Navigate to the next radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2786,7 +2773,7 @@ <h2>Test 31: Navigate to the previous radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -2868,7 +2855,7 @@ <h2>Test 32: Navigate to the previous radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2921,7 +2908,7 @@ <h2>Test 33: Navigate to the first radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3003,7 +2990,7 @@ <h2>Test 34: Navigate to the first radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3055,7 +3042,7 @@ <h2>Test 35: Navigate to the last radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3137,7 +3124,7 @@ <h2>Test 36: Navigate to the last radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -3189,7 +3176,7 @@ <h2>Test 37: Check a radio button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html?at=jaws">jaws</a></li>
@@ -3260,7 +3247,7 @@ <h2>Test 38: Check a radio button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html?at=jaws">jaws</a></li>
@@ -3331,7 +3318,7 @@ <h2>Test 39: Check a radio button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/tabs-manual-activation.html b/build/review/tabs-manual-activation.html
index 08efba98c..fa88e02db 100644
--- a/build/review/tabs-manual-activation.html
+++ b/build/review/tabs-manual-activation.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -732,7 +719,7 @@ <h2>Test 2: Navigate backwards to a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -821,7 +808,7 @@ <h2>Test 3: Navigate forwards to a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -908,7 +895,7 @@ <h2>Test 4: Navigate backwards to a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -995,7 +982,7 @@ <h2>Test 5: Navigate forwards to a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1053,7 +1040,7 @@ <h2>Test 6: Navigate backwards to a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1111,7 +1098,7 @@ <h2>Test 7: Read information about a tab in a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1194,7 +1181,7 @@ <h2>Test 8: Read information about a tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1277,7 +1264,7 @@ <h2>Test 9: Read information about a tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1330,7 +1317,7 @@ <h2>Test 10: Navigate to the next tab in a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1408,7 +1395,7 @@ <h2>Test 11: Navigate to the next tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1486,7 +1473,7 @@ <h2>Test 12: Navigate to the next tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1536,7 +1523,7 @@ <h2>Test 13: Navigate to the previous tab in a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -1617,7 +1604,7 @@ <h2>Test 14: Navigate to the previous tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1698,7 +1685,7 @@ <h2>Test 15: Navigate to the previous tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1750,7 +1737,7 @@ <h2>Test 16: Navigate to the first tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1831,7 +1818,7 @@ <h2>Test 17: Navigate to the first tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1883,7 +1870,7 @@ <h2>Test 18: Navigate to the last tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -1961,7 +1948,7 @@ <h2>Test 19: Navigate to the last tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2011,7 +1998,7 @@ <h2>Test 20: Navigate forwards to a tab panel in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html?at=jaws">jaws</a></li>
@@ -2087,7 +2074,7 @@ <h2>Test 21: Navigate backwards to a tab panel in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html?at=jaws">jaws</a></li>
@@ -2163,7 +2150,7 @@ <h2>Test 22: Navigate forwards to a tab panel</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2213,7 +2200,7 @@ <h2>Test 23: Navigate backwards to a tab panel</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2263,7 +2250,7 @@ <h2>Test 24: Activate a tab in a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -2336,7 +2323,7 @@ <h2>Test 25: Activate a tab in a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2409,7 +2396,7 @@ <h2>Test 26: Activate a tab in a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2457,7 +2444,7 @@ <h2>Test 27: Delete a tab from a tab list in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html?at=jaws">jaws</a></li>
@@ -2538,7 +2525,7 @@ <h2>Test 28: Delete a tab from a tab list in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html?at=jaws">jaws</a></li>
@@ -2619,7 +2606,7 @@ <h2>Test 29: Delete a tab from a tab list</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/review/toggle-button.html b/build/review/toggle-button.html
index 551dd6eb1..c471f9c91 100644
--- a/build/review/toggle-button.html
+++ b/build/review/toggle-button.html
@@ -18,8 +18,10 @@
       }
 
     </style>
-    <script>
-      const filterATs = function(button) {
+    <script type="module">
+      import {TestWindow} from '../tests/resources/aria-at-test-window.mjs';
+
+      window.filterATs = function(button) {
         const val = button.value;
 
         if (val === 'all') {
@@ -54,21 +56,10 @@
 
           }
         }
-      }
-
-      function executeScriptInTestPage(setupScriptName, testPageWindow) {
-        if (testPageWindow.location.origin !== window.location.origin // make sure the origin is the same, and prevent this from firing on an 'about' page
-            || testPageWindow.document.readyState !== 'complete'
-        ) {
-          window.setTimeout(() => {
-            executeScriptInTestPage(setupScriptName, testPageWindow);
-          }, 100);
-          return;
-        }
+      };
 
-        if (setupScriptName) {
-          var scripts = {
-            	checkFirstCheckbox: function(testPageDocument){
+      var scripts = {
+        	checkFirstCheckbox: function(testPageDocument){
 	// Set aria-checked on first checkbox
 	testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
 },	moveFocusAndCheckFirstCheckbox: function(testPageDocument){
@@ -600,30 +591,26 @@
 	button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
 	button.focus();
 }
-          };
-
-          scripts[setupScriptName](testPageWindow.document);
-        }
-      }
-
-      function openTestPage(testPageUri, testNumber, setupScriptName) {
-        testPageWindow = window.open(testPageUri, '_blank', 'toolbar=0,location=0,menubar=0,width=400,height=400');
+      };
 
-        document.getElementById('open-test-page-' + testNumber).disabled = true;
+      window.openTestPage = function(testPageUri, testNumber, setupScriptName) {
+        var openTestPageElement = document.getElementById('open-test-page-' + testNumber);
 
-        // If the window is closed, re-enable open popup button
-        testPageWindow.onunload = function(event) {
-          window.setTimeout(() => {
-            if (testPageWindow.closed) {
-              testPageWindow = undefined;
-              document.getElementById('open-test-page-' + testNumber).disabled = false;
+        var testWindow = new TestWindow({
+          pageUri: testPageUri,
+          setupScriptName,
+          scripts,
+          hooks: {
+            windowOpened() {
+              openTestPageElement.disabled = true;
+            },
+            windowClosed() {
+              openTestPageElement.disabled = false;
             }
-          }, 100);
-
-        };
-
-        executeScriptInTestPage(setupScriptName, testPageWindow);
-      }
+          }
+        });
+        testWindow.open();
+      };
     </script>
   </head>
   <body>
@@ -643,7 +630,7 @@ <h2>Test 1: Navigate forwards to a not pressed toggle button in reading mode</h2
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -725,7 +712,7 @@ <h2>Test 2: Navigate backwards to a not pressed toggle button in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -807,7 +794,7 @@ <h2>Test 3: Navigate forwards to a not pressed toggle button in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -883,7 +870,7 @@ <h2>Test 4: Navigate backwards to a not pressed toggle button in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -959,7 +946,7 @@ <h2>Test 5: Navigate forwards to a not pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1010,7 +997,7 @@ <h2>Test 6: Navigate backwards to a not pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1061,7 +1048,7 @@ <h2>Test 7: Navigate forwards to a pressed toggle button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1143,7 +1130,7 @@ <h2>Test 8: Navigate backwards to a pressed toggle button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1225,7 +1212,7 @@ <h2>Test 9: Navigate forwards to a pressed toggle button in interaction mode</h2
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1301,7 +1288,7 @@ <h2>Test 10: Navigate backwards to a pressed toggle button in interaction mode</
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1377,7 +1364,7 @@ <h2>Test 11: Navigate forwards to a pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1428,7 +1415,7 @@ <h2>Test 12: Navigate backwards to a pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1479,7 +1466,7 @@ <h2>Test 13: Read information about a not pressed toggle button in reading mode<
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1557,7 +1544,7 @@ <h2>Test 14: Read information about a not pressed toggle button in interaction m
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1635,7 +1622,7 @@ <h2>Test 15: Read information about a not pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1685,7 +1672,7 @@ <h2>Test 16: Read information about a pressed toggle button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1763,7 +1750,7 @@ <h2>Test 17: Read information about a pressed toggle button in interaction mode<
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -1841,7 +1828,7 @@ <h2>Test 18: Read information about a pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1891,7 +1878,7 @@ <h2>Test 19: Operate a not pressed toggle button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -1965,7 +1952,7 @@ <h2>Test 20: Operate a not pressed toggle button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -2039,7 +2026,7 @@ <h2>Test 21: Operate a not pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2089,7 +2076,7 @@ <h2>Test 22: Operate a pressed toggle button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html?at=jaws">jaws</a></li>
@@ -2163,7 +2150,7 @@ <h2>Test 23: Operate a pressed toggle button in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html?at=jaws">jaws</a></li>
@@ -2237,7 +2224,7 @@ <h2>Test 24: Operate a pressed toggle button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Last edited: Wed Sep 22 17:19:56 2021 +0200</li>
+        <li>Last edited: Tue Sep 28 11:01:09 2021 -0400</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html
new file mode 100644
index 000000000..e369528ee
--- /dev/null
+++ b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Tri-State Checkbox Example</title>
+
+
+    <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
+
+
+    <link href="css/checkbox.css" rel="stylesheet">
+    <script src="js/controlledCheckbox.js" type="text/javascript"></script>
+    <script src="js/checkboxMixed.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // moveFocusAfterFirstCheckbox
+          // sets focus on a link after the first checkbox
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Tri-State Checkbox Example</h1>
+      <p>
+        This example demonstrates using the  <a href="https://w3c.github.io/aria-practices/#checkbox">Checkbox Design Pattern</a> to create a tri-state, or mixed-state, checkbox.
+        In this implementation, the mixed-state checkbox represents the state of a set of standard HTML checkboxes.
+        If none of the checkboxes in the set are checked, the mixed state checkbox is not checked, and if all members of the set are checked, the mixed state checkbox is checked.
+        If the set contains both some checked and unchecked checkboxes, the mixed state checkbox is partially checked.
+        Activating the tri-state checkbox changes the states of the checkboxes in the set.
+      </p>
+      <p>
+        This example also demonstrates use of <code>fieldset</code> and <code>Legend</code> elements for labeling the checkbox group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label" tabindex="-1">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+           <fieldset>
+              <legend>Sandwich Condiments</legend>
+                  <div
+                      role="checkbox"
+                      class="group_checkbox"
+                      aria-checked="mixed"
+                      aria-controls="cond1 cond2 cond3 cond4"
+                      tabindex="0"
+                  >
+                    All condiments
+
+                <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+                <ul class="checkboxes">
+                  <li><label><input type="checkbox" id="cond1">Lettuce</label></li>
+                  <li><label><input type="checkbox" id="cond2" checked>Tomato</label></li>
+                  <li><label><input type="checkbox" id="cond3">Mustard</label></li>
+                  <li><label><input type="checkbox" id="cond4">Sprouts</label></li>
+                </ul>
+          </fieldset>
+          <script type="text/javascript">
+            function checkboxFocus (event) {
+              event.currentTarget.parentNode.classList.add('focus');
+            };
+            function checkboxBlur (event) {
+              event.currentTarget.parentNode.classList.remove('focus');
+            };
+            window.onload = function () {
+              var i;
+              var mixed = document.querySelectorAll('[role="checkbox"]');
+              for (i = 0; i < mixed.length; i++) {
+                var m = new CheckboxMixed(mixed[i]);
+                m.init();
+              }
+              var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+              for (i = 0; i < checkboxes.length; i++) {
+                var cb = checkboxes[i];
+                cb.addEventListener('focus', checkboxFocus);
+                cb.addEventListener('blur', checkboxBlur);
+              }
+            };
+          </script>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html
new file mode 100644
index 000000000..a4a22955b
--- /dev/null
+++ b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Tri-State Checkbox Example</title>
+
+
+    <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
+
+
+    <link href="css/checkbox.css" rel="stylesheet">
+    <script src="js/controlledCheckbox.js" type="text/javascript"></script>
+    <script src="js/checkboxMixed.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // moveFocusBeforeFirstCheckbox
+          // sets focus on a link before the first checkbox
+          testPageDocument.querySelector('#beforelink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Tri-State Checkbox Example</h1>
+      <p>
+        This example demonstrates using the  <a href="https://w3c.github.io/aria-practices/#checkbox">Checkbox Design Pattern</a> to create a tri-state, or mixed-state, checkbox.
+        In this implementation, the mixed-state checkbox represents the state of a set of standard HTML checkboxes.
+        If none of the checkboxes in the set are checked, the mixed state checkbox is not checked, and if all members of the set are checked, the mixed state checkbox is checked.
+        If the set contains both some checked and unchecked checkboxes, the mixed state checkbox is partially checked.
+        Activating the tri-state checkbox changes the states of the checkboxes in the set.
+      </p>
+      <p>
+        This example also demonstrates use of <code>fieldset</code> and <code>Legend</code> elements for labeling the checkbox group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label" tabindex="-1">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+           <fieldset>
+              <legend>Sandwich Condiments</legend>
+                  <div
+                      role="checkbox"
+                      class="group_checkbox"
+                      aria-checked="mixed"
+                      aria-controls="cond1 cond2 cond3 cond4"
+                      tabindex="0"
+                  >
+                    All condiments
+
+                <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+                <ul class="checkboxes">
+                  <li><label><input type="checkbox" id="cond1">Lettuce</label></li>
+                  <li><label><input type="checkbox" id="cond2" checked>Tomato</label></li>
+                  <li><label><input type="checkbox" id="cond3">Mustard</label></li>
+                  <li><label><input type="checkbox" id="cond4">Sprouts</label></li>
+                </ul>
+          </fieldset>
+          <script type="text/javascript">
+            function checkboxFocus (event) {
+              event.currentTarget.parentNode.classList.add('focus');
+            };
+            function checkboxBlur (event) {
+              event.currentTarget.parentNode.classList.remove('focus');
+            };
+            window.onload = function () {
+              var i;
+              var mixed = document.querySelectorAll('[role="checkbox"]');
+              for (i = 0; i < mixed.length; i++) {
+                var m = new CheckboxMixed(mixed[i]);
+                m.init();
+              }
+              var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+              for (i = 0; i < checkboxes.length; i++) {
+                var cb = checkboxes[i];
+                cb.addEventListener('focus', checkboxFocus);
+                cb.addEventListener('blur', checkboxBlur);
+              }
+            };
+          </script>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html
new file mode 100644
index 000000000..7f0919521
--- /dev/null
+++ b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Tri-State Checkbox Example</title>
+
+
+    <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
+
+
+    <link href="css/checkbox.css" rel="stylesheet">
+    <script src="js/controlledCheckbox.js" type="text/javascript"></script>
+    <script src="js/checkboxMixed.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // moveFocusToAndUncheckFirstCheckbox
+          // sets focus on the first checkbox and sets its state to unchecked
+          const checkbox = testPageDocument.querySelector('[role="checkbox"]');
+          checkbox.setAttribute('aria-checked', 'false');
+          checkbox.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Tri-State Checkbox Example</h1>
+      <p>
+        This example demonstrates using the  <a href="https://w3c.github.io/aria-practices/#checkbox">Checkbox Design Pattern</a> to create a tri-state, or mixed-state, checkbox.
+        In this implementation, the mixed-state checkbox represents the state of a set of standard HTML checkboxes.
+        If none of the checkboxes in the set are checked, the mixed state checkbox is not checked, and if all members of the set are checked, the mixed state checkbox is checked.
+        If the set contains both some checked and unchecked checkboxes, the mixed state checkbox is partially checked.
+        Activating the tri-state checkbox changes the states of the checkboxes in the set.
+      </p>
+      <p>
+        This example also demonstrates use of <code>fieldset</code> and <code>Legend</code> elements for labeling the checkbox group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label" tabindex="-1">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+           <fieldset>
+              <legend>Sandwich Condiments</legend>
+                  <div
+                      role="checkbox"
+                      class="group_checkbox"
+                      aria-checked="mixed"
+                      aria-controls="cond1 cond2 cond3 cond4"
+                      tabindex="0"
+                  >
+                    All condiments
+
+                <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+                <ul class="checkboxes">
+                  <li><label><input type="checkbox" id="cond1">Lettuce</label></li>
+                  <li><label><input type="checkbox" id="cond2" checked>Tomato</label></li>
+                  <li><label><input type="checkbox" id="cond3">Mustard</label></li>
+                  <li><label><input type="checkbox" id="cond4">Sprouts</label></li>
+                </ul>
+          </fieldset>
+          <script type="text/javascript">
+            function checkboxFocus (event) {
+              event.currentTarget.parentNode.classList.add('focus');
+            };
+            function checkboxBlur (event) {
+              event.currentTarget.parentNode.classList.remove('focus');
+            };
+            window.onload = function () {
+              var i;
+              var mixed = document.querySelectorAll('[role="checkbox"]');
+              for (i = 0; i < mixed.length; i++) {
+                var m = new CheckboxMixed(mixed[i]);
+                m.init();
+              }
+              var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+              for (i = 0; i < checkboxes.length; i++) {
+                var cb = checkboxes[i];
+                cb.addEventListener('focus', checkboxFocus);
+                cb.addEventListener('blur', checkboxBlur);
+              }
+            };
+          </script>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToFirstCheckbox.html b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToFirstCheckbox.html
new file mode 100644
index 000000000..ad3fe491b
--- /dev/null
+++ b/build/tests/checkbox-tri-state/reference/checkbox-tri-state.moveFocusToFirstCheckbox.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Tri-State Checkbox Example</title>
+
+
+    <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
+
+
+    <link href="css/checkbox.css" rel="stylesheet">
+    <script src="js/controlledCheckbox.js" type="text/javascript"></script>
+    <script src="js/checkboxMixed.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // moveFocusToFirstCheckbox
+          // sets focus on the first checkbox
+          testPageDocument.querySelector('[role="checkbox"]').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Tri-State Checkbox Example</h1>
+      <p>
+        This example demonstrates using the  <a href="https://w3c.github.io/aria-practices/#checkbox">Checkbox Design Pattern</a> to create a tri-state, or mixed-state, checkbox.
+        In this implementation, the mixed-state checkbox represents the state of a set of standard HTML checkboxes.
+        If none of the checkboxes in the set are checked, the mixed state checkbox is not checked, and if all members of the set are checked, the mixed state checkbox is checked.
+        If the set contains both some checked and unchecked checkboxes, the mixed state checkbox is partially checked.
+        Activating the tri-state checkbox changes the states of the checkboxes in the set.
+      </p>
+      <p>
+        This example also demonstrates use of <code>fieldset</code> and <code>Legend</code> elements for labeling the checkbox group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label" tabindex="-1">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+           <fieldset>
+              <legend>Sandwich Condiments</legend>
+                  <div
+                      role="checkbox"
+                      class="group_checkbox"
+                      aria-checked="mixed"
+                      aria-controls="cond1 cond2 cond3 cond4"
+                      tabindex="0"
+                  >
+                    All condiments
+
+                <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+                <ul class="checkboxes">
+                  <li><label><input type="checkbox" id="cond1">Lettuce</label></li>
+                  <li><label><input type="checkbox" id="cond2" checked>Tomato</label></li>
+                  <li><label><input type="checkbox" id="cond3">Mustard</label></li>
+                  <li><label><input type="checkbox" id="cond4">Sprouts</label></li>
+                </ul>
+          </fieldset>
+          <script type="text/javascript">
+            function checkboxFocus (event) {
+              event.currentTarget.parentNode.classList.add('focus');
+            };
+            function checkboxBlur (event) {
+              event.currentTarget.parentNode.classList.remove('focus');
+            };
+            window.onload = function () {
+              var i;
+              var mixed = document.querySelectorAll('[role="checkbox"]');
+              for (i = 0; i < mixed.length; i++) {
+                var m = new CheckboxMixed(mixed[i]);
+                m.init();
+              }
+              var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+              for (i = 0; i < checkboxes.length; i++) {
+                var cb = checkboxes[i];
+                cb.addEventListener('focus', checkboxFocus);
+                cb.addEventListener('blur', checkboxBlur);
+              }
+            };
+          </script>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-jaws.collected.json
index 114b5af73..821461d34 100644
--- a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-nvda.collected.json
index 536c3026d..65e3898a4 100644
--- a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html
index dafe33c18..632f3be95 100644
--- a/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html
+++ b/build/tests/checkbox-tri-state/test-01-navigate-forwards-to-partially-checked-checkbox-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-jaws.collected.json
index 3314d7b8e..c7d89db62 100644
--- a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-nvda.collected.json
index a08eebc31..b2825cfae 100644
--- a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html
index 5da97e5e2..48319c4ad 100644
--- a/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html
+++ b/build/tests/checkbox-tri-state/test-02-navigate-backwards-to-partially-checked-checkbox-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-jaws.collected.json
index 7ef3634a9..2cd094ee0 100644
--- a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-nvda.collected.json
index 3d289201a..d0f1d2e28 100644
--- a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html
index a38a9a01d..c4f2d1698 100644
--- a/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-03-navigate-forwards-to-partially-checked-checkbox-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-jaws.collected.json
index 865e7bb91..4cc385905 100644
--- a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-nvda.collected.json
index 27017eb70..0598ca62a 100644
--- a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html
index 0c09b603c..7ff904691 100644
--- a/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-04-navigate-backwards-to-partially-checked-checkbox-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
index 89dd043d9..e6c1f029e 100644
--- a/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html
index 0b8a1913b..ae391e176 100644
--- a/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-05-navigate-forwards-to-partially-checked-checkbox-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
index 9c5bd2de0..336371f6a 100644
--- a/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html
index c66cb6925..ed3f3aded 100644
--- a/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-06-navigate-backwards-to-partially-checked-checkbox-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-jaws.collected.json
index 71813fcbd..0748429b8 100644
--- a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-nvda.collected.json
index 0b3a7cb23..a08ae1a76 100644
--- a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html
index 54abc67ed..2c840531f 100644
--- a/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html
+++ b/build/tests/checkbox-tri-state/test-07-operate-partially-checked-checkbox-reading.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-jaws.collected.json
index 08369ef6f..01dc5f260 100644
--- a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-nvda.collected.json
index 733c18c8c..b791c6dc9 100644
--- a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html
index 40a6a3ddf..47232a7c4 100644
--- a/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-08-operate-partially-checked-checkbox-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction-voiceover_macos.collected.json
index 99a13a9b9..fedeff695 100644
--- a/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html
index 2c623cbea..a22177acb 100644
--- a/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-09-operate-partially-checked-checkbox-interaction.html
@@ -55,7 +55,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-jaws.collected.json
index 7d2bd8574..c41bd62d8 100644
--- a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToAndUncheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to unchecked",
diff --git a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-nvda.collected.json
index 0b89d7eb2..47659d0b7 100644
--- a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToAndUncheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to unchecked",
diff --git a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html
index fc660dd93..7abcf504a 100644
--- a/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html
+++ b/build/tests/checkbox-tri-state/test-10-operate-unchecked-checked-checkbox-reading.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-jaws.collected.json
index c07552357..42adc2d9d 100644
--- a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToAndUncheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to unchecked",
diff --git a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-nvda.collected.json
index b74d11cf0..82c08ffe5 100644
--- a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToAndUncheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to unchecked",
diff --git a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html
index 87abdc727..37a2b2af4 100644
--- a/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-11-operate-unchecked-checked-checkbox-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction-voiceover_macos.collected.json
index 88db17a15..dd80ea529 100644
--- a/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToAndUncheckFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html
index 58d47f9c1..def60a304 100644
--- a/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-12-operate-unchecked-checked-checkbox-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToAndUncheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-jaws.collected.json
index 4e1d9e799..2e8307e9f 100644
--- a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-nvda.collected.json
index 74e43971b..4f8918e27 100644
--- a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html
index 53a8fcbfa..c25f2806a 100644
--- a/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html
+++ b/build/tests/checkbox-tri-state/test-13-read-partially-checked-checkbox-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-jaws.collected.json
index ab8fe7352..de8f95cfa 100644
--- a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-nvda.collected.json
index df3ad8940..808f71a5e 100644
--- a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html
index c91aca594..b9a30596e 100644
--- a/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-14-read-partially-checked-checkbox-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction-voiceover_macos.collected.json
index 3d60abb97..2e9ad14e4 100644
--- a/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html b/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html
index fa87467a3..a68a83fef 100644
--- a/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html
+++ b/build/tests/checkbox-tri-state/test-15-read-partially-checked-checkbox-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-jaws.collected.json
index 418fe0003..a266c9029 100644
--- a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-nvda.collected.json
index 5b0dce1ba..84a20ec43 100644
--- a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html
index 04d49fc72..af1487847 100644
--- a/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html
+++ b/build/tests/checkbox-tri-state/test-16-read-checkbox-group-reading.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-jaws.collected.json
index bf7299810..f344ab01a 100644
--- a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-nvda.collected.json
index 64777bf51..66ccb0b44 100644
--- a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html
index c5305fcca..d8efcae30 100644
--- a/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-17-read-checkbox-group-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction-voiceover_macos.collected.json
index be35e7e80..5dfafa20c 100644
--- a/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html
index ff18a273b..a7d558722 100644
--- a/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-18-read-checkbox-group-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-jaws.collected.json
index 30941701d..436afb4f0 100644
--- a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-nvda.collected.json
index 7911f2db1..9b1d214d9 100644
--- a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html
index 76f9aa91f..720f3c4fb 100644
--- a/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html
+++ b/build/tests/checkbox-tri-state/test-19-navigate-forwards-into-checkbox-group-reading.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-jaws.collected.json b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-jaws.collected.json
index c11710fe9..da79dafbc 100644
--- a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-nvda.collected.json b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-nvda.collected.json
index d2a70608f..86ee36291 100644
--- a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html
index f1efc3cc7..686e4a2a9 100644
--- a/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html
+++ b/build/tests/checkbox-tri-state/test-20-navigate-backwards-out-of-checkbox-group-reading.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-jaws.collected.json
index 048f84394..da4d594ca 100644
--- a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-nvda.collected.json
index f0245c1c6..62b8fbdd6 100644
--- a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html
index 0b34f75c5..4a82ed139 100644
--- a/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-21-navigate-forwards-into-checkbox-group-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-jaws.collected.json b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-jaws.collected.json
index 1818c3a88..6a3d6145a 100644
--- a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-jaws.collected.json
+++ b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-nvda.collected.json b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-nvda.collected.json
index 32cf69cc7..813cdd7f6 100644
--- a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-nvda.collected.json
+++ b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html
index fd838c25b..2a7c22306 100644
--- a/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-22-navigate-backwards-out-of-checkbox-group-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction-voiceover_macos.collected.json
index 76e5555af..321852fe5 100644
--- a/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstCheckbox",
       "description": "sets focus on a link before the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html
index 6dbb7379c..c5aee3527 100644
--- a/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-23-navigate-forwards-into-checkbox-group-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusBeforeFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction-voiceover_macos.collected.json b/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction-voiceover_macos.collected.json
index 7c2162eff..0bb51fd91 100644
--- a/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/checkbox-tri-state.html",
+    "referencePage": "reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAfterFirstCheckbox",
       "description": "sets focus on a link after the first checkbox",
diff --git a/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html b/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html
index 2ce0d6d2d..8afa82b3d 100644
--- a/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html
+++ b/build/tests/checkbox-tri-state/test-24-navigate-backwards-out-of-checkbox-group-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/checkbox-tri-state.html");
+    displayTestPageAndInstructions("reference/checkbox-tri-state.moveFocusAfterFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html
new file mode 100644
index 000000000..f7da95cbd
--- /dev/null
+++ b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Checkbox Example (Two State) | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../../css/core.css" >
+  <script src="../../js/examples.js"></script>
+  <script src="../../js/highlight.pack.js"></script>
+  <script src="../../js/app.js"></script>
+
+  <link href="../css/checkbox.css" rel="stylesheet" >
+  <script src="js/checkbox.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // checkFirstCheckbox
+        // Set aria-checked on first checkbox
+        testPageDocument.querySelector('[role="checkbox"]').setAttribute('aria-checked', 'true');
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Checkbox Example (Two State)</h1>
+
+  <div id="ex1">
+        <h3 id="id-group-label">Sandwich Condiments</h3>
+        <div role="group" aria-labelledby="id-group-label">
+          <ul class="checkboxes">
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Lettuce</div></li>
+            <li><div role="checkbox" aria-checked="true"  tabindex= "0">Tomato</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Mustard</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Sprouts</div></li>
+          </ul>
+        </div>
+
+        <script type="text/javascript">
+          window.onload = function () {
+
+            var checkboxes = document.querySelectorAll('[role="checkbox"]');
+
+            for (var i = 0; i < checkboxes.length; i++) {
+              var cb = new Checkbox(checkboxes[i]);
+              cb.init();
+            }
+
+          };
+        </script>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+
+      </div>
+</body>
+</html>
diff --git a/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html
new file mode 100644
index 000000000..388016652
--- /dev/null
+++ b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Checkbox Example (Two State) | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../../css/core.css" >
+  <script src="../../js/examples.js"></script>
+  <script src="../../js/highlight.pack.js"></script>
+  <script src="../../js/app.js"></script>
+
+  <link href="../css/checkbox.css" rel="stylesheet" >
+  <script src="js/checkbox.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusAndCheckFirstCheckbox
+        // Move focus and set aria-checked on first checkbox
+        const checkbox = testPageDocument.querySelector('[role="checkbox"]');
+        checkbox.focus();
+        checkbox.setAttribute('aria-checked', 'true');
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Checkbox Example (Two State)</h1>
+
+  <div id="ex1">
+        <h3 id="id-group-label">Sandwich Condiments</h3>
+        <div role="group" aria-labelledby="id-group-label">
+          <ul class="checkboxes">
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Lettuce</div></li>
+            <li><div role="checkbox" aria-checked="true"  tabindex= "0">Tomato</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Mustard</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Sprouts</div></li>
+          </ul>
+        </div>
+
+        <script type="text/javascript">
+          window.onload = function () {
+
+            var checkboxes = document.querySelectorAll('[role="checkbox"]');
+
+            for (var i = 0; i < checkboxes.length; i++) {
+              var cb = new Checkbox(checkboxes[i]);
+              cb.init();
+            }
+
+          };
+        </script>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+
+      </div>
+</body>
+</html>
diff --git a/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html
new file mode 100644
index 000000000..2bb8f8734
--- /dev/null
+++ b/build/tests/checkbox/reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Checkbox Example (Two State) | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../../css/core.css" >
+  <script src="../../js/examples.js"></script>
+  <script src="../../js/highlight.pack.js"></script>
+  <script src="../../js/app.js"></script>
+
+  <link href="../css/checkbox.css" rel="stylesheet" >
+  <script src="js/checkbox.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToFirstCheckbox
+        // Move focus to first checkbox
+        testPageDocument.querySelector('[role="checkbox"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Checkbox Example (Two State)</h1>
+
+  <div id="ex1">
+        <h3 id="id-group-label">Sandwich Condiments</h3>
+        <div role="group" aria-labelledby="id-group-label">
+          <ul class="checkboxes">
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Lettuce</div></li>
+            <li><div role="checkbox" aria-checked="true"  tabindex= "0">Tomato</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Mustard</div></li>
+            <li><div role="checkbox" aria-checked="false" tabindex= "0">Sprouts</div></li>
+          </ul>
+        </div>
+
+        <script type="text/javascript">
+          window.onload = function () {
+
+            var checkboxes = document.querySelectorAll('[role="checkbox"]');
+
+            for (var i = 0; i < checkboxes.length; i++) {
+              var cb = new Checkbox(checkboxes[i]);
+              cb.init();
+            }
+
+          };
+        </script>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+
+      </div>
+</body>
+</html>
diff --git a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-jaws.collected.json
index 135b37b98..7d27928e4 100644
--- a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html",
     "setupScript": {
       "name": "checkFirstCheckbox",
       "description": "sets the state of the first checkbox to checked",
diff --git a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-nvda.collected.json
index 6c1e00e02..0af7d120c 100644
--- a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html",
     "setupScript": {
       "name": "checkFirstCheckbox",
       "description": "sets the state of the first checkbox to checked",
diff --git a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
index 711751d38..7d7ed74a6 100644
--- a/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
+++ b/build/tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-jaws.collected.json
index be5f002ea..9db891841 100644
--- a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html",
     "setupScript": {
       "name": "checkFirstCheckbox",
       "description": "sets the state of the first checkbox to checked",
diff --git a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-nvda.collected.json
index 666a8d4de..5deba37c1 100644
--- a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html",
     "setupScript": {
       "name": "checkFirstCheckbox",
       "description": "sets the state of the first checkbox to checked",
diff --git a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
index bd593efcc..14b8cea63 100644
--- a/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction-voiceover_macos.collected.json
index 458937ebb..a95cff0b4 100644
--- a/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html",
     "setupScript": {
       "name": "checkFirstCheckbox",
       "description": "sets the state of the first checkbox to checked",
diff --git a/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html b/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
index 00d6e0cdb..b4072c6cd 100644
--- a/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.checkFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-jaws.collected.json b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-jaws.collected.json
index 838b8a8b3..104a02973 100644
--- a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-nvda.collected.json b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-nvda.collected.json
index 1d28bc93f..0321cef1b 100644
--- a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading.html b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
index 03f2960f3..5ac80d041 100644
--- a/build/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
+++ b/build/tests/checkbox/test-10-read-unchecked-checkbox-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-jaws.collected.json
index 41dc6acce..d96c1baf7 100644
--- a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-nvda.collected.json
index 2c4310ade..1f28a18de 100644
--- a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
index e6b393666..ff08d389b 100644
--- a/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-11-read-unchecked-checkbox-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction-voiceover_macos.collected.json
index a3e0c2997..0883366ed 100644
--- a/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusToFirstCheckbox",
       "description": "sets focus on the first checkbox",
diff --git a/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html b/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
index e2424c2b0..ff6730d0b 100644
--- a/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-12-read-unchecked-checkbox-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusToFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-13-read-checked-checkbox-reading-jaws.collected.json b/build/tests/checkbox/test-13-read-checked-checkbox-reading-jaws.collected.json
index f8ad328f6..33a48ee69 100644
--- a/build/tests/checkbox/test-13-read-checked-checkbox-reading-jaws.collected.json
+++ b/build/tests/checkbox/test-13-read-checked-checkbox-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAndCheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to checked",
diff --git a/build/tests/checkbox/test-13-read-checked-checkbox-reading-nvda.collected.json b/build/tests/checkbox/test-13-read-checked-checkbox-reading-nvda.collected.json
index efadc56b2..f4a303ce6 100644
--- a/build/tests/checkbox/test-13-read-checked-checkbox-reading-nvda.collected.json
+++ b/build/tests/checkbox/test-13-read-checked-checkbox-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAndCheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to checked",
diff --git a/build/tests/checkbox/test-13-read-checked-checkbox-reading.html b/build/tests/checkbox/test-13-read-checked-checkbox-reading.html
index 316ab39b7..bc1ca0121 100644
--- a/build/tests/checkbox/test-13-read-checked-checkbox-reading.html
+++ b/build/tests/checkbox/test-13-read-checked-checkbox-reading.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-14-read-checked-checkbox-interaction-jaws.collected.json b/build/tests/checkbox/test-14-read-checked-checkbox-interaction-jaws.collected.json
index 34b481387..80d0900ca 100644
--- a/build/tests/checkbox/test-14-read-checked-checkbox-interaction-jaws.collected.json
+++ b/build/tests/checkbox/test-14-read-checked-checkbox-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAndCheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to checked",
diff --git a/build/tests/checkbox/test-14-read-checked-checkbox-interaction-nvda.collected.json b/build/tests/checkbox/test-14-read-checked-checkbox-interaction-nvda.collected.json
index 1abc3138a..b907891f8 100644
--- a/build/tests/checkbox/test-14-read-checked-checkbox-interaction-nvda.collected.json
+++ b/build/tests/checkbox/test-14-read-checked-checkbox-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAndCheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to checked",
diff --git a/build/tests/checkbox/test-14-read-checked-checkbox-interaction.html b/build/tests/checkbox/test-14-read-checked-checkbox-interaction.html
index 15ec2d453..6dbdadc40 100644
--- a/build/tests/checkbox/test-14-read-checked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-14-read-checked-checkbox-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/checkbox/test-15-read-checked-checkbox-interaction-voiceover_macos.collected.json b/build/tests/checkbox/test-15-read-checked-checkbox-interaction-voiceover_macos.collected.json
index 6924a7ab3..8aaafce92 100644
--- a/build/tests/checkbox/test-15-read-checked-checkbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/checkbox/test-15-read-checked-checkbox-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.html",
+    "referencePage": "reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html",
     "setupScript": {
       "name": "moveFocusAndCheckFirstCheckbox",
       "description": "sets focus on the first checkbox and sets its state to checked",
diff --git a/build/tests/checkbox/test-15-read-checked-checkbox-interaction.html b/build/tests/checkbox/test-15-read-checked-checkbox-interaction.html
index debf182ca..a14842353 100644
--- a/build/tests/checkbox/test-15-read-checked-checkbox-interaction.html
+++ b/build/tests/checkbox/test-15-read-checked-checkbox-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175030/checkbox-1/checkbox-1.moveFocusAndCheckFirstCheckbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html
new file mode 100644
index 000000000..1875a8491
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusAfterCombobox
+      // sets focus on a link after the Combobox
+      testPageDocument.querySelector('#cb1-button').style.display = 'none';
+      testPageDocument.querySelector('#afterlink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html
new file mode 100644
index 000000000..41388f16a
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusAfterComboboxAndSetValueToAlabama
+      // sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'
+      testPageDocument.querySelector('#cb1-button').style.display = 'none';
+      testPageDocument.defaultView.comboboxController.setValue('Alabama');
+      testPageDocument.querySelector('#afterlink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html
new file mode 100644
index 000000000..e3c090ad8
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusBeforeCombobox
+      // sets focus on a link before the Combobox
+      testPageDocument.querySelector('#beforelink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html
new file mode 100644
index 000000000..668fbd2ae
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusBeforeComboboxAndSetValueToAlabama
+      // sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'
+      testPageDocument.defaultView.comboboxController.setValue('Alabama');
+      testPageDocument.querySelector('#beforelink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html
new file mode 100644
index 000000000..7175c2f83
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAlabamaInListbox
+      // expands the Combobox and places focus on 'Alabama' in the listbox popup
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+      testPageDocument.defaultView.comboboxController.setVisualFocusListbox();
+      let opt = testPageDocument.querySelector('#lb1-al');
+      testPageDocument.defaultView.comboboxController.setOption(opt, true);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html
new file mode 100644
index 000000000..d4646283d
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning
+      // expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+      testPageDocument.defaultView.comboboxController.setVisualFocusListbox();
+      let opt = testPageDocument.querySelector('#lb1-al');
+      testPageDocument.defaultView.comboboxController.setOption(opt, true);
+      testPageDocument.defaultView.comboboxController.comboboxNode.setSelectionRange(0, 0);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html
new file mode 100644
index 000000000..b735e3071
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAlabamaInListboxAndSetInputCursorAtEnd
+      // expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+      testPageDocument.defaultView.comboboxController.setVisualFocusListbox();
+      let opt = testPageDocument.querySelector('#lb1-al');
+      let optTextLength = opt.textContent.length;
+      testPageDocument.defaultView.comboboxController.setOption(opt, true);
+      testPageDocument.defaultView.comboboxController.comboboxNode.setSelectionRange(
+        optTextLength,
+        optTextLength
+      );
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html
new file mode 100644
index 000000000..b92224571
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAlaskaInListbox
+      // expands the combobox, sets the combobox value to 'Alaska' and places focus on that option in the listbox popup
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+      testPageDocument.defaultView.comboboxController.setVisualFocusListbox();
+      let opt = testPageDocument.querySelector('#lb1-ak');
+      testPageDocument.defaultView.comboboxController.setOption(opt, true);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html
new file mode 100644
index 000000000..064f8b8cc
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAndExpandCombobox
+      // sets focus on and expands the combobox
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html
new file mode 100644
index 000000000..3c7f988de
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAndExpandComboboxAndSetValueToA
+      // sets focus on and expands the combobox, and sets the combobox value to 'a'
+      testPageDocument.defaultView.comboboxController.setValue('a');
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.select();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html
new file mode 100644
index 000000000..16bcd0eab
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected
+      // sets focus on and expands the combobox, sets the combobox value to 'a', and de-selects all text in the input
+      testPageDocument.defaultView.comboboxController.setValue('a');
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html
new file mode 100644
index 000000000..26921c7a8
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAndExpandComboboxAndSetValueToAlabama
+      // sets focus on and expands the combobox, and sets the combobox value to 'Alabama'
+      testPageDocument.defaultView.comboboxController.setValue('Alabama');
+      testPageDocument.defaultView.comboboxController.open();
+      testPageDocument.defaultView.comboboxController.comboboxNode.select();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html
new file mode 100644
index 000000000..6fc5fb052
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToCombobox
+      // sets focus on the combobox
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html
new file mode 100644
index 000000000..72dad14e9
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToComboboxAndSetValueToA
+      // sets focus on the combobox, and sets the combobox value to 'a'
+      testPageDocument.defaultView.comboboxController.setValue('a');
+      testPageDocument.defaultView.comboboxController.comboboxNode.select();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html
new file mode 100644
index 000000000..22323c16f
--- /dev/null
+++ b/build/tests/combobox-autocomplete-both-updated/reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Editable Combobox With Both List and Inline Autocomplete Example</title>
+
+
+<link rel="stylesheet" href="css/combobox-autocomplete.css">
+<script type="text/javascript" src="js/combobox-autocomplete.js"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToComboboxAndSetValueToAlabama
+      // sets focus on the combobox, and sets the combobox value to 'Alabama'
+      testPageDocument.defaultView.comboboxController.setValue('Alabama');
+      testPageDocument.defaultView.comboboxController.comboboxNode.select();
+      testPageDocument.defaultView.comboboxController.comboboxNode.focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Editable Combobox With Both List and Inline Autocomplete Example</h1>
+    <p>
+      The below combobox for choosing the name of a US state or territory demonstrates the
+      <a href="https://w3c.github.io/aria-practices/#combobox">design pattern for combobox.</a>
+      The design pattern describes four types of autocomplete behavior.
+      This example illustrates the autocomplete behavior referred to in the pattern as list with inline completion.
+      If the user types one or more characters in the edit box and the typed characters match the beginning of the name of one or more states or territories,
+      a listbox popup appears containing the matching names, and the first match is automatically selected.
+      In addition, the portion of the selected suggestion that has not been typed by the user, a completion string, appears inline after the input cursor in the textbox.
+      The automatically selected suggestion becomes the value of the textbox when the combobox loses focus unless the user chooses a different suggestion or changes the character string in the textbox.
+      Note that this implementation enables users to input the name of a state or territory, but it does not prevent input of any other arbitrary value.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label for="cb1-input">State</label>
+        <div class="combobox combobox-list">
+          <div class="group">
+            <input id="cb1-input" class="cb_edit" type="text" role="combobox" aria-autocomplete="both"
+              aria-expanded="false" aria-controls="cb1-listbox">
+            <button type="button" id="cb1-button" aria-label="States" aria-expanded="false" aria-controls="cb1-listbox" tabindex="-1">
+              <span class="arrow">
+                <svg width="18" height="16" aria-hidden="true" focusable="false">
+                  <polygon class="outline" points="1,4 17,4 9,15"></polygon>
+                  <polygon class="arrow" points="3,5 15,5 9,13"></polygon>
+                </svg>
+              </span>
+            </button>
+          </div>
+          <ul id="cb1-listbox" role="listbox" aria-label="States">
+            <li id="lb1-al" role="option">Alabama</li>
+            <li id="lb1-ak" role="option">Alaska</li>
+            <li id="lb1-as" role="option">American Samoa</li>
+            <li id="lb1-az" role="option">Arizona</li>
+            <li id="lb1-ar" role="option">Arkansas</li>
+            <li id="lb1-ca" role="option">California</li>
+            <li id="lb1-co" role="option">Colorado</li>
+            <li id="lb1-ct" role="option">Connecticut</li>
+            <li id="lb1-de" role="option">Delaware</li>
+            <li id="lb1-dc" role="option">District of Columbia</li>
+            <li id="lb1-fl" role="option">Florida</li>
+            <li id="lb1-ga" role="option">Georgia</li>
+            <li id="lb1-gm" role="option">Guam</li>
+            <li id="lb1-hi" role="option">Hawaii</li>
+            <li id="lb1-id" role="option">Idaho</li>
+            <li id="lb1-il" role="option">Illinois</li>
+            <li id="lb1-in" role="option">Indiana</li>
+            <li id="lb1-ia" role="option">Iowa</li>
+            <li id="lb1-ks" role="option">Kansas</li>
+            <li id="lb1-ky" role="option">Kentucky</li>
+            <li id="lb1-la" role="option">Louisiana</li>
+            <li id="lb1-me" role="option">Maine</li>
+            <li id="lb1-md" role="option">Maryland</li>
+            <li id="lb1-ma" role="option">Massachusetts</li>
+            <li id="lb1-mi" role="option">Michigan</li>
+            <li id="lb1-mn" role="option">Minnesota</li>
+            <li id="lb1-ms" role="option">Mississippi</li>
+            <li id="lb1-mo" role="option">Missouri</li>
+            <li id="lb1-mt" role="option">Montana</li>
+            <li id="lb1-ne" role="option">Nebraska</li>
+            <li id="lb1-nv" role="option">Nevada</li>
+            <li id="lb1-nh" role="option">New Hampshire</li>
+            <li id="lb1-nj" role="option">New Jersey</li>
+            <li id="lb1-nm" role="option">New Mexico</li>
+            <li id="lb1-ny" role="option">New York</li>
+            <li id="lb1-nc" role="option">North Carolina</li>
+            <li id="lb1-nd" role="option">North Dakota</li>
+            <li id="lb1-mp" role="option">Northern Marianas Islands</li>
+            <li id="lb1-oh" role="option">Ohio</li>
+            <li id="lb1-ok" role="option">Oklahoma</li>
+            <li id="lb1-or" role="option">Oregon</li>
+            <li id="lb1-pa" role="option">Pennsylvania</li>
+            <li id="lb1-pr" role="option">Puerto Rico</li>
+            <li id="lb1-ri" role="option">Rhode Island</li>
+            <li id="lb1-sc" role="option">South Carolina</li>
+            <li id="lb1-sd" role="option">South Dakota</li>
+            <li id="lb1-tn" role="option">Tennessee</li>
+            <li id="lb1-tx" role="option">Texas</li>
+            <li id="lb1-ut" role="option">Utah</li>
+            <li id="lb1-ve" role="option">Vermont</li>
+            <li id="lb1-va" role="option">Virginia</li>
+            <li id="lb1-vi" role="option">Virgin Islands</li>
+            <li id="lb1-wa" role="option">Washington</li>
+            <li id="lb1-wv" role="option">West Virginia</li>
+            <li id="lb1-wi" role="option">Wisconsin</li>
+            <li id="lb1-wy" role="option">Wyoming</li>
+          </ul>
+        </div>
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-jaws.collected.json
index d8f1a18bf..ef32baa28 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-nvda.collected.json
index b0377101e..5e64ea8cd 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html
index 044ab2648..a5a037573 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-01-navigate-forwards-to-empty-collapsed-combobox-reading.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-jaws.collected.json
index d2a82b8f8..ed5b2d4e1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-nvda.collected.json
index 478d64c73..e8ff5ccfd 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html
index 9ebd217af..474b02a8e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-02-navigate-backwards-to-empty-collapsed-combobox-reading.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
index 52d94e307..501a8d1f7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
index 183556f06..377e2095e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html
index 2bb90ec20..c9405ea61 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-03-navigate-forwards-to-empty-collapsed-combobox-interaction.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
index 15ca9699e..0d6fe9e53 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
index de008b154..25f4e4cb4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html
index d6223af06..fc8d86067 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-04-navigate-backwards-to-empty-collapsed-combobox-interaction.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
index 00a0101cd..fa698fa89 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html
index 2a90364f0..66b53f701 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-05-navigate-forwards-to-empty-collapsed-combobox-interaction.html
@@ -86,7 +86,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
index e0ae74f29..67651d8ae 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html
index 475cfa592..0ca9f58e4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-06-navigate-backwards-to-empty-collapsed-combobox-interaction.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-jaws.collected.json
index 380560f1e..4f6fde5ed 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-nvda.collected.json
index 763a6dcd4..924ab2220 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html
index 2557c6d4f..e67a208d7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-07-read-information-about-empty-collapsed-combobox-reading.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-jaws.collected.json
index e5e96f5aa..185bacf40 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-nvda.collected.json
index 8671336c8..6a807d4de 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html
index ab741c21f..9f757d1eb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-08-read-information-about-empty-collapsed-combobox-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
index 8952b50b1..5d4db9667 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html
index 8e75015db..834744947 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-09-read-information-about-empty-collapsed-combobox-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
index 0e20ea3ca..0d92c4747 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusBeforeComboboxAndSetValueToAlabama",
       "description": "sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
index c207d5765..7f34857b4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusBeforeComboboxAndSetValueToAlabama",
       "description": "sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html
index 9faa282e1..e3dc86c44 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-10-navigate-forwards-to-filled-in-collapsed-combobox-reading.html
@@ -96,7 +96,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
index 61772b3c7..d8772eab4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusAfterComboboxAndSetValueToAlabama",
       "description": "sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
index b55b9615f..a8ffd02a7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusAfterComboboxAndSetValueToAlabama",
       "description": "sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html
index e6a0df7f0..e31cf8ab9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-11-navigate-backwards-to-filled-in-collapsed-combobox-reading.html
@@ -97,7 +97,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
index 0e53fbbbe..d97e4a259 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusBeforeComboboxAndSetValueToAlabama",
       "description": "sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
index df4878c5b..c35231461 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusBeforeComboboxAndSetValueToAlabama",
       "description": "sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
index bc9e3673b..9c74b1010 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-12-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
@@ -96,7 +96,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
index 4a949ec24..6637448a5 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusAfterComboboxAndSetValueToAlabama",
       "description": "sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
index 79a63d107..1254100c2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusAfterComboboxAndSetValueToAlabama",
       "description": "sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
index 7e94a87ce..e83bfdc7f 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-13-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
@@ -97,7 +97,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
index ea9bd2ab6..4f1c55156 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusBeforeComboboxAndSetValueToAlabama",
       "description": "sets focus on a link before the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
index 4d1ab01f1..ec2a6905d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-14-navigate-forwards-to-filled-in-collapsed-combobox-interaction.html
@@ -95,7 +95,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusBeforeComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
index 16e226bb1..4f70f0d74 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusAfterComboboxAndSetValueToAlabama",
       "description": "sets focus on a link after the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
index 78c014bb8..d2197225c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-15-navigate-backwards-to-filled-in-collapsed-combobox-interaction.html
@@ -96,7 +96,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusAfterComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-jaws.collected.json
index 9d09c8d1e..9e92fd91d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-nvda.collected.json
index 37d32d7ec..7e8948f5b 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html
index 8f64d27e7..1ab0db983 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-16-read-information-about-filled-in-collapsed-combobox-reading.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-jaws.collected.json
index dbfe6a97a..8027cc43b 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-nvda.collected.json
index a422db160..b8c5a1416 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html
index 96e63a152..a7e69c4eb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-17-read-information-about-filled-in-collapsed-combobox-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
index e89222e5c..70246654d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html
index 62c4bfb2a..8099e3fc7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-18-read-information-about-filled-in-collapsed-combobox-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-jaws.collected.json
index 5473f43cd..5cf7b364a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-nvda.collected.json
index 44d84f1e6..79d3d002a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html
index ef98d8fae..e4fb90646 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-19-open-empty-collapsed-combobox-reading.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-jaws.collected.json
index 02c35de07..e4ea8393a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-nvda.collected.json
index a1ff05af3..f50f64d03 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html
index f5626ce96..1c0353025 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-20-open-empty-collapsed-combobox-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
index aa33a4ba5..637c4f2d9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html
index 41f7f85b7..fff375217 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-21-open-empty-collapsed-combobox-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-jaws.collected.json
index 2b3e510bf..e2582e139 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-nvda.collected.json
index f250fd483..b60cb0950 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html
index d3d4f0a74..0a19dbdb1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-22-open-filled-in-collapsed-combobox-reading.html
@@ -55,7 +55,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-jaws.collected.json
index ce98c24c2..76b028a95 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-nvda.collected.json
index bcf0a829f..113846f2a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html
index d967d851a..5c60d44f8 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-23-open-filled-in-collapsed-combobox-interaction.html
@@ -55,7 +55,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
index 17ad6e554..55698349c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToAlabama",
       "description": "sets focus on the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html
index 5ef1fc452..17e0c2f7d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-24-open-filled-in-collapsed-combobox-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
index ae1eb49a5..bcaaa8ede 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
index 0d8fa8b4c..597ff83e0 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html
index a4407ac64..07d778fcd 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-25-open-empty-collapsed-combobox-by-typing-character-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
index e53ecc877..be66dbb05 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html
index 2c9d0827f..8077c13eb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-26-open-an-empty-collapsed-combobox-by-typing-character-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
index 7923c8424..437bbf3fe 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
index 79f500e75..9fa5afafa 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html
index f89ac7628..9200ba313 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-27-open-a-filled-in-collapsed-combobox-by-typing-character-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
index 633c2ebaf..0ef18ee23 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html
index 9db2e1cd3..a0fcc73ca 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-28-open-filled-in-collapsed-combobox-by-typing-character-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-jaws.collected.json
index 829d9f86d..917338742 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-nvda.collected.json
index 2f95a7b9a..54c1db5a1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html
index c61a08894..1fd67ead1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-29-read-information-about-empty-expanded-combobox-reading.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-jaws.collected.json
index c8b15f85f..28d4a25ee 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-nvda.collected.json
index 566fe3d4a..4989cb491 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html
index 6f9fff2bd..ed8af6007 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-30-read-information-about-empty-expanded-combobox-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction-voiceover_macos.collected.json
index 7678ce5ae..9d552e81f 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html
index 26e4202d3..b513f9131 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-31-read-information-about-empty-expanded-combobox-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-jaws.collected.json
index 3914230df..3ea921ddb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-nvda.collected.json
index 5683db6fa..dfd296620 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html
index b4ca31d39..7e8b579d1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-32-read-information-about-filled-in-expanded-combobox-reading.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-jaws.collected.json
index ee0f41466..d81f043ea 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-nvda.collected.json
index acd756a67..386b552e9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html
index 118bbaf1d..ee451c0e4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-33-read-information-about-filled-in-expanded-combobox-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
index f256b2d11..973938055 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the Combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html
index 606f94672..954b161f2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-34-read-information-about-filled-in-expanded-combobox-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-jaws.collected.json
index 191b6407b..e5ddbbcf7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-nvda.collected.json
index 2d0dcfde1..0539d5f76 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
index b35a91eff..e3ca5b2f5 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-35-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction-voiceover_macos.collected.json
index 7f4fe5489..26545f9ef 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
index 6987613a9..1a0983cc4 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-36-narrow-down-matching-options-in-empty-expanded-combobox-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-jaws.collected.json
index 2b2bb2176..8f7947608 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected",
       "description": "sets focus on and expands the combobox, sets the combobox value to 'a', and de-selects all text in the input",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-nvda.collected.json
index 3bdc6f135..c25e494cd 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected",
       "description": "sets focus on and expands the combobox, sets the combobox value to 'a', and de-selects all text in the input",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
index 5d4dd29d7..9d1af8daa 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-37-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
index 7eab32339..c1229d010 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected",
       "description": "sets focus on and expands the combobox, sets the combobox value to 'a', and de-selects all text in the input",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
index 00189eb27..96b1bea4d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-38-narrow-down-matching-options-in-filled-in-expanded-combobox-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAWithInputTextDeselected.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-jaws.collected.json
index 6c559910f..34a94f9a6 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-nvda.collected.json
index 80586cc83..0f75805e1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html
index ebffb8afe..c4fb484b1 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-39-close-empty-combobox-reading.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-jaws.collected.json
index 71b96095c..5fdd3b506 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-nvda.collected.json
index 1e5c4d959..cbfb955b2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html
index 187b039f2..a545a7113 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-40-close-empty-combobox-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction-voiceover_macos.collected.json
index ab87a6f63..7caa0055e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html
index 2b5eb970e..c40515ea0 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-41-close-empty-combobox-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-jaws.collected.json
index 5d19973fd..d683a1630 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-nvda.collected.json
index 57f70120e..ad5dca3c6 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html
index b3d97fbaa..7f1a5ee2a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-42-close-filled-in-combobox-reading.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-jaws.collected.json
index cee806619..dfc1284de 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-nvda.collected.json
index 9fd7706d8..cd24cbe4a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html
index e16a848a5..cb2351d16 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-43-close-filled-in-combobox-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction-voiceover_macos.collected.json
index 0efb8c400..846c0b02e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToAlabama",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'Alabama'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html
index 8f52ca7e6..c67a2af4c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-44-close-filled-in-combobox-interaction.html
@@ -55,7 +55,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToAlabama.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
index e120cd358..94d6de906 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
index 4d3b33cb7..bf6e180b7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
index 0badb06f3..b7d252340 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-45-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 8152dd7dc..a3131d865 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
index 331be7831..931df970e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-46-navigate-from-empty-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
index 58c2565fe..1e6cc5ee5 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
index d39ec1515..752613b36 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
index bde5219c6..1f030e69c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-47-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 8baf0ae98..b53272914 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
index 6573bad07..c4a40005d 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-48-navigate-from-empty-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
index 87b3a980a..001f81ea9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
index 45f8cd0f7..191ad4029 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
index b4ae7454f..bed1f2d46 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-49-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index ffb49c186..12b7efa0c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
index 4b472ad07..41a0b113e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-50-navigate-from-filled-in-collapsed-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
index a65da20fe..a9606be50 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
index 9919ef0bc..70d455bd8 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
index dd61f4084..0112afe4b 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-51-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 098ee1be5..ba852feed 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToComboboxAndSetValueToA",
       "description": "sets focus on the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
index 2884068a3..f82655dff 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-52-navigate-from-filled-in-collapsed-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
index 63eae69d9..b24926e7f 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
index 994dd5986..1b08351b0 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
index a85897123..954c752ad 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-53-navigate-from-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index de561fcbb..737bdf55b 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
index 559ab071f..b2f47f769 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-54-navigate-from-an-empty-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
index 9b7fc41bc..259659e11 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
index 263b24bce..c07d20dcf 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
index 5aeb14c9d..c1f696641 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-55-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 14a4e72cb..aa59aa027 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html",
     "setupScript": {
       "name": "moveFocusToAndExpandCombobox",
       "description": "sets focus on and expands the combobox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
index 508017775..d76df6f03 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-56-navigate-from-empty-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
index ea27938fc..fe13a2f00 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
index 80229d461..79359d02c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
index e6868139c..119b02546 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-57-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index ca916d3da..ea499d873 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
index c54d5252f..de22645ee 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-58-navigate-from-filled-in-expanded-combobox-to-first-option-in-listbox-popup-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
index d04cc3fae..cc7ebfeab 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
index d220afdc2..efc63330e 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
index 3f99693e3..fa25f78cb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-59-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index c051bd97b..6a6ba0b88 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html",
     "setupScript": {
       "name": "moveFocusToAndExpandComboboxAndSetValueToA",
       "description": "sets focus on and expands the combobox, and sets the combobox value to 'a'",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
index dc920294d..743b4842f 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-60-navigate-from-filled-in-expanded-combobox-to-last-option-in-listbox-popup-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAndExpandComboboxAndSetValueToA.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-jaws.collected.json
index a5fe861ae..fb205ffd2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alabama' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-nvda.collected.json
index 899b3b770..2e38c7af0 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alabama' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html
index 16785377a..a1adda962 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-61-navigate-to-next-option-in-listbox-popup-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index abe434c89..e5b03adbd 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alabama' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html
index ff119d111..302ec48a2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-62-navigate-to-next-option-in-listbox-popup-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-jaws.collected.json
index 6cd7418f8..acbf91433 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlaskaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alaska' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-nvda.collected.json
index f525b551a..7f193da1a 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlaskaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alaska' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html
index 976234dae..8927a05a3 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-63-navigate-to-previous-option-in-listbox-popup-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 6e3e07cc9..fadc8da24 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlaskaInListbox",
       "description": "expands the combobox, sets the combobox value to 'Alaska' and places focus on that option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html
index db8ed677d..f1fc84864 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-64-navigate-to-previous-option-in-listbox-popup-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlaskaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-jaws.collected.json
index 7ea277bc0..10bb33863 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, and places focus on the first option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-nvda.collected.json
index a1a33c3bb..e369aedc9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, and places focus on the first option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html
index c9a107b68..cbd57e508 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-65-read-information-about-listbox-popup-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction-voiceover_macos.collected.json
index d2a5e3d3a..02c132481 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the combobox, and places focus on the first option in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html
index d881d1581..1a4f30389 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-66-read-information-about-a-listbox-popup-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-jaws.collected.json
index b2b39c7a8..8c3b4a556 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-nvda.collected.json
index 286a7cd62..c60d889a9 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
index 2a90534fd..2d65416aa 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-67-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-jaws.collected.json
index c15880689..b6d2012b2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-nvda.collected.json
index b4b2a01d4..c4b40e3b7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
index 8cca44751..6d00a7b04 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-68-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-voiceover_macos.collected.json
index cfb03e2bb..b6a916abc 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
index 4fd25b613..9aff56f36 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-69-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-right-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-voiceover_macos.collected.json
index 786bc85fd..0cc7e54e7 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
index 76c24c145..884d3c818 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-70-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-left-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-jaws.collected.json
index be124bf16..6d735c835 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-nvda.collected.json
index 188c75c53..86eb47120 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
index 039f86f85..9d12641af 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-71-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-jaws.collected.json
index ca1f75e19..804c23df2 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-nvda.collected.json
index ac726d2b6..6af7bb33c 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
index 4b16cfa7a..245dee801 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-72-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-voiceover_macos.collected.json
index df235543b..72cfdc526 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the beginning of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
index 1c1b14245..8178f68e0 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-73-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-end-of-textbox-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtBeginning.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-voiceover_macos.collected.json
index 2e7f9547c..ea397b978 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListboxAndSetInputCursorAtEnd",
       "description": "expands the combobox,  sets the combobox value to 'Alabama', places focus on that option in the listbox popup and positions the editing cursor at the end of the textbox",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
index 903339002..0263d576b 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-74-navigate-out-of-listbox-popup-by-moving-editing-cursor-to-beginning-of-textbox-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListboxAndSetInputCursorAtEnd.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-jaws.collected.json
index 9dbb60aa5..ce5106266 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the Combobox and places focus on 'Alabama' in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-nvda.collected.json
index 3901c6e51..001218cb3 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the Combobox and places focus on 'Alabama' in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html
index 3690fa58c..d9e276cea 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-75-select-option-in-listbox-popup-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 257c61b66..c460ca4bb 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.html",
+    "referencePage": "reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html",
     "setupScript": {
       "name": "moveFocusToAlabamaInListbox",
       "description": "expands the Combobox and places focus on 'Alabama' in the listbox popup",
diff --git a/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html b/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html
index 0321557c9..ea122e34f 100644
--- a/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-autocomplete-both-updated/test-76-select-option-in-listbox-popup-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.html");
+    displayTestPageAndInstructions("reference/2020-12-11_16649/combobox-autocomplete-both.moveFocusToAlabamaInListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusAfterCombobox.html b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusAfterCombobox.html
new file mode 100644
index 000000000..bc976e50f
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusAfterCombobox.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusAfterCombobox
+      // sets focus on a link after the Combobox
+      testPageDocument.querySelector('#afterlink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusBeforeCombobox.html b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusBeforeCombobox.html
new file mode 100644
index 000000000..a19f9eedf
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusBeforeCombobox.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusBeforeCombobox
+      // sets focus on a link before the Combobox
+      testPageDocument.querySelector('#beforelink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusToCombobox.html b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusToCombobox.html
new file mode 100644
index 000000000..5c214d8ce
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.moveFocusToCombobox.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToCombobox
+      // sets focus on the combobox
+      testPageDocument.querySelector('[role="combobox"]').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.openListbox.html b/build/tests/combobox-select-only/reference/combobox-select-only.openListbox.html
new file mode 100644
index 000000000..dd6136a2f
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.openListbox.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openListbox
+      // sets focus on and expands the Combobox
+      testPageDocument.querySelector('[role="combobox"]').focus();
+      testPageDocument.defaultView.selectController.updateMenuState(true);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToApple.html b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToApple.html
new file mode 100644
index 000000000..0f113145e
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToApple.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openListboxToApple
+      // sets focus on and expands the Combobox, and sets the focused option to 'Apple'
+      testPageDocument.querySelector('[role="combobox"]').focus();
+      testPageDocument.defaultView.selectController.updateMenuState(true);
+      testPageDocument.defaultView.selectController.onOptionChange(1);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToGuava.html b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToGuava.html
new file mode 100644
index 000000000..3dc5837d5
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToGuava.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openListboxToGuava
+      // sets focus on and expands the Combobox, and sets the focused option to 'Guave'
+      testPageDocument.querySelector('[role="combobox"]').focus();
+      testPageDocument.defaultView.selectController.updateMenuState(true);
+      testPageDocument.defaultView.selectController.onOptionChange(11);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToHuckleberry.html b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToHuckleberry.html
new file mode 100644
index 000000000..09cfdf948
--- /dev/null
+++ b/build/tests/combobox-select-only/reference/combobox-select-only.openListboxToHuckleberry.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Select-Only Combobox Example</title>
+
+
+<link href="css/select-only.css" rel="stylesheet">
+<script src="js/select-only.js"  type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openListboxToHuckleberry
+      // sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
+      testPageDocument.querySelector('[role="combobox"]').focus();
+      testPageDocument.defaultView.selectController.updateMenuState(true);
+      testPageDocument.defaultView.selectController.onOptionChange(12);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Select-Only Combobox Example</h1>
+    <p>
+      The following example implementation of the <a href="https://w3c.github.io/aria-practices/#combobox">ARIA design pattern for combobox</a>
+      demonstrates a single-select combobox widget that is functionally similar to an HTML <code>select</code> element.
+      Unlike the editable combobox examples, this select-only combobox is not made with an <code>&lt;input&gt;</code> element, and it does not accept freeform user input.
+      However, like an HTML <code>&lt;select&gt;</code>, users can type characters to select matching options.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <label id="combo1-label" class="combo-label">Favorite Fruit</label>
+        <div class="combo js-select">
+            <div
+                aria-controls="listbox1"
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="combo1-label"
+                id="combo1"
+                class="combo-input"
+                role="combobox"
+                tabindex="0"
+                >
+            </div>
+            <div class="combo-menu" role="listbox" id="listbox1" aria-labelledby="combo1-label" tabindex="-1">
+
+
+            </div>
+        </div>
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-jaws.collected.json b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
index 223817d50..6426af48d 100644
--- a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-nvda.collected.json b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
index 40cd16235..ff4c0d4c0 100644
--- a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html
index 0457036cf..a3c4dc51b 100644
--- a/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html
+++ b/build/tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-jaws.collected.json b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
index c686f03ca..f4c3886a2 100644
--- a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-nvda.collected.json b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
index 4fd16305a..317f7c81d 100644
--- a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html
index f21cb978b..3fec0bb56 100644
--- a/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html
+++ b/build/tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
index 6277a5997..052503e55 100644
--- a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
index 92e6531c1..f27b70458 100644
--- a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
index 5982bcddf..55df0372a 100644
--- a/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
index e2fc1b639..834d1d79e 100644
--- a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
index 0a215e48f..1a3c38663 100644
--- a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
index 31f93a53b..12acf39de 100644
--- a/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
index 91dc58e33..f3033c621 100644
--- a/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusBeforeCombobox.html",
     "setupScript": {
       "name": "moveFocusBeforeCombobox",
       "description": "sets focus on a link before the Combobox",
diff --git a/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
index 46ce35958..9ec62f4c2 100644
--- a/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusBeforeCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
index 4f6aeb5e4..cb78609e1 100644
--- a/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusAfterCombobox.html",
     "setupScript": {
       "name": "moveFocusAfterCombobox",
       "description": "sets focus on a link after the Combobox",
diff --git a/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
index 3634ac3fb..fe7ae0402 100644
--- a/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusAfterCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-jaws.collected.json b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-jaws.collected.json
index 18d6fbd07..ff9071894 100644
--- a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-nvda.collected.json b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-nvda.collected.json
index a9c90b42b..ba5edc40b 100644
--- a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html
index d39b7829f..5a99c1702 100644
--- a/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html
+++ b/build/tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-jaws.collected.json
index fd3111a10..8dd26584f 100644
--- a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-nvda.collected.json
index 1512240c2..73ca2e906 100644
--- a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html
index 51f9e582f..45d362f2c 100644
--- a/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
index da4e512cc..0c07b513e 100644
--- a/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html
index c5341be34..73875de8d 100644
--- a/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html
@@ -69,7 +69,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-jaws.collected.json b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-jaws.collected.json
index f046ae9f8..e6e01e894 100644
--- a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-nvda.collected.json b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-nvda.collected.json
index 0ebd376f5..d407a9ccb 100644
--- a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html
index 45c7cf6fa..3e9cfdbcd 100644
--- a/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html
+++ b/build/tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html
@@ -100,7 +100,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-jaws.collected.json
index cd5a911bf..980c38489 100644
--- a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-nvda.collected.json
index 81503e518..8901756c9 100644
--- a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html
index 3bd9720ff..bc24cfe47 100644
--- a/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html
@@ -100,7 +100,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
index 920d2cd8b..5b594f7b0 100644
--- a/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html b/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html
index 215f954cd..9d4eb83aa 100644
--- a/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html
+++ b/build/tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html
@@ -99,7 +99,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-jaws.collected.json
index 9e70d5563..7b3cc5892 100644
--- a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-nvda.collected.json
index 224cbbf61..36ced71f3 100644
--- a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html
index cd911aba8..f4f0f4c1e 100644
--- a/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html
+++ b/build/tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction-voiceover_macos.collected.json
index 805d8bad7..d3b4ce7fb 100644
--- a/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html b/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html
index 7bab81727..5d7f03191 100644
--- a/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html
+++ b/build/tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-jaws.collected.json
index f16706f24..d99c92783 100644
--- a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-nvda.collected.json
index 05dba0a22..f1adf6b34 100644
--- a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html
index f8b7d03b3..b1139100e 100644
--- a/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html
+++ b/build/tests/combobox-select-only/test-15-open-collapsed-select-only-combobox-to-specific-option-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction-voiceover_macos.collected.json
index 3d1a4edb3..5a1f065b8 100644
--- a/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html b/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html
index a3888dfc6..10b4b92d8 100644
--- a/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html
+++ b/build/tests/combobox-select-only/test-16-open-collapsed-select-only-combobox-to-specific-option-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-jaws.collected.json
index 8590cb702..59dfb5dc5 100644
--- a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-nvda.collected.json
index 91d3b96ef..7d6a47370 100644
--- a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html
index 84f35317d..0517d09d1 100644
--- a/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html
+++ b/build/tests/combobox-select-only/test-17-open-collapsed-select-only-combobox-to-last-option-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction-voiceover_macos.collected.json
index 1c623cd6c..97bfd4c6a 100644
--- a/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.moveFocusToCombobox.html",
     "setupScript": {
       "name": "moveFocusToCombobox",
       "description": "sets focus on the combobox",
diff --git a/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html b/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html
index 2a742d80e..e35504d52 100644
--- a/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html
+++ b/build/tests/combobox-select-only/test-18-open-collapsed-select-only-combobox-to-last-option-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.moveFocusToCombobox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-jaws.collected.json
index be72be58c..8f17825b3 100644
--- a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-nvda.collected.json
index 5644e94cf..165fa37fb 100644
--- a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html
index 2fd2f55ad..c9e298ffd 100644
--- a/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction-voiceover_macos.collected.json
index d31b1959e..f3a6a21cd 100644
--- a/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html
index 5da378db7..95e749953 100644
--- a/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-jaws.collected.json
index 92c68536e..9ffcb3630 100644
--- a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-nvda.collected.json
index 1032f749d..aa4e08bb6 100644
--- a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html
index 87589312a..502e2b760 100644
--- a/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-21-navigate-forwards-to-option-in-listbox-popup-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-jaws.collected.json
index 488c4c035..6606055ab 100644
--- a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-nvda.collected.json
index bdfbb91c8..874c3a15b 100644
--- a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html
index e22cceb24..341ce4757 100644
--- a/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index c6fa32d40..34c4f97c2 100644
--- a/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html
index cafcd37d1..03c4192e9 100644
--- a/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-23-navigate-forwards-to-option-in-listbox-popup-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 22bc3c3b9..3653a3ac0 100644
--- a/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html
index 76955ad0b..24c2bd669 100644
--- a/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-jaws.collected.json
index 20b47d8ed..89d537a16 100644
--- a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-nvda.collected.json
index 624ccfe31..9527f8f5c 100644
--- a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html
index 4ef524313..442594e78 100644
--- a/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-25-navigate-to-specific-option-in-listbox-popup-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index 8c8440730..228d31b5e 100644
--- a/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html
index a12fcbb34..26305d698 100644
--- a/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-26-navigate-to-specific-option-in-listbox-popup-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-jaws.collected.json
index 30ebf66ed..c695537e4 100644
--- a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-nvda.collected.json
index 52a29828c..90ad32bbd 100644
--- a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html
index f56dbe472..7642bc67a 100644
--- a/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-jaws.collected.json
index d2ef0992f..b9c4de871 100644
--- a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToGuava.html",
     "setupScript": {
       "name": "openListboxToGuava",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Guava'",
diff --git a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-nvda.collected.json
index a663e881a..3f85dd641 100644
--- a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToGuava.html",
     "setupScript": {
       "name": "openListboxToGuava",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Guava'",
diff --git a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html
index 29f5beaec..636965a46 100644
--- a/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-28-navigate-to-last-option-in-listbox-popup-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToGuava.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index b5a420f6d..fe2e2298b 100644
--- a/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple'",
diff --git a/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html
index 301a7b937..7beca3c9b 100644
--- a/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index a424267d5..a2ddc7b1e 100644
--- a/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToGuava.html",
     "setupScript": {
       "name": "openListboxToGuava",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Guava'",
diff --git a/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html
index 64abc6364..435c3a25a 100644
--- a/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-30-navigate-to-last-option-in-listbox-popup-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToGuava.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
index 0c0f5e25f..a7d3d4981 100644
--- a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
index 955770d60..9b304a222 100644
--- a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
index ad2616b2b..f9fa82d54 100644
--- a/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-31-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
index 2af663457..8036d42ce 100644
--- a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToHuckleberry.html",
     "setupScript": {
       "name": "openListboxToHuckleberry",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'",
diff --git a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
index c6c1c54c8..60c958ecc 100644
--- a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToHuckleberry.html",
     "setupScript": {
       "name": "openListboxToHuckleberry",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'",
diff --git a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
index 771aed48a..190ef52fd 100644
--- a/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-32-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToHuckleberry.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
index db2332ee9..200098b78 100644
--- a/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListbox.html",
     "setupScript": {
       "name": "openListbox",
       "description": "sets focus on and expands the Combobox",
diff --git a/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
index 23123acd9..3c00b4884 100644
--- a/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-33-navigate-forwards-by-ten-options-in-listbox-popup-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListbox.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
index 86587da20..6037f18c3 100644
--- a/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToHuckleberry.html",
     "setupScript": {
       "name": "openListboxToHuckleberry",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'",
diff --git a/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
index 6fa873c86..a1b7c1242 100644
--- a/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-34-navigate-backwards-by-ten-options-in-listbox-popup-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToHuckleberry.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-jaws.collected.json
index ec2b5f120..871250d62 100644
--- a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-nvda.collected.json
index d4e833c70..8d2c6fdf7 100644
--- a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html
index d472450d8..f2fd12884 100644
--- a/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-35-select-option-in-listbox-popup-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
index d27bb7a1d..91a797a55 100644
--- a/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html
index c8c7e2dfd..fa7939a2d 100644
--- a/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-36-select-option-in-listbox-popup-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-jaws.collected.json b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-jaws.collected.json
index 7d1fdea8a..96abeaa45 100644
--- a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-jaws.collected.json
+++ b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-nvda.collected.json b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-nvda.collected.json
index a19fd6fee..1c6a15bcb 100644
--- a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-nvda.collected.json
+++ b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction.html
index e2c3db190..bac3dc69d 100644
--- a/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-37-close-listbox-popup-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction-voiceover_macos.collected.json b/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction-voiceover_macos.collected.json
index 439f7a150..b0fa390e8 100644
--- a/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction-voiceover_macos.collected.json
+++ b/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/combobox-select-only.html",
+    "referencePage": "reference/combobox-select-only.openListboxToApple.html",
     "setupScript": {
       "name": "openListboxToApple",
       "description": "sets focus on and expands the Combobox, and sets the focused option to 'Apple' without selecting it",
diff --git a/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction.html b/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction.html
index 08e767f3b..5b3e18db1 100644
--- a/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction.html
+++ b/build/tests/combobox-select-only/test-38-close-listbox-popup-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/combobox-select-only.html");
+    displayTestPageAndInstructions("reference/combobox-select-only.openListboxToApple.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/reference/2021-3-29_132754/button.setFocusAfterButton.html b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusAfterButton.html
new file mode 100644
index 000000000..b3800cedb
--- /dev/null
+++ b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusAfterButton.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Command Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusAfterButton
+        // sets focus on a link after the button
+        testPageDocument.querySelector('#afterlink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Command Button Example</h1>
+
+    <p>
+      The following command button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p>This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div tabindex="0" role="button" id="action">Print Page</div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/command-button/reference/2021-3-29_132754/button.setFocusBeforeButton.html b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusBeforeButton.html
new file mode 100644
index 000000000..329ded658
--- /dev/null
+++ b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusBeforeButton.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Command Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusBeforeButton
+        // sets focus on a link before the button
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Command Button Example</h1>
+
+    <p>
+      The following command button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p>This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div tabindex="0" role="button" id="action">Print Page</div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/command-button/reference/2021-3-29_132754/button.setFocusOnButton.html b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusOnButton.html
new file mode 100644
index 000000000..1cbe4639a
--- /dev/null
+++ b/build/tests/command-button/reference/2021-3-29_132754/button.setFocusOnButton.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Command Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusOnButton
+        // sets focus on the button
+        testPageDocument.querySelector('#action').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Command Button Example</h1>
+
+    <p>
+      The following command button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p>This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div tabindex="0" role="button" id="action">Print Page</div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/command-button/test-01-navigate-forwards-to-button-reading-jaws.collected.json b/build/tests/command-button/test-01-navigate-forwards-to-button-reading-jaws.collected.json
index 401bbe27d..3ef5a86d5 100644
--- a/build/tests/command-button/test-01-navigate-forwards-to-button-reading-jaws.collected.json
+++ b/build/tests/command-button/test-01-navigate-forwards-to-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/command-button/test-01-navigate-forwards-to-button-reading-nvda.collected.json b/build/tests/command-button/test-01-navigate-forwards-to-button-reading-nvda.collected.json
index 8c4e80828..1148e74b4 100644
--- a/build/tests/command-button/test-01-navigate-forwards-to-button-reading-nvda.collected.json
+++ b/build/tests/command-button/test-01-navigate-forwards-to-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/command-button/test-01-navigate-forwards-to-button-reading.html b/build/tests/command-button/test-01-navigate-forwards-to-button-reading.html
index 4c63166f6..b15ea73a9 100644
--- a/build/tests/command-button/test-01-navigate-forwards-to-button-reading.html
+++ b/build/tests/command-button/test-01-navigate-forwards-to-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-02-navigate-backwards-to-button-reading-jaws.collected.json b/build/tests/command-button/test-02-navigate-backwards-to-button-reading-jaws.collected.json
index 55cacbe8f..3a3de7834 100644
--- a/build/tests/command-button/test-02-navigate-backwards-to-button-reading-jaws.collected.json
+++ b/build/tests/command-button/test-02-navigate-backwards-to-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/command-button/test-02-navigate-backwards-to-button-reading-nvda.collected.json b/build/tests/command-button/test-02-navigate-backwards-to-button-reading-nvda.collected.json
index ef0f52017..dae1d569e 100644
--- a/build/tests/command-button/test-02-navigate-backwards-to-button-reading-nvda.collected.json
+++ b/build/tests/command-button/test-02-navigate-backwards-to-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/command-button/test-02-navigate-backwards-to-button-reading.html b/build/tests/command-button/test-02-navigate-backwards-to-button-reading.html
index fdf63b2fd..7f65ca865 100644
--- a/build/tests/command-button/test-02-navigate-backwards-to-button-reading.html
+++ b/build/tests/command-button/test-02-navigate-backwards-to-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-jaws.collected.json b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-jaws.collected.json
index dc88fa716..a57358148 100644
--- a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-jaws.collected.json
+++ b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-nvda.collected.json b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-nvda.collected.json
index c40cbae41..1b8cdeed4 100644
--- a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-nvda.collected.json
+++ b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction.html b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction.html
index 659cf97a0..6561ceb8d 100644
--- a/build/tests/command-button/test-03-navigate-forwards-to-button-interaction.html
+++ b/build/tests/command-button/test-03-navigate-forwards-to-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-jaws.collected.json b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-jaws.collected.json
index 656e05ef2..427d33078 100644
--- a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-jaws.collected.json
+++ b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-nvda.collected.json b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-nvda.collected.json
index 9c293cbb7..b0d872f87 100644
--- a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-nvda.collected.json
+++ b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction.html b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction.html
index 08733f881..20de5e8d3 100644
--- a/build/tests/command-button/test-04-navigate-backwards-to-button-interaction.html
+++ b/build/tests/command-button/test-04-navigate-backwards-to-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-05-navigate-forwards-to-button-interaction-voiceover_macos.collected.json b/build/tests/command-button/test-05-navigate-forwards-to-button-interaction-voiceover_macos.collected.json
index f560f6fec..cb7efb194 100644
--- a/build/tests/command-button/test-05-navigate-forwards-to-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/command-button/test-05-navigate-forwards-to-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/command-button/test-05-navigate-forwards-to-button-interaction.html b/build/tests/command-button/test-05-navigate-forwards-to-button-interaction.html
index 4ddf0ad34..89d38bee0 100644
--- a/build/tests/command-button/test-05-navigate-forwards-to-button-interaction.html
+++ b/build/tests/command-button/test-05-navigate-forwards-to-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-06-navigate-backwards-to-button-interaction-voiceover_macos.collected.json b/build/tests/command-button/test-06-navigate-backwards-to-button-interaction-voiceover_macos.collected.json
index 6ae9e7e06..c3413c8e6 100644
--- a/build/tests/command-button/test-06-navigate-backwards-to-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/command-button/test-06-navigate-backwards-to-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/command-button/test-06-navigate-backwards-to-button-interaction.html b/build/tests/command-button/test-06-navigate-backwards-to-button-interaction.html
index 1d07bc986..9a3ca8f6c 100644
--- a/build/tests/command-button/test-06-navigate-backwards-to-button-interaction.html
+++ b/build/tests/command-button/test-06-navigate-backwards-to-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-07-read-information-about-button-reading-jaws.collected.json b/build/tests/command-button/test-07-read-information-about-button-reading-jaws.collected.json
index f050abd00..a900c3a89 100644
--- a/build/tests/command-button/test-07-read-information-about-button-reading-jaws.collected.json
+++ b/build/tests/command-button/test-07-read-information-about-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/command-button/test-07-read-information-about-button-reading-nvda.collected.json b/build/tests/command-button/test-07-read-information-about-button-reading-nvda.collected.json
index 7b5292924..f8ff2dfad 100644
--- a/build/tests/command-button/test-07-read-information-about-button-reading-nvda.collected.json
+++ b/build/tests/command-button/test-07-read-information-about-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/command-button/test-07-read-information-about-button-reading.html b/build/tests/command-button/test-07-read-information-about-button-reading.html
index ad553495f..a91e8295f 100644
--- a/build/tests/command-button/test-07-read-information-about-button-reading.html
+++ b/build/tests/command-button/test-07-read-information-about-button-reading.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-08-read-information-about-button-interaction-jaws.collected.json b/build/tests/command-button/test-08-read-information-about-button-interaction-jaws.collected.json
index ffa14015a..d14b28113 100644
--- a/build/tests/command-button/test-08-read-information-about-button-interaction-jaws.collected.json
+++ b/build/tests/command-button/test-08-read-information-about-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/command-button/test-08-read-information-about-button-interaction-nvda.collected.json b/build/tests/command-button/test-08-read-information-about-button-interaction-nvda.collected.json
index f37b11386..83427502c 100644
--- a/build/tests/command-button/test-08-read-information-about-button-interaction-nvda.collected.json
+++ b/build/tests/command-button/test-08-read-information-about-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/command-button/test-08-read-information-about-button-interaction.html b/build/tests/command-button/test-08-read-information-about-button-interaction.html
index 44dcd0f4a..90f6a3a2b 100644
--- a/build/tests/command-button/test-08-read-information-about-button-interaction.html
+++ b/build/tests/command-button/test-08-read-information-about-button-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/command-button/test-09-read-information-about-button-interaction-voiceover_macos.collected.json b/build/tests/command-button/test-09-read-information-about-button-interaction-voiceover_macos.collected.json
index 43e48b1ea..84fc5e26d 100644
--- a/build/tests/command-button/test-09-read-information-about-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/command-button/test-09-read-information-about-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_132754/button.html",
+    "referencePage": "reference/2021-3-29_132754/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/command-button/test-09-read-information-about-button-interaction.html b/build/tests/command-button/test-09-read-information-about-button-interaction.html
index 4b1e27f45..618c33f8b 100644
--- a/build/tests/command-button/test-09-read-information-about-button-interaction.html
+++ b/build/tests/command-button/test-09-read-information-about-button-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_132754/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_132754/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html
new file mode 100644
index 000000000..735144720
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusAfterAndExpandFirstDisclosure
+        // sets the state of the first disclosure button to expanded, and sets focus on a link after the button
+        const btn = testPageDocument.querySelector('button[aria-controls="faq1_desc"]');
+        const answer = testPageDocument.querySelector('#faq1_desc');
+        btn.setAttribute('aria-expanded', 'true');
+        answer.style.display = 'block';
+        testPageDocument.querySelector('#afterlink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html
new file mode 100644
index 000000000..45ff81171
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusAfterFirstDisclosure
+        // sets focus on a link after the first disclosure button
+        testPageDocument.querySelector('#afterlink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html
new file mode 100644
index 000000000..a1d3dae0c
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusBeforeAndExpandFirstDisclosure
+        // sets focus on a link before the first disclosure button, and sets the state of the first button to expanded
+        const btn = testPageDocument.querySelector('button[aria-controls="faq1_desc"]');
+        const answer = testPageDocument.querySelector('#faq1_desc');
+        btn.setAttribute('aria-expanded', 'true');
+        answer.style.display = 'block';
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html
new file mode 100644
index 000000000..1ad8a75e3
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusBeforeFirstDisclosure
+        // sets focus on a link before the first disclosure button
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html
new file mode 100644
index 000000000..aba747611
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToAndExpandFirstDisclosure
+        // sets focus on the first disclosure button, and sets its state to expanded
+        const btn = testPageDocument.querySelector('button[aria-controls="faq1_desc"]');
+        const answer = testPageDocument.querySelector('#faq1_desc');
+        btn.setAttribute('aria-expanded', 'true');
+        answer.style.display = 'block';
+        // Hide the link after the button so it doesn't get in the way
+        testPageDocument.querySelector('#afterlink').style.display = 'none';
+        btn.focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html
new file mode 100644
index 000000000..306a190d6
--- /dev/null
+++ b/build/tests/disclosure-faq/reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" >
+  <title>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link href="css/disclosure-faq.css" rel="stylesheet">
+  <script src="js/disclosureButton.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToFirstDisclosure
+        // sets focus on the first disclosure button
+        testPageDocument.querySelector('button[aria-controls="faq1_desc"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Example Disclosure (Show/Hide) for Answers to Frequently Asked Questions</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to create a set of frequently asked questions where the answers may be independently shown or hidden.
+  </p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <div id="ex1">
+      <dl class="faq">
+        <dt>
+          <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+          <button type="button" aria-expanded="false" aria-controls="faq1_desc">What do I do if I have a permit for an assigned lot, but can't find a space there?</button>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        </dt>
+        <dd>
+          <p id="faq1_desc" class="desc">
+            Park at the nearest available parking meter without paying the meter
+            and call 999-999-9999 to report the problem. We will note and approve your alternate
+            location and will investigate the cause of the shortage in your assigned facility.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq2_desc">What do I do if I lose my permit or if my permit is stolen?</button>
+        </dt>
+        <dd>
+          <p id="faq2_desc" class="desc">You should come to the Parking office and report the
+            loss. There is a fee to replace your lost permit. However, if your permit was stolen, a
+            copy of a police report needs to be submitted along with a stolen parking permit form for
+            a fee replacement exemption.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq3_desc">Is there free parking on holidays?</button>
+        </dt>
+        <dd>
+          <p id="faq3_desc" class="desc">
+            All facilities are restricted from 2:00 am - 6:00 am on all days. No
+            exceptions are made for any holiday or recess except those officially listed as a
+            <q>Holidays</q> in the calendar. Please note: 24-hour rental spaces, 24-hour rental lots, and
+            disabled parking is enforced at all times.
+          </p>
+        </dd>
+        <dt>
+          <button type="button" aria-expanded="false" aria-controls="faq4_desc">Do all parking facilities have the same enforcement rules?</button>
+        </dt>
+        <dd>
+          <p id="faq4_desc" class="desc">
+            Some parking facility restrictions differ from others. Be sure to
+            take note of the signs at each lot entrance.
+          </p>
+        </dd>
+      </dl>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
index a5508f7e4..07b751905 100644
--- a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
index 5010524d2..e5bdaa6c2 100644
--- a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
index 5ddc8e7ce..587ae179a 100644
--- a/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
index bf1fb45a4..f35969d05 100644
--- a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterFirstDisclosure",
       "description": "sets focus on a link after the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
index ad86ee6f9..f89f0def2 100644
--- a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterFirstDisclosure",
       "description": "sets focus on a link after the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
index 41998ccaf..7788466bc 100644
--- a/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
index 6e58ed445..7681a83c8 100644
--- a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
index fb680c16e..81b3dfb68 100644
--- a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
index 8b2c2624e..6ed4109f6 100644
--- a/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
index d6281027e..89ba02e0e 100644
--- a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterFirstDisclosure",
       "description": "sets focus on a link after the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
index ce479ab5a..3910688c1 100644
--- a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterFirstDisclosure",
       "description": "sets focus on a link after the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
index 21042df35..e195d0081 100644
--- a/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 790d67980..bed60bcec 100644
--- a/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
index 0a41fa34a..80fb3820e 100644
--- a/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 621f3de95..fed3b60c8 100644
--- a/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterFirstDisclosure",
       "description": "sets focus on a link after the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
index 55777266f..4283ed9bb 100644
--- a/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
index 6b8a0ba1b..10419a3b2 100644
--- a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
index 6dcd9293a..7df23248e 100644
--- a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
index 6a49474b8..2b759b953 100644
--- a/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
index fa5002505..103a9324a 100644
--- a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterAndExpandFirstDisclosure",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on a link after the button",
diff --git a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
index d1fd06eb1..72ccec4d0 100644
--- a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterAndExpandFirstDisclosure",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on a link after the button",
diff --git a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
index dd49fdd78..c0745e8e8 100644
--- a/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
index 31f155975..a7bf6010d 100644
--- a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
index 10ad0b98a..326538697 100644
--- a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
index 139963a1e..315c0c1ae 100644
--- a/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
index 96c64425c..35b58cba3 100644
--- a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterAndExpandFirstDisclosure",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on a link after the button",
diff --git a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
index 67dbe92ed..4f3e964b9 100644
--- a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterAndExpandFirstDisclosure",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on a link after the button",
diff --git a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
index 0ba6a9cdb..e3d428461 100644
--- a/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 65f91836a..38c693834 100644
--- a/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
index bc9f929e9..17d8333d9 100644
--- a/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 35c0219ff..ccd03d42f 100644
--- a/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusAfterAndExpandFirstDisclosure",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on a link after the button",
diff --git a/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
index 3e8558071..2aaa4bac7 100644
--- a/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusAfterAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
index 248b35e16..45c442f4c 100644
--- a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
index 9407c560d..895c47db6 100644
--- a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html
index 29f3d9364..c1872a013 100644
--- a/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-13-read-information-about-collapsed-disclosure-button-reading.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
index 2ea8177a1..1550edd9c 100644
--- a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
index 439a3cfba..39e1a927e 100644
--- a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html
index 725d613d6..07fd27925 100644
--- a/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-14-read-information-about-collapsed-disclosure-button-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 15c83e5ab..e3847fc17 100644
--- a/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html
index 759fe1585..df37bedcb 100644
--- a/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-15-read-information-about-collapsed-disclosure-button-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
index fe0b86eb0..ba8464ed8 100644
--- a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
index 9c94dc42a..bd79f89f2 100644
--- a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html
index 32ecaee31..fa32e3950 100644
--- a/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-16-read-information-about-expanded-disclosure-button-reading.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
index b44cbd891..f6b0c7a77 100644
--- a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
index 7ff4240e4..a18d886fa 100644
--- a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html
index 600ebdb7a..6fc16db62 100644
--- a/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-17-read-information-about-expanded-disclosure-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 039d49133..20407bd3b 100644
--- a/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html
index 0f3edf946..e80bba1b1 100644
--- a/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-18-read-information-about-expanded-disclosure-button-interaction.html
@@ -69,7 +69,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
index a51c723b5..779afe98a 100644
--- a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
index 8450d6614..166870e15 100644
--- a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html
index 8fc3ee99b..b6bea79fc 100644
--- a/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-19-operate-collapsed-disclosure-button-reading.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
index 2043a10ce..eb85169d5 100644
--- a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
index f8138c5a3..1a48f326b 100644
--- a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html
index 3c84c9dc9..e5c604908 100644
--- a/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-20-operate-collapsed-disclosure-button-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index aa2661db9..321013e23 100644
--- a/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html
index 5385bf7d9..7cbad01a0 100644
--- a/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-21-operate-collapsed-disclosure-button-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
index 77b6028e0..9426235c7 100644
--- a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
index 88511f089..75bae67e6 100644
--- a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html
index f347ebd6d..d4dfd5833 100644
--- a/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-faq/test-22-operate-expanded-disclosure-button-reading.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
index 103f3ef37..935873d40 100644
--- a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
index cf88aaa14..b2e87a722 100644
--- a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html
index 1b8251343..2bb38bf76 100644
--- a/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-23-operate-expanded-disclosure-button-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 0b7991746..f5a6d3d59 100644
--- a/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html b/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html
index 2485aa083..32617861f 100644
--- a/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-faq/test-24-operate-expanded-disclosure-button-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-jaws.collected.json b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-jaws.collected.json
index 4b46d3161..dee183120 100644
--- a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-jaws.collected.json
+++ b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-nvda.collected.json b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-nvda.collected.json
index 92b88b84f..93b2bc2c9 100644
--- a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-nvda.collected.json
+++ b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html
index bd3668146..64f68344d 100644
--- a/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html
+++ b/build/tests/disclosure-faq/test-25-navigate-from-expanded-disclosure-button-to-text-of-question-answer-reading.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction-voiceover_macos.collected.json b/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction-voiceover_macos.collected.json
index 85b2dca3a..06fa82aa0 100644
--- a/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-3_11559/disclosure-faq.html",
+    "referencePage": "reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html b/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html
index 52baaf602..22256a6c2 100644
--- a/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html
+++ b/build/tests/disclosure-faq/test-26-navigate-from-expanded-disclosure-button-to-text-of-question-answer-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.html");
+    displayTestPageAndInstructions("reference/2020-12-3_11559/disclosure-faq.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html
new file mode 100644
index 000000000..9c0d189e5
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusBeforeAndExpandFirstDisclosure
+        // sets focus on a link before the first disclosure button, and sets the state of the first button to expanded
+        testPageDocument.defaultView.disclosureController.toggleExpand(0, true);
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html
new file mode 100644
index 000000000..041871a78
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusBeforeFirstDisclosure
+        // sets focus on a link before the first disclosure button
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html
new file mode 100644
index 000000000..8dd290cda
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToAndExpandFirstDisclosure
+        // sets focus on the first disclosure button, and sets its state to expanded
+        testPageDocument.defaultView.disclosureController.toggleExpand(0, true);
+        testPageDocument.querySelector('button[aria-controls="id_about_menu"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html
new file mode 100644
index 000000000..984d190ab
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToAndExpandFirstDisclosureAndSetCurrentPage
+        // sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page
+        testPageDocument.defaultView.disclosureController.toggleExpand(0, true);
+        testPageDocument.querySelector('#id_about_menu a').setAttribute('aria-current', 'page');
+        testPageDocument.querySelector('button[aria-controls="id_about_menu"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstDisclosure.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstDisclosure.html
new file mode 100644
index 000000000..0857989a6
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstDisclosure.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToFirstDisclosure
+        // sets focus on the first disclosure button
+        testPageDocument.querySelector('button[aria-controls="id_about_menu"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html
new file mode 100644
index 000000000..6f0a6f84a
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToFirstLinkInDropdown
+        // sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown
+        testPageDocument.defaultView.disclosureController.toggleExpand(0, true);
+        testPageDocument.querySelector('#id_about_menu a').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondDisclosure.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondDisclosure.html
new file mode 100644
index 000000000..826910b75
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondDisclosure.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToSecondDisclosure
+        // sets focus on the second disclosure button in the navigation region
+        testPageDocument.querySelector('button[aria-controls="id_admissions_menu"]').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html
new file mode 100644
index 000000000..0f960fa51
--- /dev/null
+++ b/build/tests/disclosure-navigation/reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Disclosure (Show/Hide) for Navigation Menus Example</title>
+
+
+  <link href="css/disclosure-navigation.css" rel="stylesheet">
+  <script src="js/disclosureMenu.js" type="text/javascript"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // moveFocusToSecondLinkInDropdown
+        // sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown
+        testPageDocument.defaultView.disclosureController.toggleExpand(0, true);
+        testPageDocument.querySelectorAll('#id_about_menu a')[1].focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Disclosure (Show/Hide) for Navigation Menus Example</h1>
+  <p>
+    The following example demonstrates using the
+    <a href="https://w3c.github.io/aria-practices/#disclosure">disclosure design pattern</a>
+    to show and hide dropdown lists of links in a navigation bar for a mythical university web site.
+    Each disclosure button represents a section of the web site, and expanding it shows a list of links to pages within that section.
+  </p>
+  <p><strong>Note:</strong> Although this example uses the word <q>menu</q> in the colloquial sense to refer to a set of navigation links, it does not use the WAI-ARIA <code>menu</code> role.</p>
+  <section>
+    <h2 id="ex_label">Example</h2>
+    <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of" ></div>
+    <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+    <div id="ex1">
+      <nav aria-label="Mythical University">
+        <ul id="exTest" class="disclosure-nav">
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_about_menu">About</button>
+            <ul id="id_about_menu">
+              <li>
+                <a href="#mythical-page-content">Overview</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Administration</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Facts</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Campus Tours</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_admissions_menu">Admissions</button>
+            <ul id="id_admissions_menu">
+              <li>
+                <a href="#mythical-page-content">Apply</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Tuition</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Sign Up</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Visit</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Photo Tour</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Connect</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <button type="button" aria-expanded="true" aria-controls="id_academics_menu">Academics</button>
+            <ul id="id_academics_menu">
+              <li>
+                <a href="#mythical-page-content">Colleges &amp; Schools</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Programs of Study</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Honors Programs</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Online Courses</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Course Explorer</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Register for Class</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Academic Calendar</a>
+              </li>
+              <li>
+                <a href="#mythical-page-content">Transcripts</a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <div id="mythical-page-content" class="disclosure-pagecontent" tabindex="-1" role="region" aria-label="Mythical University sample page content">
+        <h3 id="mythical-page-heading">Mythical University</h3>
+        <p>Sample content section. Activating a link above will update and navigate to this region.</p>
+      </div>
+    </div>
+    <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+    <!-- Generated by create-example-tests.js -->
+    <div style="position: relative; left: 0; right: 0; height: 2rem;">
+      <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+    </div>
+    <!-- End of generated output -->
+  </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
index 23a83c1f4..e3364bcda 100644
--- a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
index 7a9adc82e..8a980ff1d 100644
--- a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
index 149e2d657..8fca4c426 100644
--- a/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-01-navigate-forwards-to-collapsed-disclosure-button-reading.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
index bb46c48f6..aa283182c 100644
--- a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondDisclosure.html",
     "setupScript": {
       "name": "moveFocusToSecondDisclosure",
       "description": "sets focus on the second disclosure button in the navigation region",
diff --git a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
index ba9e4a521..e65e27ff2 100644
--- a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondDisclosure.html",
     "setupScript": {
       "name": "moveFocusToSecondDisclosure",
       "description": "sets focus on the second disclosure button in the navigation region",
diff --git a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
index 5cfc1a944..9ca5559d9 100644
--- a/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-02-navigate-backwards-to-collapsed-disclosure-button-reading.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
index c7a297d0d..360e79727 100644
--- a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
index 22c689b4a..327be63f8 100644
--- a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
index 9e3e5b11f..38f776020 100644
--- a/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-03-navigate-forwards-to-collapsed-disclosure-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
index 673610641..15ae82d9c 100644
--- a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondDisclosure.html",
     "setupScript": {
       "name": "moveFocusToSecondDisclosure",
       "description": "sets focus on the second disclosure button in the navigation region",
diff --git a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
index a64c8c1e9..5ea8c25ce 100644
--- a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondDisclosure.html",
     "setupScript": {
       "name": "moveFocusToSecondDisclosure",
       "description": "sets focus on the second disclosure button in the navigation region",
diff --git a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
index 1adb2c70f..4c103b5c3 100644
--- a/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-04-navigate-backwards-to-collapsed-disclosure-button-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 3dfed05f0..0a69deaac 100644
--- a/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
index 1e9fb4869..d7574506b 100644
--- a/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-05-navigate-forwards-to-collapsed-disclosure-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 5ce387dfd..0283d93f9 100644
--- a/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondDisclosure.html",
     "setupScript": {
       "name": "moveFocusToSecondDisclosure",
       "description": "sets focus on the second disclosure button in the navigation region",
diff --git a/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
index 6b5b15a7f..54f9a4087 100644
--- a/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-06-navigate-backwards-to-collapsed-disclosure-button-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
index f6e08a10b..2a1678848 100644
--- a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
index 469ae5ea9..37b4efaff 100644
--- a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
index de9e68d13..02508aa95 100644
--- a/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-07-navigate-forwards-to-expanded-disclosure-button-reading.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
index 4c3c21d02..ce2a2f092 100644
--- a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
index d6f3d5c30..b50ac5905 100644
--- a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
index de7fe2cb0..b59823490 100644
--- a/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-08-navigate-backwards-to-expanded-disclosure-button-reading.html
@@ -86,7 +86,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
index ce47811ac..50c472760 100644
--- a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
index 116d15e33..7f6a5cb65 100644
--- a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
index 8849f6308..08ec9f846 100644
--- a/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-09-navigate-forwards-to-expanded-disclosure-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
index 00a2edd42..a3df21146 100644
--- a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
index c58a1e11b..352cf2c2c 100644
--- a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
index 288f748a4..6e64dd60c 100644
--- a/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-10-navigate-backwards-to-expanded-disclosure-button-interaction.html
@@ -86,7 +86,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index fc4e38c05..26e61b3d7 100644
--- a/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusBeforeAndExpandFirstDisclosure",
       "description": "sets focus on a link before the first disclosure button, and sets the state of the first button to expanded",
diff --git a/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
index 57e76b131..acb04a75d 100644
--- a/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-11-navigate-forwards-to-expanded-disclosure-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusBeforeAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 254b68bf5..f5c904d5c 100644
--- a/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
index 6d983f0b9..ac67bf4bf 100644
--- a/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-12-navigate-backwards-to-expanded-disclosure-button-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
index 73fc9b64b..259d76ecf 100644
--- a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
index 8298dfedc..e75eaa76f 100644
--- a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html
index b8975c1ed..81524d1d9 100644
--- a/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-13-read-information-about-collapsed-disclosure-button-reading.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
index f99804e54..c44228e4a 100644
--- a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
index f3096eaf6..e208430c5 100644
--- a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html
index fbbc8c720..555256010 100644
--- a/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-14-read-information-about-collapsed-disclosure-button-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index 0a97e7184..fc9b11ce7 100644
--- a/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html
index b1182f752..2b37f46d5 100644
--- a/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-15-read-information-about-collapsed-disclosure-button-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
index f9b5cba61..86a12f62b 100644
--- a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
index 5a614fa61..efcb0423b 100644
--- a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html
index 1eb776ee3..d74bfc497 100644
--- a/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-16-read-information-about-expanded-disclosure-button-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
index 00415c68d..7efd0f0a5 100644
--- a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
index 224b08cde..f1a08de02 100644
--- a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html
index ed53dd248..99ad886f0 100644
--- a/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-17-read-information-about-expanded-disclosure-button-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index f742423ad..22e0427c6 100644
--- a/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html
index a0593bfec..9df6d38ea 100644
--- a/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-18-read-information-about-expanded-disclosure-button-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
index 568a162c6..9e0730a38 100644
--- a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
index ff2b1c422..df954bd1e 100644
--- a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html
index 8f931eaae..31271b66f 100644
--- a/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-19-operate-collapsed-disclosure-button-reading.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
index 78c8d39ba..32c98b12c 100644
--- a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
index f6d86c115..24749ff8d 100644
--- a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html
index 6c191cecf..e0b5ef20a 100644
--- a/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-20-operate-collapsed-disclosure-button-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index a1b06a6fc..36ff4b28c 100644
--- a/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToFirstDisclosure",
       "description": "sets focus on the first disclosure button",
diff --git a/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html
index d2c2cda76..4b62922ff 100644
--- a/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-21-operate-collapsed-disclosure-button-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
index 528fd0ae3..f266c19c6 100644
--- a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
index b600172e8..cf2c3130c 100644
--- a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html
index 64bb4f8d3..0770ea1ea 100644
--- a/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-22-operate-expanded-disclosure-button-reading.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
index 8c7d043a1..6450a2280 100644
--- a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
index eaa19b63c..52f1b76af 100644
--- a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html
index e7fcb69c5..d9499772a 100644
--- a/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-23-operate-expanded-disclosure-button-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
index 3d06d15a4..d81bed90d 100644
--- a/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html
index 8909fb715..e1bebb9c3 100644
--- a/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-24-operate-expanded-disclosure-button-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-jaws.collected.json
index 8147d0962..416c9ea69 100644
--- a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-nvda.collected.json
index 0517da776..df21438cb 100644
--- a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html
index 3d8a67c2b..76c1881c2 100644
--- a/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html
+++ b/build/tests/disclosure-navigation/test-25-navigate-from-expanded-disclosure-button-to-link-in-dropdown-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-jaws.collected.json
index 6797722b6..a7ef9e0e1 100644
--- a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-nvda.collected.json
index 39bfb5f49..3fd4dfc38 100644
--- a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
index 4b1c6fe3a..62a668541 100644
--- a/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-26-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-voiceover_macos.collected.json
index 2e01698b8..368fcbbbc 100644
--- a/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosure",
       "description": "sets focus on the first disclosure button, and sets its state to expanded",
diff --git a/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
index 7665aef7e..85b4b3069 100644
--- a/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-27-navigate-from-expanded-disclosure-button-to-link-in-dropdown-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosure.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-jaws.collected.json
index 04917de10..296555b43 100644
--- a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosureAndSetCurrentPage",
       "description": "sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page",
diff --git a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-nvda.collected.json
index c8d5ab978..9cd04d289 100644
--- a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosureAndSetCurrentPage",
       "description": "sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page",
diff --git a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html
index a22e6f9aa..b3d8b8b4c 100644
--- a/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html
+++ b/build/tests/disclosure-navigation/test-28-navigate-from-expanded-disclosure-button-to-current-page-link-reading.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-jaws.collected.json
index f6122df0e..76702d37a 100644
--- a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosureAndSetCurrentPage",
       "description": "sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page",
diff --git a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-nvda.collected.json
index 2adf757b1..c724a1efa 100644
--- a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosureAndSetCurrentPage",
       "description": "sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page",
diff --git a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
index 6cf2dec24..6304db6ab 100644
--- a/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
+++ b/build/tests/disclosure-navigation/test-29-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-voiceover_macos.collected.json
index 0e06ccaf4..6d2492caa 100644
--- a/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html",
     "setupScript": {
       "name": "moveFocusToAndExpandFirstDisclosureAndSetCurrentPage",
       "description": "sets focus on the first disclosure button, sets its state to expanded, and marks the first link in the associated dropdown as being the current page",
diff --git a/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html b/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
index 6d9267e58..63d2a794e 100644
--- a/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
+++ b/build/tests/disclosure-navigation/test-30-navigate-from-expanded-disclosure-button-to-current-page-link-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToAndExpandFirstDisclosureAndSetCurrentPage.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-jaws.collected.json
index a702056f2..ff0264135 100644
--- a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-nvda.collected.json
index a630a30bc..a75bdc828 100644
--- a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html
index 9cfe7cb70..e001b96bd 100644
--- a/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html
+++ b/build/tests/disclosure-navigation/test-31-navigate-from-dropdown-to-collapsed-disclosure-button-reading.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-jaws.collected.json
index a8e9efe3d..ad288fbf3 100644
--- a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-nvda.collected.json
index 355fae82d..d7182ccb4 100644
--- a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
index 9c30ad5a3..201e3e644 100644
--- a/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-32-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
index ceab0af14..88022cef5 100644
--- a/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html b/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
index 52465ed61..44ec64a50 100644
--- a/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
+++ b/build/tests/disclosure-navigation/test-33-navigate-from-dropdown-to-collapsed-disclosure-button-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-jaws.collected.json
index e6eeba8dc..99b981e75 100644
--- a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-nvda.collected.json
index dd03bb036..86b7b649a 100644
--- a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html
index 258db1582..019b5e7d0 100644
--- a/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html
+++ b/build/tests/disclosure-navigation/test-34-navigate-forwards-to-link-in-dropdown-reading.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-jaws.collected.json
index ee1f79d7e..6901d9350 100644
--- a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-nvda.collected.json
index df673354a..957812047 100644
--- a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html
index cc155b96b..221a19749 100644
--- a/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html
+++ b/build/tests/disclosure-navigation/test-35-navigate-backwards-to-link-in-dropdown-reading.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-jaws.collected.json
index 016e20adc..72fe0ca5b 100644
--- a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-nvda.collected.json
index d95d30725..98cf6644c 100644
--- a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html
index 01ae8dc58..d57a8407f 100644
--- a/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-36-navigate-forwards-to-link-in-dropdown-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-jaws.collected.json
index 62a01e3f7..86dcc7801 100644
--- a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-nvda.collected.json
index 5d644916e..de38bdddd 100644
--- a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html
index 0da06a76c..85a40ca9c 100644
--- a/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-37-navigate-backwards-to-link-in-dropdown-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
index 5a58e30d2..a2fe2f115 100644
--- a/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html
index 2aebb6e7c..006e0dd0e 100644
--- a/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-38-navigate-forwards-to-link-in-dropdown-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
index 9aad17ce1..551b8fdf2 100644
--- a/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html
index e763c254f..9a27f2d73 100644
--- a/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-39-navigate-backwards-to-link-in-dropdown-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-jaws.collected.json
index 35f51e514..df80b81a3 100644
--- a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-nvda.collected.json
index 2b5d9867a..8c889e0ca 100644
--- a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html
index dcaf2577a..57d24537c 100644
--- a/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-40-navigate-to-first-link-in-dropdown-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-jaws.collected.json
index 247113fda..950950e4d 100644
--- a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-nvda.collected.json
index bcf8ca9fc..61eb1221a 100644
--- a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html
index 263cafc75..076e74b60 100644
--- a/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-41-navigate-to-last-link-in-dropdown-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction-voiceover_macos.collected.json
index a407e18a0..310835665 100644
--- a/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToSecondLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the second link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html
index 3ce681faf..fedfb029d 100644
--- a/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-42-navigate-to-first-link-in-dropdown-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToSecondLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction-voiceover_macos.collected.json
index ce0383ad0..aeeba4ca4 100644
--- a/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html
index 5b14eff52..1d60c6253 100644
--- a/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-43-navigate-to-last-link-in-dropdown-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-jaws.collected.json b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-jaws.collected.json
index 39ec564fd..34a9be1c0 100644
--- a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-nvda.collected.json b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-nvda.collected.json
index 297a543f1..384261342 100644
--- a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html
index 15e75b94c..affab13f9 100644
--- a/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html
+++ b/build/tests/disclosure-navigation/test-44-activate-link-in-dropdown-reading.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-jaws.collected.json b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-jaws.collected.json
index 930a2ebe6..f6b3f9477 100644
--- a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-jaws.collected.json
+++ b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-nvda.collected.json b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-nvda.collected.json
index 255fe1a1f..23330d2c0 100644
--- a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-nvda.collected.json
+++ b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html
index 2bf84a4e7..8fd67f41f 100644
--- a/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-45-activate-link-in-dropdown-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction-voiceover_macos.collected.json b/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction-voiceover_macos.collected.json
index 1392ccce7..55763a021 100644
--- a/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction-voiceover_macos.collected.json
+++ b/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/disclosure-navigation.html",
+    "referencePage": "reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html",
     "setupScript": {
       "name": "moveFocusToFirstLinkInDropdown",
       "description": "sets the state of the first disclosure button to expanded, and sets focus on the first link of the associated dropdown",
diff --git a/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html b/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html
index 71c03f8b8..0301d8d50 100644
--- a/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html
+++ b/build/tests/disclosure-navigation/test-46-activate-link-in-dropdown-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/disclosure-navigation.html");
+    displayTestPageAndInstructions("reference/disclosure-navigation.moveFocusToFirstLinkInDropdown.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html
new file mode 100644
index 000000000..a4014c527
--- /dev/null
+++ b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using aria-activedescendant</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions-active-descendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // openMenuAndSetFocusToFirstItem
+          // opens the menu, and sets focus on 'Action 1'
+          testPageDocument.defaultView.menuController.openPopup();
+          testPageDocument.defaultView.menuController.setFocusToFirstMenuitem();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using aria-activedescendant</h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+            <ul id="menu1"
+                role="menu"
+                tabindex="-1"
+                aria-labelledby="menubutton1"
+                aria-activedescendant="mi1">
+              <li id="mi1" role="menuitem">Action 1</li>
+              <li id="mi2" role="menuitem">Action 2</li>
+              <li id="mi3" role="menuitem">Action 3</li>
+              <li id="mi4" role="menuitem">Action 4</li>
+
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html
new file mode 100644
index 000000000..fd172fa53
--- /dev/null
+++ b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using aria-activedescendant</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions-active-descendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // openMenuAndSetFocusToLastItem
+          // opens the menu, and sets focus on 'Action 4'
+          testPageDocument.defaultView.menuController.openPopup();
+          testPageDocument.defaultView.menuController.setFocusToLastMenuitem();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using aria-activedescendant</h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+            <ul id="menu1"
+                role="menu"
+                tabindex="-1"
+                aria-labelledby="menubutton1"
+                aria-activedescendant="mi1">
+              <li id="mi1" role="menuitem">Action 1</li>
+              <li id="mi2" role="menuitem">Action 2</li>
+              <li id="mi3" role="menuitem">Action 3</li>
+              <li id="mi4" role="menuitem">Action 4</li>
+
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html
new file mode 100644
index 000000000..a948e0d7b
--- /dev/null
+++ b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using aria-activedescendant</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions-active-descendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusAfterMenuButton
+          // sets focus on a link after the menu button
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using aria-activedescendant</h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+            <ul id="menu1"
+                role="menu"
+                tabindex="-1"
+                aria-labelledby="menubutton1"
+                aria-activedescendant="mi1">
+              <li id="mi1" role="menuitem">Action 1</li>
+              <li id="mi2" role="menuitem">Action 2</li>
+              <li id="mi3" role="menuitem">Action 3</li>
+              <li id="mi4" role="menuitem">Action 4</li>
+
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html
new file mode 100644
index 000000000..4ac86f1e1
--- /dev/null
+++ b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using aria-activedescendant</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions-active-descendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusBeforeMenuButton
+          // sets focus on a link before the menu button
+          testPageDocument.querySelector('#beforelink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using aria-activedescendant</h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+            <ul id="menu1"
+                role="menu"
+                tabindex="-1"
+                aria-labelledby="menubutton1"
+                aria-activedescendant="mi1">
+              <li id="mi1" role="menuitem">Action 1</li>
+              <li id="mi2" role="menuitem">Action 2</li>
+              <li id="mi3" role="menuitem">Action 3</li>
+              <li id="mi4" role="menuitem">Action 4</li>
+
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html
new file mode 100644
index 000000000..1eee26402
--- /dev/null
+++ b/build/tests/menu-button-actions-active-descendant/reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using aria-activedescendant</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions-active-descendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnMenuButton
+          // sets focus on the menu button
+          testPageDocument.querySelector('#menubutton1').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using aria-activedescendant</h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+            <ul id="menu1"
+                role="menu"
+                tabindex="-1"
+                aria-labelledby="menubutton1"
+                aria-activedescendant="mi1">
+              <li id="mi1" role="menuitem">Action 1</li>
+              <li id="mi2" role="menuitem">Action 2</li>
+              <li id="mi3" role="menuitem">Action 3</li>
+              <li id="mi4" role="menuitem">Action 4</li>
+
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
index 883bd766f..14e62667b 100644
--- a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
index 0ab0f67c1..984248053 100644
--- a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html
index f3231209f..10ff56065 100644
--- a/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html
+++ b/build/tests/menu-button-actions-active-descendant/test-01-navigate-forwards-to-menu-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
index f60728729..fdab1cf4a 100644
--- a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
index cbc8e85e4..12a12ad80 100644
--- a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html
index 4409aa419..9eaa9eff1 100644
--- a/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html
+++ b/build/tests/menu-button-actions-active-descendant/test-02-navigate-backwards-to-menu-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
index 3a2f5dfd2..da701637c 100644
--- a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
index 26fa2abff..a1719ee8e 100644
--- a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html
index b3c4670b6..d1a461e0c 100644
--- a/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-03-navigate-forwards-to-menu-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
index 7439538c4..380572de6 100644
--- a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
index e2fb9721d..d2edb3374 100644
--- a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html
index 0988c8377..0dabec5ec 100644
--- a/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-04-navigate-backwards-to-menu-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
index b45d9dc53..c4a9127e2 100644
--- a/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html
index fce90f18c..3d5a95a0d 100644
--- a/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-05-navigate-forwards-to-menu-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
index cd2ee18a7..7eb6d95f3 100644
--- a/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html
index 441ce39a3..c44ec0b76 100644
--- a/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-06-navigate-backwards-to-menu-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-jaws.collected.json
index 86e64792e..0bc601953 100644
--- a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-nvda.collected.json
index fc5a0eaf2..399de9b97 100644
--- a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html
index 595f19ebb..7110728ac 100644
--- a/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html
+++ b/build/tests/menu-button-actions-active-descendant/test-07-read-information-about-menu-button-reading.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-jaws.collected.json
index 7f9395575..faa37fa71 100644
--- a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-nvda.collected.json
index 5dee95ad5..63f900bc3 100644
--- a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html
index 89b20b1b8..5dfc91186 100644
--- a/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-08-read-information-about-menu-button-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
index 8520abd21..e71db17d4 100644
--- a/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html b/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html
index 5b74effb1..b8da120f8 100644
--- a/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-09-read-information-about-menu-button-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-jaws.collected.json
index 6fb9cd491..26325b11e 100644
--- a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-nvda.collected.json
index 82003cbc5..31814dccc 100644
--- a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html
index bda50c0f5..7db37cf7b 100644
--- a/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html
+++ b/build/tests/menu-button-actions-active-descendant/test-10-open-menu-reading.html
@@ -89,7 +89,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-jaws.collected.json
index 535d87429..aa66336b9 100644
--- a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-nvda.collected.json
index 000efc933..03a89f202 100644
--- a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html
index 704d67d14..499652b2f 100644
--- a/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-11-open-menu-interaction.html
@@ -89,7 +89,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction-voiceover_macos.collected.json
index eb24db89e..0b69592ca 100644
--- a/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html
index 7441b2722..6f1f81ec2 100644
--- a/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-12-open-menu-interaction.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-jaws.collected.json
index ddcb0616f..83b2974f7 100644
--- a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-nvda.collected.json
index c0b70a70f..8ce3b899b 100644
--- a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html
index 71014894a..d25efb538 100644
--- a/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-13-open-menu-to-last-item-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
index 783ba076a..264888b52 100644
--- a/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html
index ae2883a0a..0b98f5945 100644
--- a/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-14-open-menu-to-last-item-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-jaws.collected.json
index f6595d1a4..fb60300da 100644
--- a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-nvda.collected.json
index 969e9254a..03b06d5b6 100644
--- a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html
index e8f2e8e43..3c62e46fe 100644
--- a/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-15-read-information-about-menu-item-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
index 04de6682c..ae2404b63 100644
--- a/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html
index 4acc060fc..17f610c38 100644
--- a/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-16-read-information-about-menu-item-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
index 578356522..f60dc0dcd 100644
--- a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
index 19b131aa9..952df67bd 100644
--- a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html
index 1aaeade7d..12ffe8975 100644
--- a/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-17-navigate-to-first-item-in-menu-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
index 164770ad1..f1012ad8c 100644
--- a/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html
index 6de603d43..30192cac1 100644
--- a/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-18-navigate-to-first-item-in-menu-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToLastItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
index a5cae6f78..17f9561af 100644
--- a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
index 3e5651580..fab361a31 100644
--- a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html
index 64cf7f0c2..faa8d88c1 100644
--- a/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-19-navigate-to-last-item-in-menu-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
index 1b77d2f05..f18f286a4 100644
--- a/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html
index 87addb267..11e5e8765 100644
--- a/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-20-navigate-to-last-item-in-menu-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
index 8632cf65f..8cc7b6e4d 100644
--- a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
index 85c1bfd03..51add45a8 100644
--- a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
index 2274934e7..ac58a8d0d 100644
--- a/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
index 90a57e99c..b862aeb16 100644
--- a/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html b/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
index 70d1b87a0..d76cbb51d 100644
--- a/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-jaws.collected.json
index 85bd251b8..51345694c 100644
--- a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-nvda.collected.json
index 731543d1f..8fe993197 100644
--- a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html
index 02dabac52..c39c5a266 100644
--- a/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-23-activate-menu-item-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
index 0ea45563c..cf1a2ad1c 100644
--- a/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html b/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html
index 2a6201f2e..a0d1a3ffe 100644
--- a/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-24-activate-menu-item-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-jaws.collected.json
index 0c2b8713d..56c21ef6d 100644
--- a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-nvda.collected.json
index 5212660a0..1d2f435b7 100644
--- a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html
index 550475ed8..ba4087cfd 100644
--- a/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-25-close-menu-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction-voiceover_macos.collected.json
index 40558c346..8ef5fad26 100644
--- a/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.html",
+    "referencePage": "reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html b/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html
index f8c987ddb..029d1f743 100644
--- a/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html
+++ b/build/tests/menu-button-actions-active-descendant/test-26-close-menu-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.html");
+    displayTestPageAndInstructions("reference/2021-1-14_171136/menu-button-actions-active-descendant.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html
new file mode 100644
index 000000000..09aeaeff6
--- /dev/null
+++ b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using element.focus()</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // openMenuAndSetFocusToFirstItem
+          // opens the menu, and sets focus on 'Action 1'
+          testPageDocument.defaultView.menuController.openPopup();
+          testPageDocument.defaultView.menuController.setFocusToFirstMenuitem();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using <code>element.focus()</code></h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+
+            <ul id="menu1" role="menu" aria-labelledby="menubutton1">
+              <li role="menuitem">Action 1</li>
+              <li role="menuitem">Action 2</li>
+              <li role="menuitem">Action 3</li>
+              <li role="menuitem">Action 4</li>
+            </ul>
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html
new file mode 100644
index 000000000..b3ac67f3c
--- /dev/null
+++ b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using element.focus()</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // openMenuAndSetFocusToLastItem
+          // opens the menu, and sets focus on 'Action 4'
+          testPageDocument.defaultView.menuController.openPopup();
+          testPageDocument.defaultView.menuController.setFocusToLastMenuitem();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using <code>element.focus()</code></h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+
+            <ul id="menu1" role="menu" aria-labelledby="menubutton1">
+              <li role="menuitem">Action 1</li>
+              <li role="menuitem">Action 2</li>
+              <li role="menuitem">Action 3</li>
+              <li role="menuitem">Action 4</li>
+            </ul>
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html
new file mode 100644
index 000000000..209b0f6e2
--- /dev/null
+++ b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using element.focus()</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusAfterMenuButton
+          // sets focus on a link after the menu button
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using <code>element.focus()</code></h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+
+            <ul id="menu1" role="menu" aria-labelledby="menubutton1">
+              <li role="menuitem">Action 1</li>
+              <li role="menuitem">Action 2</li>
+              <li role="menuitem">Action 3</li>
+              <li role="menuitem">Action 4</li>
+            </ul>
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html
new file mode 100644
index 000000000..bb4d1442d
--- /dev/null
+++ b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using element.focus()</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusBeforeMenuButton
+          // sets focus on a link before the menu button
+          testPageDocument.querySelector('#beforelink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using <code>element.focus()</code></h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+
+            <ul id="menu1" role="menu" aria-labelledby="menubutton1">
+              <li role="menuitem">Action 1</li>
+              <li role="menuitem">Action 2</li>
+              <li role="menuitem">Action 3</li>
+              <li role="menuitem">Action 4</li>
+            </ul>
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html
new file mode 100644
index 000000000..a73c46862
--- /dev/null
+++ b/build/tests/menu-button-actions/reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>Actions Menu Button Example Using element.focus()</title>
+
+
+    <link href="css/menu-button-actions.css" rel="stylesheet">
+    <script src="js/menu-button-actions.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnMenuButton
+          // sets focus on the menu button
+          testPageDocument.querySelector('#menubutton1').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Actions Menu Button Example Using <code>element.focus()</code></h1>
+      <p>
+        This example demonstrates how the
+        <a href="https://w3c.github.io/aria-practices/#menubutton">menu button design pattern</a>
+      can be used to create a button that opens an actions menu.
+      In this example, choosing an action from the menu will cause the chosen action to be displayed in the <q>Last Action</q> edit box.
+    </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="menu-button-actions">
+            <button type="button"
+                id="menubutton1"
+                aria-haspopup="true"
+                aria-controls="menu1"
+                >
+              Actions
+              <svg xmlns="http://www.w3.org/2000/svg" class="down" width="12" height="9" viewBox="0 0 12 9">
+                <polygon points="1 0, 11 0, 6 8"></polygon>
+              </svg>
+
+
+            <ul id="menu1" role="menu" aria-labelledby="menubutton1">
+              <li role="menuitem">Action 1</li>
+              <li role="menuitem">Action 2</li>
+              <li role="menuitem">Action 3</li>
+              <li role="menuitem">Action 4</li>
+            </ul>
+          </div>
+          <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <p>
+          <label>Last Action: <input class="action" id="action_output" type="text" value=""></label>
+        </p>
+        </div>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
index 4b8e43142..80a67403a 100644
--- a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
index 651c6632d..804f61a24 100644
--- a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html
index e52c5e91f..d285e3a2f 100644
--- a/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html
+++ b/build/tests/menu-button-actions/test-01-navigate-forwards-to-menu-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
index 998ab656b..1a4b1b2c5 100644
--- a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
index 62917bbcf..9117d1906 100644
--- a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html
index f4bc513e4..b0b05a231 100644
--- a/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html
+++ b/build/tests/menu-button-actions/test-02-navigate-backwards-to-menu-button-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
index 514121ebc..a48221d42 100644
--- a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
index 9f387d002..c8e47b0b1 100644
--- a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html
index 74acf8fa8..89364cb2f 100644
--- a/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-03-navigate-forwards-to-menu-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
index f7c7fb511..02b20da66 100644
--- a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
index bd56d06c4..086e07218 100644
--- a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html
index 1d45061a8..46c01ee5b 100644
--- a/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-04-navigate-backwards-to-menu-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
index ee60e72c2..796b5032e 100644
--- a/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html",
     "setupScript": {
       "name": "setFocusBeforeMenuButton",
       "description": "sets focus on a link before the menu button",
diff --git a/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html b/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html
index 9278672a3..695e50d46 100644
--- a/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-05-navigate-forwards-to-menu-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusBeforeMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
index 52fb16d17..7b76fa02c 100644
--- a/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html",
     "setupScript": {
       "name": "setFocusAfterMenuButton",
       "description": "sets focus on a link after the menu button",
diff --git a/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html b/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html
index cce737d49..b7da33898 100644
--- a/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-06-navigate-backwards-to-menu-button-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusAfterMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-jaws.collected.json b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-jaws.collected.json
index f92bfb0e1..1baaccc39 100644
--- a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-nvda.collected.json b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-nvda.collected.json
index cd8443d3e..06456b1dd 100644
--- a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html
index 65f007b92..09575c7a8 100644
--- a/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html
+++ b/build/tests/menu-button-actions/test-07-read-information-about-menu-button-reading.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-jaws.collected.json
index ebd02eed5..ded57b90a 100644
--- a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-nvda.collected.json
index d4daa6871..1f51b9b88 100644
--- a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html
index 401f19a71..ffe0b9fc8 100644
--- a/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-08-read-information-about-menu-button-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
index 8516c4c85..530732f3d 100644
--- a/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html b/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html
index 1f40842b3..2bbe6d69c 100644
--- a/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html
+++ b/build/tests/menu-button-actions/test-09-read-information-about-menu-button-interaction.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-10-open-menu-reading-jaws.collected.json b/build/tests/menu-button-actions/test-10-open-menu-reading-jaws.collected.json
index d4c8350f0..869c60b84 100644
--- a/build/tests/menu-button-actions/test-10-open-menu-reading-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-10-open-menu-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-10-open-menu-reading-nvda.collected.json b/build/tests/menu-button-actions/test-10-open-menu-reading-nvda.collected.json
index b466049f1..0ac950ede 100644
--- a/build/tests/menu-button-actions/test-10-open-menu-reading-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-10-open-menu-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-10-open-menu-reading.html b/build/tests/menu-button-actions/test-10-open-menu-reading.html
index fb950abe4..1f1e0efd0 100644
--- a/build/tests/menu-button-actions/test-10-open-menu-reading.html
+++ b/build/tests/menu-button-actions/test-10-open-menu-reading.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-11-open-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-11-open-menu-interaction-jaws.collected.json
index a251b42ee..d84efdbbd 100644
--- a/build/tests/menu-button-actions/test-11-open-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-11-open-menu-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-11-open-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-11-open-menu-interaction-nvda.collected.json
index cb83cc880..89ac1950c 100644
--- a/build/tests/menu-button-actions/test-11-open-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-11-open-menu-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-11-open-menu-interaction.html b/build/tests/menu-button-actions/test-11-open-menu-interaction.html
index 3e631814d..bea25baca 100644
--- a/build/tests/menu-button-actions/test-11-open-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-11-open-menu-interaction.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-12-open-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-12-open-menu-interaction-voiceover_macos.collected.json
index 1e9cc7b9b..308cd472c 100644
--- a/build/tests/menu-button-actions/test-12-open-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-12-open-menu-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-12-open-menu-interaction.html b/build/tests/menu-button-actions/test-12-open-menu-interaction.html
index 902474e0c..4496a3819 100644
--- a/build/tests/menu-button-actions/test-12-open-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-12-open-menu-interaction.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-jaws.collected.json
index 0e238bc81..ee0ad8cab 100644
--- a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-nvda.collected.json
index d128beb32..3c55d6d35 100644
--- a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html
index ab33bb111..ee520856e 100644
--- a/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html
+++ b/build/tests/menu-button-actions/test-13-open-menu-to-last-item-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
index d82d24334..8acd855df 100644
--- a/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html",
     "setupScript": {
       "name": "setFocusOnMenuButton",
       "description": "sets focus on the menu button",
diff --git a/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html b/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html
index 050fc7267..9a3d6a188 100644
--- a/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html
+++ b/build/tests/menu-button-actions/test-14-open-menu-to-last-item-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.setFocusOnMenuButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-jaws.collected.json
index 1c8a1dcd2..7705c15b2 100644
--- a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-nvda.collected.json
index 08aca1be3..96de7e7b3 100644
--- a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html
index 8cbd119f1..fd67e48ce 100644
--- a/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html
+++ b/build/tests/menu-button-actions/test-15-read-information-about-menu-item-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
index 2bd0d867a..d5bab6b83 100644
--- a/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html b/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html
index a7511484c..b9ac0c92a 100644
--- a/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html
+++ b/build/tests/menu-button-actions/test-16-read-information-about-menu-item-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
index af6da1c7a..de39ae373 100644
--- a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
index 70697fa63..65821e177 100644
--- a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html
index ed93974ad..ac5881d65 100644
--- a/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-17-navigate-to-first-item-in-menu-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
index 7ea965ee0..3023e61b8 100644
--- a/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToLastItem",
       "description": "opens the menu, and sets focus on 'Action 4'",
diff --git a/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html b/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html
index 2ec2b9f49..05170b509 100644
--- a/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-18-navigate-to-first-item-in-menu-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToLastItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
index 216d58b9a..ee9ce89c3 100644
--- a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
index 3f040c438..edbd8ad2a 100644
--- a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html
index fda173c46..35ad42fab 100644
--- a/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-19-navigate-to-last-item-in-menu-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
index a652302b4..a18ae6b7f 100644
--- a/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html b/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html
index 56d056f5d..f585f1c51 100644
--- a/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-20-navigate-to-last-item-in-menu-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
index 2f60ddb83..7b82709ee 100644
--- a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
index 3bc48c16e..f1b1994c4 100644
--- a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
index a5f7517c5..02400f384 100644
--- a/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
+++ b/build/tests/menu-button-actions/test-21-navigate-to-item-in-menu-by-typing-character-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
index ac77db795..eec52adce 100644
--- a/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html b/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
index 8064111e2..3c9a45b54 100644
--- a/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
+++ b/build/tests/menu-button-actions/test-22-navigate-to-item-in-menu-by-typing-character-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-jaws.collected.json
index 791bf1ff0..bd27cdcf8 100644
--- a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-nvda.collected.json
index 8068c340d..95dada95a 100644
--- a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction.html b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction.html
index fd9c19d24..4adeb8aa2 100644
--- a/build/tests/menu-button-actions/test-23-activate-menu-item-interaction.html
+++ b/build/tests/menu-button-actions/test-23-activate-menu-item-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-24-activate-menu-item-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
index d0eacf760..c530c8e72 100644
--- a/build/tests/menu-button-actions/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-24-activate-menu-item-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-24-activate-menu-item-interaction.html b/build/tests/menu-button-actions/test-24-activate-menu-item-interaction.html
index c660f2513..aa249c21a 100644
--- a/build/tests/menu-button-actions/test-24-activate-menu-item-interaction.html
+++ b/build/tests/menu-button-actions/test-24-activate-menu-item-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-25-close-menu-interaction-jaws.collected.json b/build/tests/menu-button-actions/test-25-close-menu-interaction-jaws.collected.json
index f50dd7d5b..60d2d6dfa 100644
--- a/build/tests/menu-button-actions/test-25-close-menu-interaction-jaws.collected.json
+++ b/build/tests/menu-button-actions/test-25-close-menu-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-25-close-menu-interaction-nvda.collected.json b/build/tests/menu-button-actions/test-25-close-menu-interaction-nvda.collected.json
index 42bd201e3..b131ec757 100644
--- a/build/tests/menu-button-actions/test-25-close-menu-interaction-nvda.collected.json
+++ b/build/tests/menu-button-actions/test-25-close-menu-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-25-close-menu-interaction.html b/build/tests/menu-button-actions/test-25-close-menu-interaction.html
index da9049ecd..9d703b36a 100644
--- a/build/tests/menu-button-actions/test-25-close-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-25-close-menu-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menu-button-actions/test-26-close-menu-interaction-voiceover_macos.collected.json b/build/tests/menu-button-actions/test-26-close-menu-interaction-voiceover_macos.collected.json
index 789a6594d..22cab1c37 100644
--- a/build/tests/menu-button-actions/test-26-close-menu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menu-button-actions/test-26-close-menu-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-1-14_12348/menu-button-actions.html",
+    "referencePage": "reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html",
     "setupScript": {
       "name": "openMenuAndSetFocusToFirstItem",
       "description": "opens the menu, and sets focus on 'Action 1'",
diff --git a/build/tests/menu-button-actions/test-26-close-menu-interaction.html b/build/tests/menu-button-actions/test-26-close-menu-interaction.html
index d41652c3e..70decf69e 100644
--- a/build/tests/menu-button-actions/test-26-close-menu-interaction.html
+++ b/build/tests/menu-button-actions/test-26-close-menu-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.html");
+    displayTestPageAndInstructions("reference/2021-1-14_12348/menu-button-actions.openMenuAndSetFocusToFirstItem.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html
new file mode 100644
index 000000000..82807f5ce
--- /dev/null
+++ b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Editor Menubar Example | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../css/core.css" >
+  <script src="../js/examples.js"></script>
+  <script src="../js/highlight.pack.js"></script>
+  <script src="../js/app.js"></script>
+
+
+  <link href="css/menubar-editor.css" rel="stylesheet" >
+  <script src="js/menubar-editor.js"    type="text/javascript"></script>
+  <script src="js/style-manager.js"    type="text/javascript"></script>
+
+
+  <link rel="preload" as="image" href="images/checkbox-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/checkbox-checked.svg" >
+  <link rel="preload" as="image" href="images/down-arrow-focus.svg" >
+  <link rel="preload" as="image" href="images/down-arrow.svg" >
+  <link rel="preload" as="image" href="images/radio-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/radio-checked.svg" >
+  <link rel="preload" as="image" href="images/separator.svg" >
+  <link rel="preload" as="image" href="images/up-arrow-focus.svg" >
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // focusonfirstlink
+        // Move focus to the link just before the meunbar
+        testPageDocument.querySelector('a').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Editor Menubar Example</h1>
+
+  <div id="ex1">
+      <div class="menubar-editor">
+        <ul role="menubar" aria-label="Text Formatting">
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="0">Font</span>
+            <ul role="menu" data-option="font-family" aria-label="Font" >
+              <li role="menuitemradio" aria-checked="true">Sans-serif</li>
+              <li role="menuitemradio" aria-checked="false">Serif</li>
+              <li role="menuitemradio" aria-checked="false">Monospace</li>
+              <li role="menuitemradio" aria-checked="false">Fantasy</li>
+            </ul>
+          </li>
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Style/Color</span>
+            <ul role="menu" aria-label="Style/Color">
+              <li role="none">
+                <ul role="group" data-option="font-style" aria-label="Font Style">
+                  <li role="menuitemcheckbox" data-option="font-bold" aria-checked="false">Bold</li>
+                  <li role="menuitemcheckbox" data-option="font-italic" aria-checked="false">Italic</li>
+                </ul>
+              </li>
+              <li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="font-color" aria-label="Text Color">
+                  <li role="menuitemradio" aria-checked="true">Black</li>
+                  <li role="menuitemradio" aria-checked="false">Blue</li>
+                  <li role="menuitemradio" aria-checked="false">Red</li>
+                  <li role="menuitemradio" aria-checked="false">Green</li>
+                </ul>
+              </li><li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="text-decoration" aria-label="Text Decoration">
+                  <li role="menuitemradio" aria-checked="true">None</li>
+                  <li role="menuitemradio" aria-checked="false">Overline</li>
+                  <li role="menuitemradio" aria-checked="false">Line-through</li>
+                  <li role="menuitemradio" aria-checked="false">Underline</li>
+                </ul>
+            </li></ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Text Align</span>
+            <ul role="menu" data-option="text-align" aria-label="Text Align">
+              <li role="menuitemradio" aria-checked="true">Left</li>
+              <li role="menuitemradio" aria-checked="false">Center</li>
+              <li role="menuitemradio" aria-checked="false">Right</li>
+              <li role="menuitemradio" aria-checked="false">Justify</li>
+            </ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Size</span>
+            <ul role="menu" aria-label="Size" >
+              <li role="menuitem" data-option="font-smaller" aria-disabled="false">Smaller</li>
+              <li role="menuitem" data-option="font-larger"  aria-disabled="false">Larger</li>
+              <li role="separator"></li>
+              <li>
+                <ul role="group" data-option="font-size" aria-label="Font Sizes">
+                  <li role="menuitemradio" aria-checked="false">X-Small</li>
+                  <li role="menuitemradio" aria-checked="false">Small</li>
+                  <li role="menuitemradio" aria-checked="true">Medium</li>
+                  <li role="menuitemradio" aria-checked="false">Large</li>
+                  <li role="menuitemradio" aria-checked="false">X-Large</li>
+                </ul>
+            </li></ul>
+          </li>
+        </ul>
+        <textarea style="font-size: medium; font-family: sans-serif" aria-label="Text Sample"
+        >
+            Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.
+
+            Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.
+
+            But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow, this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us, that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion, that we here highly resolve that these dead shall not have died in vain, that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.
+
+      </div>
+
+      <p>
+        <a href="https://en.wikipedia.org/wiki/Gettysburg,_Pennsylvania">More information on
+          Gettysburg Address</a>
+          <!-- Generated by create-example-tests.js -->
+          <div style="position: relative; left: 0; right: 0; height: 2rem;">
+            <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+          </div>
+          <!-- End of generated output -->
+      </p>
+
+
+    </div>
+</body>
+</html>
diff --git a/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfont.html b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfont.html
new file mode 100644
index 000000000..a4fa77a6a
--- /dev/null
+++ b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonfont.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Editor Menubar Example | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../css/core.css" >
+  <script src="../js/examples.js"></script>
+  <script src="../js/highlight.pack.js"></script>
+  <script src="../js/app.js"></script>
+
+
+  <link href="css/menubar-editor.css" rel="stylesheet" >
+  <script src="js/menubar-editor.js"    type="text/javascript"></script>
+  <script src="js/style-manager.js"    type="text/javascript"></script>
+
+
+  <link rel="preload" as="image" href="images/checkbox-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/checkbox-checked.svg" >
+  <link rel="preload" as="image" href="images/down-arrow-focus.svg" >
+  <link rel="preload" as="image" href="images/down-arrow.svg" >
+  <link rel="preload" as="image" href="images/radio-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/radio-checked.svg" >
+  <link rel="preload" as="image" href="images/separator.svg" >
+  <link rel="preload" as="image" href="images/up-arrow-focus.svg" >
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // focusonfont
+        // Move focus to the "Font" menu item
+        testPageDocument.querySelectorAll('[role=menuitem]')[0].focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Editor Menubar Example</h1>
+
+  <div id="ex1">
+      <div class="menubar-editor">
+        <ul role="menubar" aria-label="Text Formatting">
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="0">Font</span>
+            <ul role="menu" data-option="font-family" aria-label="Font" >
+              <li role="menuitemradio" aria-checked="true">Sans-serif</li>
+              <li role="menuitemradio" aria-checked="false">Serif</li>
+              <li role="menuitemradio" aria-checked="false">Monospace</li>
+              <li role="menuitemradio" aria-checked="false">Fantasy</li>
+            </ul>
+          </li>
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Style/Color</span>
+            <ul role="menu" aria-label="Style/Color">
+              <li role="none">
+                <ul role="group" data-option="font-style" aria-label="Font Style">
+                  <li role="menuitemcheckbox" data-option="font-bold" aria-checked="false">Bold</li>
+                  <li role="menuitemcheckbox" data-option="font-italic" aria-checked="false">Italic</li>
+                </ul>
+              </li>
+              <li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="font-color" aria-label="Text Color">
+                  <li role="menuitemradio" aria-checked="true">Black</li>
+                  <li role="menuitemradio" aria-checked="false">Blue</li>
+                  <li role="menuitemradio" aria-checked="false">Red</li>
+                  <li role="menuitemradio" aria-checked="false">Green</li>
+                </ul>
+              </li><li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="text-decoration" aria-label="Text Decoration">
+                  <li role="menuitemradio" aria-checked="true">None</li>
+                  <li role="menuitemradio" aria-checked="false">Overline</li>
+                  <li role="menuitemradio" aria-checked="false">Line-through</li>
+                  <li role="menuitemradio" aria-checked="false">Underline</li>
+                </ul>
+            </li></ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Text Align</span>
+            <ul role="menu" data-option="text-align" aria-label="Text Align">
+              <li role="menuitemradio" aria-checked="true">Left</li>
+              <li role="menuitemradio" aria-checked="false">Center</li>
+              <li role="menuitemradio" aria-checked="false">Right</li>
+              <li role="menuitemradio" aria-checked="false">Justify</li>
+            </ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Size</span>
+            <ul role="menu" aria-label="Size" >
+              <li role="menuitem" data-option="font-smaller" aria-disabled="false">Smaller</li>
+              <li role="menuitem" data-option="font-larger"  aria-disabled="false">Larger</li>
+              <li role="separator"></li>
+              <li>
+                <ul role="group" data-option="font-size" aria-label="Font Sizes">
+                  <li role="menuitemradio" aria-checked="false">X-Small</li>
+                  <li role="menuitemradio" aria-checked="false">Small</li>
+                  <li role="menuitemradio" aria-checked="true">Medium</li>
+                  <li role="menuitemradio" aria-checked="false">Large</li>
+                  <li role="menuitemradio" aria-checked="false">X-Large</li>
+                </ul>
+            </li></ul>
+          </li>
+        </ul>
+        <textarea style="font-size: medium; font-family: sans-serif" aria-label="Text Sample"
+        >
+            Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.
+
+            Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.
+
+            But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow, this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us, that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion, that we here highly resolve that these dead shall not have died in vain, that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.
+
+      </div>
+
+      <p>
+        <a href="https://en.wikipedia.org/wiki/Gettysburg,_Pennsylvania">More information on
+          Gettysburg Address</a>
+          <!-- Generated by create-example-tests.js -->
+          <div style="position: relative; left: 0; right: 0; height: 2rem;">
+            <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+          </div>
+          <!-- End of generated output -->
+      </p>
+
+
+    </div>
+</body>
+</html>
diff --git a/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonsize.html b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonsize.html
new file mode 100644
index 000000000..1fa28dc9e
--- /dev/null
+++ b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonsize.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Editor Menubar Example | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../css/core.css" >
+  <script src="../js/examples.js"></script>
+  <script src="../js/highlight.pack.js"></script>
+  <script src="../js/app.js"></script>
+
+
+  <link href="css/menubar-editor.css" rel="stylesheet" >
+  <script src="js/menubar-editor.js"    type="text/javascript"></script>
+  <script src="js/style-manager.js"    type="text/javascript"></script>
+
+
+  <link rel="preload" as="image" href="images/checkbox-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/checkbox-checked.svg" >
+  <link rel="preload" as="image" href="images/down-arrow-focus.svg" >
+  <link rel="preload" as="image" href="images/down-arrow.svg" >
+  <link rel="preload" as="image" href="images/radio-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/radio-checked.svg" >
+  <link rel="preload" as="image" href="images/separator.svg" >
+  <link rel="preload" as="image" href="images/up-arrow-focus.svg" >
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // focusonsize
+        // Move focus to the "Size" menu item
+        testPageDocument.querySelectorAll('[role=menuitem]')[3].focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Editor Menubar Example</h1>
+
+  <div id="ex1">
+      <div class="menubar-editor">
+        <ul role="menubar" aria-label="Text Formatting">
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="0">Font</span>
+            <ul role="menu" data-option="font-family" aria-label="Font" >
+              <li role="menuitemradio" aria-checked="true">Sans-serif</li>
+              <li role="menuitemradio" aria-checked="false">Serif</li>
+              <li role="menuitemradio" aria-checked="false">Monospace</li>
+              <li role="menuitemradio" aria-checked="false">Fantasy</li>
+            </ul>
+          </li>
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Style/Color</span>
+            <ul role="menu" aria-label="Style/Color">
+              <li role="none">
+                <ul role="group" data-option="font-style" aria-label="Font Style">
+                  <li role="menuitemcheckbox" data-option="font-bold" aria-checked="false">Bold</li>
+                  <li role="menuitemcheckbox" data-option="font-italic" aria-checked="false">Italic</li>
+                </ul>
+              </li>
+              <li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="font-color" aria-label="Text Color">
+                  <li role="menuitemradio" aria-checked="true">Black</li>
+                  <li role="menuitemradio" aria-checked="false">Blue</li>
+                  <li role="menuitemradio" aria-checked="false">Red</li>
+                  <li role="menuitemradio" aria-checked="false">Green</li>
+                </ul>
+              </li><li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="text-decoration" aria-label="Text Decoration">
+                  <li role="menuitemradio" aria-checked="true">None</li>
+                  <li role="menuitemradio" aria-checked="false">Overline</li>
+                  <li role="menuitemradio" aria-checked="false">Line-through</li>
+                  <li role="menuitemradio" aria-checked="false">Underline</li>
+                </ul>
+            </li></ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Text Align</span>
+            <ul role="menu" data-option="text-align" aria-label="Text Align">
+              <li role="menuitemradio" aria-checked="true">Left</li>
+              <li role="menuitemradio" aria-checked="false">Center</li>
+              <li role="menuitemradio" aria-checked="false">Right</li>
+              <li role="menuitemradio" aria-checked="false">Justify</li>
+            </ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Size</span>
+            <ul role="menu" aria-label="Size" >
+              <li role="menuitem" data-option="font-smaller" aria-disabled="false">Smaller</li>
+              <li role="menuitem" data-option="font-larger"  aria-disabled="false">Larger</li>
+              <li role="separator"></li>
+              <li>
+                <ul role="group" data-option="font-size" aria-label="Font Sizes">
+                  <li role="menuitemradio" aria-checked="false">X-Small</li>
+                  <li role="menuitemradio" aria-checked="false">Small</li>
+                  <li role="menuitemradio" aria-checked="true">Medium</li>
+                  <li role="menuitemradio" aria-checked="false">Large</li>
+                  <li role="menuitemradio" aria-checked="false">X-Large</li>
+                </ul>
+            </li></ul>
+          </li>
+        </ul>
+        <textarea style="font-size: medium; font-family: sans-serif" aria-label="Text Sample"
+        >
+            Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.
+
+            Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.
+
+            But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow, this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us, that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion, that we here highly resolve that these dead shall not have died in vain, that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.
+
+      </div>
+
+      <p>
+        <a href="https://en.wikipedia.org/wiki/Gettysburg,_Pennsylvania">More information on
+          Gettysburg Address</a>
+          <!-- Generated by create-example-tests.js -->
+          <div style="position: relative; left: 0; right: 0; height: 2rem;">
+            <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+          </div>
+          <!-- End of generated output -->
+      </p>
+
+
+    </div>
+</body>
+</html>
diff --git a/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html
new file mode 100644
index 000000000..593683e98
--- /dev/null
+++ b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Editor Menubar Example | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../css/core.css" >
+  <script src="../js/examples.js"></script>
+  <script src="../js/highlight.pack.js"></script>
+  <script src="../js/app.js"></script>
+
+
+  <link href="css/menubar-editor.css" rel="stylesheet" >
+  <script src="js/menubar-editor.js"    type="text/javascript"></script>
+  <script src="js/style-manager.js"    type="text/javascript"></script>
+
+
+  <link rel="preload" as="image" href="images/checkbox-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/checkbox-checked.svg" >
+  <link rel="preload" as="image" href="images/down-arrow-focus.svg" >
+  <link rel="preload" as="image" href="images/down-arrow.svg" >
+  <link rel="preload" as="image" href="images/radio-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/radio-checked.svg" >
+  <link rel="preload" as="image" href="images/separator.svg" >
+  <link rel="preload" as="image" href="images/up-arrow-focus.svg" >
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // focusonstylecolor
+        // Move focus to the "Style/Color" menu item
+        testPageDocument.querySelectorAll('[role=menuitem]')[1].focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Editor Menubar Example</h1>
+
+  <div id="ex1">
+      <div class="menubar-editor">
+        <ul role="menubar" aria-label="Text Formatting">
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="0">Font</span>
+            <ul role="menu" data-option="font-family" aria-label="Font" >
+              <li role="menuitemradio" aria-checked="true">Sans-serif</li>
+              <li role="menuitemradio" aria-checked="false">Serif</li>
+              <li role="menuitemradio" aria-checked="false">Monospace</li>
+              <li role="menuitemradio" aria-checked="false">Fantasy</li>
+            </ul>
+          </li>
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Style/Color</span>
+            <ul role="menu" aria-label="Style/Color">
+              <li role="none">
+                <ul role="group" data-option="font-style" aria-label="Font Style">
+                  <li role="menuitemcheckbox" data-option="font-bold" aria-checked="false">Bold</li>
+                  <li role="menuitemcheckbox" data-option="font-italic" aria-checked="false">Italic</li>
+                </ul>
+              </li>
+              <li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="font-color" aria-label="Text Color">
+                  <li role="menuitemradio" aria-checked="true">Black</li>
+                  <li role="menuitemradio" aria-checked="false">Blue</li>
+                  <li role="menuitemradio" aria-checked="false">Red</li>
+                  <li role="menuitemradio" aria-checked="false">Green</li>
+                </ul>
+              </li><li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="text-decoration" aria-label="Text Decoration">
+                  <li role="menuitemradio" aria-checked="true">None</li>
+                  <li role="menuitemradio" aria-checked="false">Overline</li>
+                  <li role="menuitemradio" aria-checked="false">Line-through</li>
+                  <li role="menuitemradio" aria-checked="false">Underline</li>
+                </ul>
+            </li></ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Text Align</span>
+            <ul role="menu" data-option="text-align" aria-label="Text Align">
+              <li role="menuitemradio" aria-checked="true">Left</li>
+              <li role="menuitemradio" aria-checked="false">Center</li>
+              <li role="menuitemradio" aria-checked="false">Right</li>
+              <li role="menuitemradio" aria-checked="false">Justify</li>
+            </ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Size</span>
+            <ul role="menu" aria-label="Size" >
+              <li role="menuitem" data-option="font-smaller" aria-disabled="false">Smaller</li>
+              <li role="menuitem" data-option="font-larger"  aria-disabled="false">Larger</li>
+              <li role="separator"></li>
+              <li>
+                <ul role="group" data-option="font-size" aria-label="Font Sizes">
+                  <li role="menuitemradio" aria-checked="false">X-Small</li>
+                  <li role="menuitemradio" aria-checked="false">Small</li>
+                  <li role="menuitemradio" aria-checked="true">Medium</li>
+                  <li role="menuitemradio" aria-checked="false">Large</li>
+                  <li role="menuitemradio" aria-checked="false">X-Large</li>
+                </ul>
+            </li></ul>
+          </li>
+        </ul>
+        <textarea style="font-size: medium; font-family: sans-serif" aria-label="Text Sample"
+        >
+            Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.
+
+            Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.
+
+            But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow, this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us, that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion, that we here highly resolve that these dead shall not have died in vain, that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.
+
+      </div>
+
+      <p>
+        <a href="https://en.wikipedia.org/wiki/Gettysburg,_Pennsylvania">More information on
+          Gettysburg Address</a>
+          <!-- Generated by create-example-tests.js -->
+          <div style="position: relative; left: 0; right: 0; height: 2rem;">
+            <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+          </div>
+          <!-- End of generated output -->
+      </p>
+
+
+    </div>
+</body>
+</html>
diff --git a/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusontextalign.html b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusontextalign.html
new file mode 100644
index 000000000..b2e0b2231
--- /dev/null
+++ b/build/tests/menubar-editor/reference/2020-11-23_175528/menubar-editor.focusontextalign.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Editor Menubar Example | WAI-ARIA Authoring Practices 1.2</title>
+
+
+  <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css" >
+  <link rel="stylesheet" href="../css/core.css" >
+  <script src="../js/examples.js"></script>
+  <script src="../js/highlight.pack.js"></script>
+  <script src="../js/app.js"></script>
+
+
+  <link href="css/menubar-editor.css" rel="stylesheet" >
+  <script src="js/menubar-editor.js"    type="text/javascript"></script>
+  <script src="js/style-manager.js"    type="text/javascript"></script>
+
+
+  <link rel="preload" as="image" href="images/checkbox-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/checkbox-checked.svg" >
+  <link rel="preload" as="image" href="images/down-arrow-focus.svg" >
+  <link rel="preload" as="image" href="images/down-arrow.svg" >
+  <link rel="preload" as="image" href="images/radio-checked-focus.svg" >
+  <link rel="preload" as="image" href="images/radio-checked.svg" >
+  <link rel="preload" as="image" href="images/separator.svg" >
+  <link rel="preload" as="image" href="images/up-arrow-focus.svg" >
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // focusontextalign
+        // Move focus to the "Text Align" menu item
+        testPageDocument.querySelectorAll('[role=menuitem]')[2].focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <h1>Editor Menubar Example</h1>
+
+  <div id="ex1">
+      <div class="menubar-editor">
+        <ul role="menubar" aria-label="Text Formatting">
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="0">Font</span>
+            <ul role="menu" data-option="font-family" aria-label="Font" >
+              <li role="menuitemradio" aria-checked="true">Sans-serif</li>
+              <li role="menuitemradio" aria-checked="false">Serif</li>
+              <li role="menuitemradio" aria-checked="false">Monospace</li>
+              <li role="menuitemradio" aria-checked="false">Fantasy</li>
+            </ul>
+          </li>
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Style/Color</span>
+            <ul role="menu" aria-label="Style/Color">
+              <li role="none">
+                <ul role="group" data-option="font-style" aria-label="Font Style">
+                  <li role="menuitemcheckbox" data-option="font-bold" aria-checked="false">Bold</li>
+                  <li role="menuitemcheckbox" data-option="font-italic" aria-checked="false">Italic</li>
+                </ul>
+              </li>
+              <li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="font-color" aria-label="Text Color">
+                  <li role="menuitemradio" aria-checked="true">Black</li>
+                  <li role="menuitemradio" aria-checked="false">Blue</li>
+                  <li role="menuitemradio" aria-checked="false">Red</li>
+                  <li role="menuitemradio" aria-checked="false">Green</li>
+                </ul>
+              </li><li role="separator"></li>
+              <li role="none">
+                <ul role="group" data-option="text-decoration" aria-label="Text Decoration">
+                  <li role="menuitemradio" aria-checked="true">None</li>
+                  <li role="menuitemradio" aria-checked="false">Overline</li>
+                  <li role="menuitemradio" aria-checked="false">Line-through</li>
+                  <li role="menuitemradio" aria-checked="false">Underline</li>
+                </ul>
+            </li></ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Text Align</span>
+            <ul role="menu" data-option="text-align" aria-label="Text Align">
+              <li role="menuitemradio" aria-checked="true">Left</li>
+              <li role="menuitemradio" aria-checked="false">Center</li>
+              <li role="menuitemradio" aria-checked="false">Right</li>
+              <li role="menuitemradio" aria-checked="false">Justify</li>
+            </ul>
+          </li>
+
+          <li role="none">
+            <span role="menuitem" aria-haspopup="true" aria-expanded="false" tabindex="-1">Size</span>
+            <ul role="menu" aria-label="Size" >
+              <li role="menuitem" data-option="font-smaller" aria-disabled="false">Smaller</li>
+              <li role="menuitem" data-option="font-larger"  aria-disabled="false">Larger</li>
+              <li role="separator"></li>
+              <li>
+                <ul role="group" data-option="font-size" aria-label="Font Sizes">
+                  <li role="menuitemradio" aria-checked="false">X-Small</li>
+                  <li role="menuitemradio" aria-checked="false">Small</li>
+                  <li role="menuitemradio" aria-checked="true">Medium</li>
+                  <li role="menuitemradio" aria-checked="false">Large</li>
+                  <li role="menuitemradio" aria-checked="false">X-Large</li>
+                </ul>
+            </li></ul>
+          </li>
+        </ul>
+        <textarea style="font-size: medium; font-family: sans-serif" aria-label="Text Sample"
+        >
+            Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.
+
+            Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.
+
+            But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow, this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us, that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion, that we here highly resolve that these dead shall not have died in vain, that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.
+
+      </div>
+
+      <p>
+        <a href="https://en.wikipedia.org/wiki/Gettysburg,_Pennsylvania">More information on
+          Gettysburg Address</a>
+          <!-- Generated by create-example-tests.js -->
+          <div style="position: relative; left: 0; right: 0; height: 2rem;">
+            <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+          </div>
+          <!-- End of generated output -->
+      </p>
+
+
+    </div>
+</body>
+</html>
diff --git a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-jaws.collected.json b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-jaws.collected.json
index 97479226d..a7472b7d5 100644
--- a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-nvda.collected.json b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-nvda.collected.json
index c2ee39bf7..d737ba1ab 100644
--- a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading.html b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
index 00f56df55..774ce11a7 100644
--- a/build/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
+++ b/build/tests/menubar-editor/test-01-navigate-to-menubar-reading.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-03-tab-to-menubar-reading-jaws.collected.json b/build/tests/menubar-editor/test-03-tab-to-menubar-reading-jaws.collected.json
index 45f24cd87..80016edb7 100644
--- a/build/tests/menubar-editor/test-03-tab-to-menubar-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-03-tab-to-menubar-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-03-tab-to-menubar-reading-nvda.collected.json b/build/tests/menubar-editor/test-03-tab-to-menubar-reading-nvda.collected.json
index b70cc9f0c..c3391e0ad 100644
--- a/build/tests/menubar-editor/test-03-tab-to-menubar-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-03-tab-to-menubar-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-03-tab-to-menubar-reading.html b/build/tests/menubar-editor/test-03-tab-to-menubar-reading.html
index 1e6540d1d..7ae1ccb02 100644
--- a/build/tests/menubar-editor/test-03-tab-to-menubar-reading.html
+++ b/build/tests/menubar-editor/test-03-tab-to-menubar-reading.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-jaws.collected.json
index af2431de9..297ad2192 100644
--- a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-nvda.collected.json
index c94ef9f63..5a2602540 100644
--- a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
index 083986941..fd02482b5 100644
--- a/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-04-navigate-to-menubar-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction-voiceover_macos.collected.json
index 3dcd22540..6c93f00a1 100644
--- a/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html b/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
index c2df6363d..8e74720c8 100644
--- a/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-05-navigate-to-menubar-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-jaws.collected.json
index d711d3139..2e2fb5bff 100644
--- a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-nvda.collected.json
index c3c278f6c..bc37c7234 100644
--- a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
index b8e1e5f27..df0de2d60 100644
--- a/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction-voiceover_macos.collected.json
index 24e7cc586..bdc2f9fee 100644
--- a/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
index fa3fa6db4..50be3b9b6 100644
--- a/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-08-navigate-to-menuitem-in-menubar-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-jaws.collected.json
index 612eccb60..737e81aeb 100644
--- a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-nvda.collected.json
index 1b58d5743..c5f5279c8 100644
--- a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
index 760d37563..68ff73517 100644
--- a/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-09-navigate-to-open-menuitem-in-menubar-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction-voiceover_macos.collected.json
index 7374775c5..a8a1513e1 100644
--- a/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
index 1e4f42048..3e4bf6ae7 100644
--- a/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-10-navigate-to-open-menuitem-in-menubar-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-jaws.collected.json
index 43769b958..a4be61583 100644
--- a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-nvda.collected.json
index 3006e9818..598678607 100644
--- a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
index a43a74c48..c39ea4692 100644
--- a/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusontextalign.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction-voiceover_macos.collected.json
index 0f7a89100..03c6d3b8a 100644
--- a/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html b/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
index 5ee2e9409..668121145 100644
--- a/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-12-open-submenu-of-menubar-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusontextalign.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-jaws.collected.json
index c81617902..ca2095334 100644
--- a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-nvda.collected.json
index 1741f1d28..5025f438e 100644
--- a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
index ea9969b40..60c78e9cf 100644
--- a/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusontextalign.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction-voiceover_macos.collected.json
index 05f96d2ed..732d2e6dd 100644
--- a/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusontextalign.html",
     "setupScript": {
       "name": "focusontextalign",
       "description": "sets focus on the 'Text Align' menu item",
diff --git a/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html b/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
index 30aec5b15..dc4c386b8 100644
--- a/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-14-close-submenu-of-menubar-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusontextalign.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-jaws.collected.json
index fc373597f..cf9ef1ba9 100644
--- a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-nvda.collected.json
index 913f43f54..cf39b2cec 100644
--- a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
index 803f93e31..011d00ed2 100644
--- a/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-15-navigate-to-checked-menuitemradio-in-submenu-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
index 04a63a88d..25e99cc2f 100644
--- a/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html b/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
index 539568955..030799ff0 100644
--- a/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-16-navigate-to-checked-menuitemradio-in-submenu-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-jaws.collected.json
index 3b36d9311..b49f71d14 100644
--- a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-nvda.collected.json
index 18b561309..3d8950d01 100644
--- a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
index c04c1ada3..7e3f099c0 100644
--- a/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-17-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
index 9c2ccada4..edaf2ab49 100644
--- a/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfont.html",
     "setupScript": {
       "name": "focusonfont",
       "description": "sets focus on the 'Font' menu item",
diff --git a/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html b/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
index 729f7f33e..5765e8e45 100644
--- a/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-18-navigate-to-unchecked-menuitemradio-in-submenu-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfont.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
index 8d4d07082..7611b71fd 100644
--- a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
index afba76836..61e92a8e9 100644
--- a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
index 0d5b59712..b7aaaa649 100644
--- a/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-19-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
index 0fe4d139a..ad343ad1f 100644
--- a/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html b/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
index 653acccdd..b37abd6d5 100644
--- a/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-20-navigate-to-unchecked-menuitemcheckbox-in-submenu-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
index 0055ea77c..748dbf8c7 100644
--- a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
index 71759cc77..1fcd73fe4 100644
--- a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
index 5b44ef796..3c91f935e 100644
--- a/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-21-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
index 1bfd00629..c623e89ae 100644
--- a/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html b/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
index 48781dbff..d878ca30f 100644
--- a/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-22-navigate-to-checked-menuitemcheckbox-in-submenu-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-jaws.collected.json b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-jaws.collected.json
index 7366705d6..1090ae8a6 100644
--- a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-nvda.collected.json b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-nvda.collected.json
index 584a52aa8..11347ae67 100644
--- a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
index 8b8d8f882..7daaa6d0b 100644
--- a/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonsize.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction-voiceover_macos.collected.json
index f9240e22c..76ddb90e8 100644
--- a/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html b/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
index 96c74d485..6d8bdabe5 100644
--- a/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
+++ b/build/tests/menubar-editor/test-25-read-menuitem-in-menubar-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonsize.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
index 1f57680d7..2cffdf0e0 100644
--- a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
index 000044796..41607e406 100644
--- a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
index 8fe7e1145..0f11b652d 100644
--- a/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
+++ b/build/tests/menubar-editor/test-26-read-unchecked-menuitemradio-in-a-group-in-a-submenu-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
index 05b28973b..66014b9e8 100644
--- a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
index 4391518a1..60366c60c 100644
--- a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 798d21c30..c543aa2ec 100644
--- a/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-27-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
index 0a291b3b3..efc10e10f 100644
--- a/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 904356ddc..91d16bdb8 100644
--- a/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-28-read-unchecked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
index 1468eefbb..a4e89e204 100644
--- a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
index 71e2e72af..280eefe1e 100644
--- a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
index 744184818..f45e41718 100644
--- a/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
+++ b/build/tests/menubar-editor/test-29-read-checked-menuitemradio-in-a-group-in-a-submenu-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
index dbd8ec5bd..e7758e81a 100644
--- a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
index 100bba5c2..e84a4899b 100644
--- a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 6804077e2..c37382ca8 100644
--- a/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-30-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
index efbe38fd4..d900d7274 100644
--- a/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
index 4043c2f8c..25326519e 100644
--- a/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-31-read-checked-menuitemradio-in-a-group-in-a-submenu-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
index e0e3162cc..c56032ab2 100644
--- a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
index 0f787043d..12d4b70f3 100644
--- a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
index f880e4dac..fe7179397 100644
--- a/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
+++ b/build/tests/menubar-editor/test-32-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
index ec7f21fe7..93eb2000d 100644
--- a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
index 387183e1d..bcba2df3c 100644
--- a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 25be6fee4..3764ba67b 100644
--- a/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-33-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
index 7842f46b2..4782d926f 100644
--- a/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 37f75f97e..3f2f3f3ca 100644
--- a/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-34-read-unchecked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
index 34e1cce93..677c1f26a 100644
--- a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
index 9ae789a86..edda2010d 100644
--- a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
index 3b6efa287..d40f85cb8 100644
--- a/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
+++ b/build/tests/menubar-editor/test-35-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
index 850d3dc73..5e1dd817a 100644
--- a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
index 448059d1a..42fd8eb45 100644
--- a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 17f4e437d..eeff9710d 100644
--- a/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-36-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
index 34830590d..f766b8a6c 100644
--- a/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html",
     "setupScript": {
       "name": "focusonstylecolor",
       "description": "sets focus on the 'Style/Color' menu item",
diff --git a/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
index 187e6d0a5..d34a6b91e 100644
--- a/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-37-read-checked-menuitemcheckbox-in-a-group-in-a-submenu-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonstylecolor.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-jaws.collected.json b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-jaws.collected.json
index 575e67eee..49c076925 100644
--- a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-jaws.collected.json
+++ b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-nvda.collected.json b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-nvda.collected.json
index e6f47f78b..7392cda20 100644
--- a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-nvda.collected.json
+++ b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html",
     "setupScript": {
       "name": "focusonfirstlink",
       "description": "sets focus on a link just before the menubar",
diff --git a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
index 740a1c890..24da448fb 100644
--- a/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
+++ b/build/tests/menubar-editor/test-38-read-disabled-menuitem-in-a-submenu-reading.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonfirstlink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-jaws.collected.json b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-jaws.collected.json
index 4bbbb6b03..df7bb217a 100644
--- a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-jaws.collected.json
+++ b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-nvda.collected.json b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-nvda.collected.json
index 962cc679c..5cd238b16 100644
--- a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-nvda.collected.json
+++ b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
index 934a2ef74..2ac7b25e8 100644
--- a/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-39-read-disabled-menuitem-in-a-submenu-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonsize.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction-voiceover_macos.collected.json b/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction-voiceover_macos.collected.json
index bdd419922..c29105128 100644
--- a/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction-voiceover_macos.collected.json
+++ b/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-11-23_175528/menubar-editor.html",
+    "referencePage": "reference/2020-11-23_175528/menubar-editor.focusonsize.html",
     "setupScript": {
       "name": "focusonsize",
       "description": "sets focus on the 'Size' menu item",
diff --git a/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html b/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
index 9c14d5dba..2b8eef4ca 100644
--- a/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
+++ b/build/tests/menubar-editor/test-40-read-disabled-menuitem-in-a-submenu-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.html");
+    displayTestPageAndInstructions("reference/2020-11-23_175528/menubar-editor.focusonsize.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html
new file mode 100644
index 000000000..eee5f8f58
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusAfterGrid
+      // sets focus on a link after the grid
+      testPageDocument.querySelector('#afterlink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html
new file mode 100644
index 000000000..11d2e9dec
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusBeforeGrid
+      // sets focus on a link before the grid
+      testPageDocument.querySelector('#beforelink').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html
new file mode 100644
index 000000000..9e5de2096
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnFifthDataCell
+      // sets focus on the fifth cell of the second row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(0, 4);
+      testPageDocument.defaultView.ex1Grid.focusCell(0, 4);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html
new file mode 100644
index 000000000..3dfd12ebb
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnFirstDataCell
+      // sets focus on the first cell of the second row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(0, 0);
+      testPageDocument.defaultView.ex1Grid.focusCell(0, 0);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html
new file mode 100644
index 000000000..1503a7ccf
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnFirstLinkedCell
+      // sets focus on the third cell of the second row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(0, 2);
+      testPageDocument.defaultView.ex1Grid.focusCell(0, 2);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html
new file mode 100644
index 000000000..59a53d229
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnFourthDataCell
+      // sets focus on the fourth cell of the second row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(0, 3);
+      testPageDocument.defaultView.ex1Grid.focusCell(0, 3);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html
new file mode 100644
index 000000000..4a4a9e594
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnLastDataCell
+      // sets focus on the fifth cell of the seventh row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(5, 4);
+      testPageDocument.defaultView.ex1Grid.focusCell(5, 4);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html
new file mode 100644
index 000000000..2b93c6c74
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnSecondDataCell
+      // sets focus on the second cell of the second row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(0, 1);
+      testPageDocument.defaultView.ex1Grid.focusCell(0, 1);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html
new file mode 100644
index 000000000..45777af42
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnSecondLinkedCell
+      // sets focus on the third cell of the third row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(1, 2);
+      testPageDocument.defaultView.ex1Grid.focusCell(1, 2);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html
new file mode 100644
index 000000000..ed6925cd4
--- /dev/null
+++ b/build/tests/minimal-data-grid/reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Data Grid Examples</title>
+
+
+<link href="css/dataGrids.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dataGrid.js" type="text/javascript"></script>
+<script src="js/dataGrids.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // setFocusOnSixthDataCell
+      // sets focus on the first cell of the third row in the grid
+      testPageDocument.defaultView.ex1Grid.setFocusPointer(1, 0);
+      testPageDocument.defaultView.ex1Grid.focusCell(1, 0);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+</head>
+<body>
+  <main>
+  <h1>Data Grid Examples</h1>
+  <p>
+    Following is an example implementation of the
+    <a href="https://w3c.github.io/aria-practices/#grid">design pattern for grid</a>
+    that demonstrate the keyboard interactions and ARIA features that enable accessible, interactive  presentation
+    of tabular information. The following grid presents a set of financial
+    transactions via a simple grid with minimum ARIA markup and keyboard support.
+  </p>
+  <section>
+    <h2>Examples</h2>
+    <section>
+      <div class="example-header">
+        <h3 id="ex1_label">Example 1: Minimal Data Grid</h3>
+      </div>
+      <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
+      <div id="ex1">
+        <h4 id="grid1Label">Transactions January 1 through January 6</h4>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <table id="ex1-grid" role="grid" aria-labelledby="grid1Label" class="data">
+          <tr>
+            <th>Date</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Amount</th>
+            <th>Balance</th>
+          </tr>
+          <tr>
+            <td tabindex="-1">01-Jan-16</td>
+            <td tabindex="-1">Deposit</td>
+            <td>
+              <a tabindex="-1" href="#">Cash Deposit</a>
+            </td>
+            <td tabindex="-1">$1,000,000.00</td>
+            <td tabindex="-1">$1,000,000.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">02-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Down Town Grocery</a>
+            </td>
+            <td tabindex="-1">$250.00</td>
+            <td tabindex="-1">$999,750.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">03-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Hot Coffee</a>
+            </td>
+            <td tabindex="-1">$9.00</td>
+            <td tabindex="-1">$999,741.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">04-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">The Filling Station</a>
+            </td>
+            <td tabindex="-1">$88.00</td>
+            <td tabindex="-1">$999,653.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">05-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Tinker's Hardware</a>
+            </td>
+            <td tabindex="-1">$3,421.00</td>
+            <td tabindex="-1">$996,232.00</td>
+          </tr>
+          <tr>
+            <td tabindex="-1">06-Jan-16</td>
+            <td tabindex="-1">Debit</td>
+            <td>
+              <a tabindex="-1" href="#">Cutey's Salon</a>
+            </td>
+            <td tabindex="-1">$700.00</td>
+            <td tabindex="-1">$995,532.00</td>
+          </tr>
+        </table>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      </div>
+      <div role="separator" id="ex1_end_sep" aria-labelledby="ex1_end_sep ex1_label" aria-label="End of"></div>
+    </section>
+  </section>
+
+  <div id="arrow-keys-indicator" class="hidden"></div>
+  <!-- Generated by create-example-tests.js -->
+  <div style="position: relative; left: 0; right: 0; height: 2rem;">
+    <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+  </div>
+  <!-- End of generated output -->
+  </main>
+</body>
+</html>
diff --git a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-jaws.collected.json
index 3e4d4696b..4edf85107 100644
--- a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-nvda.collected.json
index cf647a13a..91f3895f0 100644
--- a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html
index a59f84362..281e186f7 100644
--- a/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-01-navigate-forwards-to-grid-reading.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-jaws.collected.json
index 54148dbbc..97860e615 100644
--- a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-nvda.collected.json
index e501cb694..5109b048b 100644
--- a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html
index 6e13c130e..696e51bd1 100644
--- a/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-02-navigate-backwards-to-grid-reading.html
@@ -69,7 +69,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction-voiceover_macos.collected.json
index 6ef69e8da..c59746b4c 100644
--- a/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html b/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html
index 03d7bf7f8..7b290818d 100644
--- a/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-03-navigate-forwards-to-grid-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-jaws.collected.json
index 0604ae358..d3da78733 100644
--- a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-nvda.collected.json
index 97e3cb5ff..de4457033 100644
--- a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html
index c24e6ed5e..7b918886f 100644
--- a/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-04-navigate-into-end-of-grid-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction-voiceover_macos.collected.json
index 4e68337cd..980dae2ed 100644
--- a/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html b/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html
index 4081b3356..26065f65c 100644
--- a/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-05-navigate-into-end-of-grid-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-jaws.collected.json
index b9e18c996..2af10ead6 100644
--- a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-nvda.collected.json
index bdcca3eb2..751c44db6 100644
--- a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html
index 555e9e88b..5b8e36fb8 100644
--- a/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-06-move-focus-forwards-into-grid-reading.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-jaws.collected.json
index e9f4e97c1..927a9b13d 100644
--- a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-nvda.collected.json
index ccb06cd11..b5126f861 100644
--- a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html
index 6426639fb..29e4ca687 100644
--- a/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-07-move-focus-backwards-into-grid-reading.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-jaws.collected.json
index 386b80dfe..8e3c999fc 100644
--- a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-nvda.collected.json
index 83b30749b..2e7399fa8 100644
--- a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html
index c2d15f25f..2901a0bef 100644
--- a/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-08-move-focus-forwards-into-grid-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-jaws.collected.json
index 3b483215a..bfad0e1b5 100644
--- a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-nvda.collected.json
index ae822dc39..ccbf9903f 100644
--- a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html
index 2ef323627..a2a2b005d 100644
--- a/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-09-move-focus-backwards-into-grid-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction-voiceover_macos.collected.json
index ad6c4090e..273113559 100644
--- a/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html",
     "setupScript": {
       "name": "setFocusBeforeGrid",
       "description": "sets focus on a link before the grid",
diff --git a/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html b/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html
index 58484828d..d52f51732 100644
--- a/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-10-move-focus-forwards-into-grid-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusBeforeGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction-voiceover_macos.collected.json
index 810f5b774..6554f8839 100644
--- a/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html",
     "setupScript": {
       "name": "setFocusAfterGrid",
       "description": "sets focus on a link after the grid",
diff --git a/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html b/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html
index 0cec5c93a..92f2babc7 100644
--- a/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-11-move-focus-backwards-into-grid-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusAfterGrid.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-jaws.collected.json
index 1ba27431e..a7293e4eb 100644
--- a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-nvda.collected.json
index 1687fe12d..ede3fcb4f 100644
--- a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html
index 62f49f19c..29818352e 100644
--- a/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html
+++ b/build/tests/minimal-data-grid/test-12-read-information-about-grid-cell-reading.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-jaws.collected.json
index d98271256..7ace2a3d4 100644
--- a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-nvda.collected.json
index 422a98805..3da29f6a8 100644
--- a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html
index 38b13e4f8..e450d514e 100644
--- a/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html
+++ b/build/tests/minimal-data-grid/test-13-read-information-about-grid-cell-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction-voiceover_macos.collected.json
index c64ff95c0..e3f798424 100644
--- a/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html b/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html
index 4b9562a6f..530f4cbc0 100644
--- a/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html
+++ b/build/tests/minimal-data-grid/test-14-read-information-about-grid-cell-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-jaws.collected.json
index d491dc5f3..9ebc7aae2 100644
--- a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-nvda.collected.json
index 1e2f063aa..e3c0105c5 100644
--- a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html
index 15b878a33..d428ae7aa 100644
--- a/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html
+++ b/build/tests/minimal-data-grid/test-15-read-information-about-grid-cell-containing-link-reading.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-jaws.collected.json
index d75ec933f..00666f998 100644
--- a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-nvda.collected.json
index fa6d2bcf4..2241fabc1 100644
--- a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html
index e50d6064e..57d14b9c8 100644
--- a/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html
+++ b/build/tests/minimal-data-grid/test-16-read-information-about-grid-cell-containing-link-interaction.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction-voiceover_macos.collected.json
index bb4edcec5..2409abdd4 100644
--- a/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html b/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html
index 93bccef32..b2de4892b 100644
--- a/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html
+++ b/build/tests/minimal-data-grid/test-17-read-information-about-grid-cell-containing-link-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-jaws.collected.json
index a4724b2a1..e0dd56e88 100644
--- a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-nvda.collected.json
index 689cadedb..a83200774 100644
--- a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html
index 327d2c0f1..c3d2bd811 100644
--- a/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-18-navigate-to-next-colum-in-grid-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-jaws.collected.json
index 2c73ff276..dffe2fe1f 100644
--- a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-nvda.collected.json
index a65e90df6..3fd5a0087 100644
--- a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html
index c67d650a8..d92590a8e 100644
--- a/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-19-navigate-to-next-colum-in-grid-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction-voiceover_macos.collected.json
index b2edb47b9..e12c1cd3c 100644
--- a/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html b/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html
index e6483a380..2baf96c7d 100644
--- a/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-20-navigate-to-next-colum-in-grid-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-jaws.collected.json
index fff069703..0bd33adc1 100644
--- a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-nvda.collected.json
index cb60ca306..b0081f312 100644
--- a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html
index 078792f9c..1efdd9b64 100644
--- a/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-21-navigate-to-previous-colum-in-grid-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-jaws.collected.json
index 51430f4ad..959be1e45 100644
--- a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-nvda.collected.json
index 353b7d6bc..e4ef4a24a 100644
--- a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html
index 40baae4bc..238ceab6d 100644
--- a/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-22-navigate-to-previous-colum-in-grid-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction-voiceover_macos.collected.json
index a879ab08c..ce74a28a0 100644
--- a/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html b/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html
index dbf9ef39f..cf0f4c8e6 100644
--- a/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-23-navigate-to-previous-colum-in-grid-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-jaws.collected.json
index b64c348a2..51b8de187 100644
--- a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-nvda.collected.json
index 16afd33c5..6e76f4d62 100644
--- a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html
index 5bc168bd4..01abca9d3 100644
--- a/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-24-navigate-to-next-colum-containing-link-in-grid-reading.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-jaws.collected.json
index 89a418dff..b3ceaf31f 100644
--- a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-nvda.collected.json
index bac63c464..a39dfb8f2 100644
--- a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html
index 9f1cf2088..4721ebe64 100644
--- a/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-25-navigate-to-next-colum-containing-link-in-grid-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
index d1e50b3df..dc360b4c2 100644
--- a/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html",
     "setupScript": {
       "name": "setFocusOnSecondDataCell",
       "description": "sets focus on the second cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html
index 8c6f24778..28a96dc75 100644
--- a/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-26-navigate-to-next-colum-containing-link-in-grid-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-jaws.collected.json
index 938d36b7f..c33e20fae 100644
--- a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFourthDataCell",
       "description": "sets focus on the fourth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-nvda.collected.json
index eac8baf8b..b6e1a97a2 100644
--- a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFourthDataCell",
       "description": "sets focus on the fourth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html
index c7e068538..399620304 100644
--- a/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-27-navigate-to-previous-colum-containing-link-in-grid-reading.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-jaws.collected.json
index 159576859..bdb0455bc 100644
--- a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFourthDataCell",
       "description": "sets focus on the fourth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-nvda.collected.json
index 6504275ca..869325ad7 100644
--- a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFourthDataCell",
       "description": "sets focus on the fourth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html
index 994c70672..055f6b6a2 100644
--- a/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-28-navigate-to-previous-colum-containing-link-in-grid-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
index de49e1af9..b2ac431e5 100644
--- a/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFourthDataCell",
       "description": "sets focus on the fourth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html
index 8607f9561..408aec124 100644
--- a/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-29-navigate-to-previous-colum-containing-link-in-grid-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFourthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
index 9f06bf94f..939453975 100644
--- a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
index 8c7b649e7..08e3be9ce 100644
--- a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html
index 1f06f2c07..1885130a7 100644
--- a/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-30-navigate-to-next-column-from-cel-containing-link-in-grid-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
index b8e460392..f8d28b9f9 100644
--- a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
index 2bfc9472e..f360cfe22 100644
--- a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
index 16507cd1a..071401856 100644
--- a/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-31-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
index c579471ed..ef373287c 100644
--- a/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
index f49af3b68..39048a5e9 100644
--- a/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-32-navigate-to-next-column-from-cel-containing-link-in-grid-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
index 727ce9a65..27b29dd1b 100644
--- a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
index dc1cff765..576acbaa2 100644
--- a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html
index 9a74e5382..3b5a14d62 100644
--- a/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-33-navigate-to-previous-column-from-cel-containing-link-in-grid-reading.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
index 1ab064cdc..9a04764f9 100644
--- a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
index 206bec332..e69cd7e19 100644
--- a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
index 2a4bf141e..91aa144da 100644
--- a/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-34-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
index cd654f6f9..62b1d09a7 100644
--- a/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html b/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
index 5b5245b6d..11f9c8d96 100644
--- a/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-35-navigate-to-previous-column-from-cel-containing-link-in-grid-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-jaws.collected.json
index 5c8aed212..40686732a 100644
--- a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-nvda.collected.json
index c7184f177..2a4590c83 100644
--- a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html
index 64d82e5be..2781338cb 100644
--- a/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-36-navigate-to-next-row-in-grid-reading.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-jaws.collected.json
index 09da2f6dc..e3d5a1217 100644
--- a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-nvda.collected.json
index 9d07f0ff3..8f85fffa8 100644
--- a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html
index c0b37eca5..dbc8a7690 100644
--- a/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-37-navigate-to-next-row-in-grid-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction-voiceover_macos.collected.json
index 7340bf11a..55a18fd3f 100644
--- a/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html
index cf3a42ca8..20cc3f8aa 100644
--- a/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-38-navigate-to-next-row-in-grid-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-jaws.collected.json
index a7941e2b9..2a0bbf2e7 100644
--- a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html",
     "setupScript": {
       "name": "setFocusOnSixthDataCell",
       "description": "sets focus on the first cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-nvda.collected.json
index 03bebbf51..b7d0c09d9 100644
--- a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html",
     "setupScript": {
       "name": "setFocusOnSixthDataCell",
       "description": "sets focus on the first cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html
index 9b51d6eb6..b6ed2f839 100644
--- a/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-39-navigate-to-previous-row-in-grid-reading.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-jaws.collected.json
index 8a2b9fd3d..dd6efef73 100644
--- a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html",
     "setupScript": {
       "name": "setFocusOnSixthDataCell",
       "description": "sets focus on the first cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-nvda.collected.json
index c968383ed..5ab3d2cec 100644
--- a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html",
     "setupScript": {
       "name": "setFocusOnSixthDataCell",
       "description": "sets focus on the first cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html
index afc4e65f5..c33d2cf72 100644
--- a/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-40-navigate-to-previous-row-in-grid-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction-voiceover_macos.collected.json
index 8c3e2b912..15518e912 100644
--- a/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html",
     "setupScript": {
       "name": "setFocusOnSixthDataCell",
       "description": "sets focus on the first cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html
index faa5c9fad..61d2830fe 100644
--- a/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-41-navigate-to-previous-row-in-grid-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSixthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-jaws.collected.json
index 33d971ffe..3132cd657 100644
--- a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-nvda.collected.json
index 8d287e9e5..042af7a8b 100644
--- a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html
index 07d1b17c1..b47e01a14 100644
--- a/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-42-navigate-to-cell-containing-link-on-next-row-in-grid-reading.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-jaws.collected.json
index b72e521e2..09d26a88a 100644
--- a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-nvda.collected.json
index 19d06ef53..619367b4f 100644
--- a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
index 3b8a7fe04..05c03fd73 100644
--- a/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-43-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-voiceover_macos.collected.json
index ec395b1e0..c8933c4b4 100644
--- a/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnFirstLinkedCell",
       "description": "sets focus on the third cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
index 92ab8b101..dd51a0258 100644
--- a/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-44-navigate-to-cell-containing-link-on-next-row-in-grid-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-jaws.collected.json b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-jaws.collected.json
index ca52190fe..4b3c5dbd6 100644
--- a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnSecondLinkedCell",
       "description": "sets focus on the third cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-nvda.collected.json b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-nvda.collected.json
index 573c63c99..d814edbda 100644
--- a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnSecondLinkedCell",
       "description": "sets focus on the third cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html
index 16672bb30..d27554243 100644
--- a/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html
+++ b/build/tests/minimal-data-grid/test-45-navigate-to-cell-containing-link-on-previous-row-in-grid-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-jaws.collected.json
index c2e1c9269..b5d6df663 100644
--- a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnSecondLinkedCell",
       "description": "sets focus on the third cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-nvda.collected.json
index 8d42f1a89..84736e87c 100644
--- a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnSecondLinkedCell",
       "description": "sets focus on the third cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
index 229d698cf..e21568981 100644
--- a/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-46-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-voiceover_macos.collected.json
index e74e495ae..440cf053b 100644
--- a/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html",
     "setupScript": {
       "name": "setFocusOnSecondLinkedCell",
       "description": "sets focus on the third cell of the third row in the grid",
diff --git a/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
index 83a531eb3..0e3a2ffa2 100644
--- a/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-47-navigate-to-cell-containing-link-on-previous-row-in-grid-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnSecondLinkedCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-jaws.collected.json
index d42e4c62e..eaf0b9b8b 100644
--- a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFifthDataCell",
       "description": "sets focus on the fifth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-nvda.collected.json
index 66def6e87..241972bea 100644
--- a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFifthDataCell",
       "description": "sets focus on the fifth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html
index e2ab8802a..85d018203 100644
--- a/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-48-navigate-to-first-cell-of-row-in-grid-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
index cdac62417..6be59716a 100644
--- a/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html",
     "setupScript": {
       "name": "setFocusOnFifthDataCell",
       "description": "sets focus on the fifth cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html
index b4ec0d1ea..4f9d21ff5 100644
--- a/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-49-navigate-to-first-cell-of-row-in-grid-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFifthDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-jaws.collected.json
index 660d45e9e..475f238d4 100644
--- a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-nvda.collected.json
index ee23bf585..aa49e53cf 100644
--- a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html
index 5466e7186..ae53a6021 100644
--- a/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-50-navigate-to-last-cell-of-row-in-grid-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
index 970f9b810..fd6d555de 100644
--- a/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html b/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html
index 761ceafd9..4f2ed3212 100644
--- a/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-51-navigate-to-last-cell-of-row-in-grid-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-jaws.collected.json
index 7e9200386..39e5dda09 100644
--- a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html",
     "setupScript": {
       "name": "setFocusOnLastDataCell",
       "description": "sets focus on the fifth cell of the seventh row in the grid",
diff --git a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-nvda.collected.json
index e423a9b9d..92294b8b1 100644
--- a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html",
     "setupScript": {
       "name": "setFocusOnLastDataCell",
       "description": "sets focus on the fifth cell of the seventh row in the grid",
diff --git a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html
index b585d4afe..8fa9fd9ae 100644
--- a/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-52-navigate-to-first-cell-in-grid-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction-voiceover_macos.collected.json
index 0d0047008..cacc8dfcb 100644
--- a/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html",
     "setupScript": {
       "name": "setFocusOnLastDataCell",
       "description": "sets focus on the fifth cell of the seventh row in the grid",
diff --git a/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html b/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html
index 80676b953..353b38f69 100644
--- a/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-53-navigate-to-first-cell-in-grid-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnLastDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-jaws.collected.json b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-jaws.collected.json
index 82c4ce429..322dc8f66 100644
--- a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-jaws.collected.json
+++ b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-nvda.collected.json b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-nvda.collected.json
index 30054a82a..25bbb9f24 100644
--- a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-nvda.collected.json
+++ b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html
index caba8cd56..12a9c77f6 100644
--- a/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-54-navigate-to-last-cell-in-grid-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction-voiceover_macos.collected.json b/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction-voiceover_macos.collected.json
index 73597fedd..ff3fa5266 100644
--- a/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction-voiceover_macos.collected.json
+++ b/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-8_151542/dataGrids.html",
+    "referencePage": "reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html",
     "setupScript": {
       "name": "setFocusOnFirstDataCell",
       "description": "sets focus on the first cell of the second row in the grid",
diff --git a/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html b/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html
index 771dff6f3..ce06b15e5 100644
--- a/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html
+++ b/build/tests/minimal-data-grid/test-55-navigate-to-last-cell-in-grid-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.html");
+    displayTestPageAndInstructions("reference/2021-3-8_151542/dataGrids.setFocusOnFirstDataCell.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html
new file mode 100644
index 000000000..2455daf54
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // moveFocusToAddDeliveryAddressButton
+      // sets focus on the 'Add Delivery Address' button
+      testPageDocument.querySelector('#ex1 > button').focus();
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html
new file mode 100644
index 000000000..62778a422
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html
@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openAddDeliveryAddressDialogAndFocusAddButton
+      // opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button
+      const btn = testPageDocument.querySelector('#ex1 > button');
+      testPageDocument.defaultView.openDialog('dialog1', btn, 'dialog1_add');
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html
new file mode 100644
index 000000000..e123f1dfc
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html
@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openAddDeliveryAddressDialogAndFocusCancelButton
+      // opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button
+      const btn = testPageDocument.querySelector('#ex1 > button');
+      testPageDocument.defaultView.openDialog('dialog1', btn, 'dialog1_cancel');
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html
new file mode 100644
index 000000000..6ad19c0df
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html
@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openAddDeliveryAddressDialogAndFocusFirstInput
+      // opens the 'Add Delivery Address' modal dialog, and sets focus on the first input
+      const btn = testPageDocument.querySelector('#ex1 > button');
+      testPageDocument.defaultView.openDialog('dialog1', btn);
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html
new file mode 100644
index 000000000..b5bd88b8f
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openAddressAddedDialogAndFocusYourProfileLink
+      // opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog
+      const btn = testPageDocument.querySelector('#ex1 > button');
+      testPageDocument.defaultView.openDialog('dialog1', btn, 'dialog1_add');
+      testPageDocument.defaultView.replaceDialog('dialog3', undefined, 'dialog3_profile');
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html
new file mode 100644
index 000000000..c5fdb87c4
--- /dev/null
+++ b/build/tests/modal-dialog/reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" >
+<title>Modal Dialog Example</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+<link href="css/dialog.css" rel="stylesheet">
+<script src="js/utils.js" type="text/javascript"></script>
+<script src="js/dialog.js" type="text/javascript"></script>
+<!-- Generated by create-example-tests.js -->
+<script>
+  (function() {
+    function setupScript(testPageDocument) {
+      // openVerificationResultDialogAndFocusCloseButton
+      // opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog
+      const btn = testPageDocument.querySelector('#ex1 > button');
+      testPageDocument.defaultView.openDialog('dialog1', btn, 'dialog1_add');
+      testPageDocument.defaultView.openDialog('dialog2', 'dialog1_verify', 'dialog2_close_btn');
+
+    };
+    document.addEventListener('click', function(event) {
+      if (event.target.classList.contains('button-run-test-setup')) {
+        event.target.disabled = true;
+        setupScript(document);
+      }
+    });
+  })();
+</script>
+<!-- End of generated output -->
+
+</head>
+<body>
+  <main>
+    <h1>Modal Dialog Example</h1>
+    <p>
+      Following is an example implementation of the
+      <a href="https://w3c.github.io/aria-practices/#dialog_modal">design pattern for modal dialogs.</a>
+      The below <q>Add Delivery Address</q> button opens a modal dialog that contains two buttons that open other dialogs.
+      The accessibility features section explains the rationale for initial focus placement and use of <code>aria-describedby</code> in each dialog.
+    </p>
+    <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <button type="button" onclick="openDialog('dialog1', this)">Add Delivery Address</button>
+        <div id="dialog_layer" class="dialogs">
+          <div role="dialog" id="dialog1" aria-labelledby="dialog1_label" aria-modal="true" class="hidden">
+            <h2 id="dialog1_label" class="dialog_label">Add Delivery Address</h2>
+            <div class="dialog_form">
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Street:</span>
+                  <input type="text" class="wide_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">City:</span>
+                  <input type="text" class="city_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">State:</span>
+                  <input type="text" class="state_input">
+                </label>
+              </div>
+              <div class="dialog_form_item">
+                <label>
+                  <span class="label_text">Zip:</span>
+                  <input type="text" class="zip_input">
+                </label>
+              </div>
+
+              <div class="dialog_form_item">
+                <label for="special_instructions">
+                  <span class="label_text">Special instructions:</span>
+                </label>
+                <input id="special_instructions" type="text" aria-describedby="special_instructions_desc" class="wide_input">
+                <div class="label_info" id="special_instructions_desc">
+                  For example, gate code or other information to help the driver find you
+                </div>
+              </div>
+            </div>
+            <div class="dialog_form_actions">
+              <button id="dialog1_verify" type="button" onclick="openDialog('dialog2', this, 'dialog2_para1')">Verify Address</button>
+              <button id="dialog1_add" type="button" onclick="replaceDialog('dialog3', undefined, 'dialog3_close_btn')">Add</button>
+              <button id="dialog1_cancel" type="button" onclick="closeDialog(this)">Cancel</button>
+            </div>
+          </div>
+
+
+          <div id="dialog2" role="dialog" aria-labelledby="dialog2_label"
+               aria-describedby="dialog2_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog2_label" class="dialog_label">Verification Result</h2>
+            <div id="dialog2_desc" class="dialog_desc">
+              <p tabindex="-1" id="dialog2_para1">This is just a demonstration. If it were a real application, it would
+                provide a message telling whether the entered address is valid.</p>
+              <p>
+                For demonstration purposes, this dialog has a lot of text. It demonstrates a
+                scenario where:
+              </p>
+              <ul>
+                <li>The first interactive element, the help link, is at the bottom of the dialog.</li>
+                <li>If focus is placed on the first interactive element when the dialog opens, the
+                  validation message may not be visible.</li>
+                <li>If the validation message is visible and the focus is on the help link, then
+                  the focus may not be visible.</li>
+                <li>
+                  When the dialog opens, it is important that both:
+                  <ul>
+                    <li>The beginning of the text is visible so users do not have to scroll back to
+                      start reading.</li>
+                    <li>The keyboard focus always remains visible.</li>
+                  </ul>
+                </li>
+              </ul>
+              <p>There are several ways to resolve this issue:</p>
+              <ul>
+                <li>Place an interactive element at the top of the dialog, e.g., a button or link.</li>
+                <li>Make a static element focusable, e.g., the dialog title or the first block of
+                  text.</li>
+              </ul>
+              <p>
+                Please <em>DO NOT </em> make the element with role dialog focusable!
+              </p>
+              <ul>
+                <li>The larger a focusable element is, the more difficult it is to visually
+                  identify the location of focus, especially for users with a narrow field of view.</li>
+                <li>The dialog has a visual border, so creating a clear visual indicator of focus
+                  when the entire dialog has focus is not very feasible.</li>
+                <li>Screen readers read the label and content of focusable elements. The dialog
+                  contains its label and a lot of content! If a dialog like this one has focus, the
+                  actual focus is difficult to comprehend.</li>
+              </ul>
+              <p>
+                In this dialog, the first paragraph has <code>tabindex=<q>-1</q></code>. The first
+                paragraph is also contained inside the element that provides the dialog description, i.e., the element that is referenced
+                by <code>aria-describedby</code>. With some screen readers, this may have one negative
+                but relatively insignificant side effect when the dialog opens -- the first paragraph
+                may be announced twice. Nonetheless, making the first paragraph focusable and setting
+                the initial focus on it is the most broadly accessible option.
+              </p>
+            </div>
+            <div class="dialog_form_actions">
+              <a href="#" onclick="openDialog('dialog4', this)">link to help</a>
+              <button type="button" onclick="openDialog('dialog4', this)">accepting an alternative form</button>
+              <button id="dialog2_close_btn" type="button" onclick="closeDialog(this)">Close</button>
+            </div>
+          </div>
+
+
+          <div id="dialog3" role="dialog" aria-labelledby="dialog3_label"
+               aria-describedby="dialog3_desc" aria-modal="true" class="hidden">
+            <h2 id="dialog3_label" class="dialog_label">Address Added</h2>
+            <p id="dialog3_desc" class="dialog_desc">
+              The address you provided has been added to your list of delivery addresses. It is ready
+              for immediate use. If you wish to remove it, you can do so from
+              <a id="dialog3_profile" href="#" onclick="openDialog('dialog4', this)">your profile.</a>
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog3_close_btn" onclick="closeDialog(this)">OK</button>
+            </div>
+          </div>
+
+          <div id="dialog4" role="dialog" aria-labelledby="dialog4_label"
+               aria-describedby="dialog4_desc" class="hidden"
+               aria-modal="true">
+            <h2 id="dialog4_label" class="dialog_label">End of the Road!</h2>
+            <p id="dialog4_desc" class="dialog_desc">
+              You activated a fake link or button that goes nowhere!
+              The link or button is present for demonstration purposes only.
+            </p>
+            <div class="dialog_form_actions">
+              <button type="button" id="dialog4_close_btn" onclick="closeDialog(this)">Close</button>
+            </div>
+
+
+
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/modal-dialog/test-01-open-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-01-open-modal-dialog-reading-jaws.collected.json
index ea14b8a23..548df46a8 100644
--- a/build/tests/modal-dialog/test-01-open-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-01-open-modal-dialog-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html",
     "setupScript": {
       "name": "moveFocusToAddDeliveryAddressButton",
       "description": "sets focus on the 'Add Delivery Address' button",
diff --git a/build/tests/modal-dialog/test-01-open-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-01-open-modal-dialog-reading-nvda.collected.json
index 070506a13..353c82cd1 100644
--- a/build/tests/modal-dialog/test-01-open-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-01-open-modal-dialog-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html",
     "setupScript": {
       "name": "moveFocusToAddDeliveryAddressButton",
       "description": "sets focus on the 'Add Delivery Address' button",
diff --git a/build/tests/modal-dialog/test-01-open-modal-dialog-reading.html b/build/tests/modal-dialog/test-01-open-modal-dialog-reading.html
index 2a65c8cc4..c7a41d2a8 100644
--- a/build/tests/modal-dialog/test-01-open-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-01-open-modal-dialog-reading.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-jaws.collected.json
index 6c2e2edbc..c49230243 100644
--- a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html",
     "setupScript": {
       "name": "moveFocusToAddDeliveryAddressButton",
       "description": "sets focus on the 'Add Delivery Address' button",
diff --git a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-nvda.collected.json
index 4ae9c8d26..20dcf8695 100644
--- a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html",
     "setupScript": {
       "name": "moveFocusToAddDeliveryAddressButton",
       "description": "sets focus on the 'Add Delivery Address' button",
diff --git a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction.html b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction.html
index 6730a2279..ddefa8505 100644
--- a/build/tests/modal-dialog/test-02-open-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-02-open-modal-dialog-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-03-open-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-03-open-modal-dialog-interaction-voiceover_macos.collected.json
index bea8123fd..064ba796f 100644
--- a/build/tests/modal-dialog/test-03-open-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-03-open-modal-dialog-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html",
     "setupScript": {
       "name": "moveFocusToAddDeliveryAddressButton",
       "description": "sets focus on the 'Add Delivery Address' button",
diff --git a/build/tests/modal-dialog/test-03-open-modal-dialog-interaction.html b/build/tests/modal-dialog/test-03-open-modal-dialog-interaction.html
index 06a467a25..090eae419 100644
--- a/build/tests/modal-dialog/test-03-open-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-03-open-modal-dialog-interaction.html
@@ -69,7 +69,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.moveFocusToAddDeliveryAddressButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-04-close-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-04-close-modal-dialog-reading-jaws.collected.json
index 5bef2eb65..4cc8da07a 100644
--- a/build/tests/modal-dialog/test-04-close-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-04-close-modal-dialog-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-04-close-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-04-close-modal-dialog-reading-nvda.collected.json
index aa885bb03..0b867e084 100644
--- a/build/tests/modal-dialog/test-04-close-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-04-close-modal-dialog-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-04-close-modal-dialog-reading.html b/build/tests/modal-dialog/test-04-close-modal-dialog-reading.html
index 56853b236..365681cce 100644
--- a/build/tests/modal-dialog/test-04-close-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-04-close-modal-dialog-reading.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-jaws.collected.json
index 96f6377b1..96dcc73e2 100644
--- a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-nvda.collected.json
index c89942ae8..66add2d59 100644
--- a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction.html b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction.html
index 1c5ba7071..f7893cd81 100644
--- a/build/tests/modal-dialog/test-05-close-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-05-close-modal-dialog-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-06-close-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-06-close-modal-dialog-interaction-voiceover_macos.collected.json
index faf395aff..839170c61 100644
--- a/build/tests/modal-dialog/test-06-close-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-06-close-modal-dialog-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-06-close-modal-dialog-interaction.html b/build/tests/modal-dialog/test-06-close-modal-dialog-interaction.html
index a5c6896a3..8ba53ec23 100644
--- a/build/tests/modal-dialog/test-06-close-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-06-close-modal-dialog-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-jaws.collected.json b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-jaws.collected.json
index 03e306f15..63f77fa5e 100644
--- a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-nvda.collected.json b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-nvda.collected.json
index d95394ed0..9770cb395 100644
--- a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html
index f66be813c..d9d5190dd 100644
--- a/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html
+++ b/build/tests/modal-dialog/test-07-close-modal-dialog-using-button-reading.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-jaws.collected.json b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-jaws.collected.json
index ad4cc6dca..902082eb7 100644
--- a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-nvda.collected.json b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-nvda.collected.json
index ef2c4eee4..1feac4e93 100644
--- a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html
index 3925bae97..1337c078b 100644
--- a/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html
+++ b/build/tests/modal-dialog/test-08-close-modal-dialog-using-button-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction-voiceover_macos.collected.json
index 7110a3e87..3c775ce75 100644
--- a/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html b/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html
index ea0fa7f87..ce79d388b 100644
--- a/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html
+++ b/build/tests/modal-dialog/test-09-close-modal-dialog-using-button-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-jaws.collected.json
index a2c65b804..fcd4ac111 100644
--- a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-nvda.collected.json
index 26ec550e8..9f58dbf14 100644
--- a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
index b4afc0a38..4ee5d9652 100644
--- a/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-10-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
index 5ca1272c1..162f9dbda 100644
--- a/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html b/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
index 93b87ea34..279d8ae55 100644
--- a/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-11-navigate-to-last-focusable-element-in-modal-dialog-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-jaws.collected.json
index 4efb1f253..aa6154726 100644
--- a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-nvda.collected.json
index f0bf10983..d762220fb 100644
--- a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
index 3e6130ecf..4fa906ae7 100644
--- a/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-12-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
@@ -53,7 +53,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
index 05ea57612..af67ffe3c 100644
--- a/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusCancelButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Cancel' button",
diff --git a/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html b/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
index ba35a6836..a1d0b1226 100644
--- a/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-13-navigate-to-first-focusable-element-in-modal-dialog-interaction.html
@@ -52,7 +52,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusCancelButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-jaws.collected.json
index bcaf87d4b..c55339aa3 100644
--- a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-nvda.collected.json
index e6a216294..5578d6aba 100644
--- a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html
index 92e12a536..77bc8f76f 100644
--- a/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-14-navigate-to-beginning-of-modal-dialog-reading.html
@@ -59,7 +59,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction-voiceover_macos.collected.json
index f77395e11..1420780d4 100644
--- a/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html b/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html
index 3cbf1b88b..727914d28 100644
--- a/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-15-navigate-to-beginning-of-modal-dialog-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-jaws.collected.json
index 9c89b8c40..cf2ef6957 100644
--- a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-jaws.collected.json
@@ -17,7 +17,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-nvda.collected.json
index a53dbf4ba..e4486aadf 100644
--- a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading-nvda.collected.json
@@ -17,7 +17,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html
index 39c572c19..c6fdc7f73 100644
--- a/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-16-navigate-to-end-of-modal-dialog-reading.html
@@ -55,7 +55,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction-voiceover_macos.collected.json
index 3b5b94adf..c51b04103 100644
--- a/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction-voiceover_macos.collected.json
@@ -17,7 +17,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusFirstInput",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the first input",
diff --git a/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html b/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html
index a8c58b173..bada36995 100644
--- a/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-17-navigate-to-end-of-modal-dialog-interaction.html
@@ -54,7 +54,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusFirstInput.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-jaws.collected.json
index c8d0547f2..cc926ffc9 100644
--- a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusAddButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button",
diff --git a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-nvda.collected.json
index c6658aafd..9a6c62095 100644
--- a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusAddButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button",
diff --git a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html
index 96f79ddbf..01dec378b 100644
--- a/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-18-open-nested-modal-dialog-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-jaws.collected.json
index 5d384906d..6e23c8919 100644
--- a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusAddButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button",
diff --git a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-nvda.collected.json
index ca3572ed7..f4fc05d1b 100644
--- a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusAddButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button",
diff --git a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html
index 0a37e3e25..d6ed2f8a8 100644
--- a/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-19-open-nested-modal-dialog-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction-voiceover_macos.collected.json
index c83aaa4ac..58b4abf52 100644
--- a/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html",
     "setupScript": {
       "name": "openAddDeliveryAddressDialogAndFocusAddButton",
       "description": "opens the 'Add Delivery Address' modal dialog, and sets focus on the 'Add' button",
diff --git a/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html b/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html
index c712e96d4..639c3904d 100644
--- a/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-20-open-nested-modal-dialog-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddDeliveryAddressDialogAndFocusAddButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-jaws.collected.json b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-jaws.collected.json
index ab22fa149..19ca4e3f0 100644
--- a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-nvda.collected.json b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-nvda.collected.json
index caa5c4c4f..87e485906 100644
--- a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html
index 6c9339ce0..3fbbc01ca 100644
--- a/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html
+++ b/build/tests/modal-dialog/test-21-close-nested-modal-dialog-reading.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-jaws.collected.json b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-jaws.collected.json
index d19484348..8a05445d1 100644
--- a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-nvda.collected.json b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-nvda.collected.json
index caccd18fa..339cff0c4 100644
--- a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html
index 7713044e2..a4d0f4a90 100644
--- a/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-22-close-nested-modal-dialog-interaction.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction-voiceover_macos.collected.json
index 10000cf19..e456c420c 100644
--- a/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html b/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html
index 5b1bc66a9..e4618d911 100644
--- a/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html
+++ b/build/tests/modal-dialog/test-23-close-nested-modal-dialog-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-jaws.collected.json b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-jaws.collected.json
index 3fe215a1a..d90cf8c68 100644
--- a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-nvda.collected.json b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-nvda.collected.json
index 4b0e491f9..303289da7 100644
--- a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html
index 55952596a..bb248e142 100644
--- a/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html
+++ b/build/tests/modal-dialog/test-24-close-nested-modal-dialog-using-button-reading.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-jaws.collected.json b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-jaws.collected.json
index d844ed399..a68fc299e 100644
--- a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-nvda.collected.json b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-nvda.collected.json
index f110fd508..78c73e722 100644
--- a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html
index 2172f4df2..ff2847df2 100644
--- a/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html
+++ b/build/tests/modal-dialog/test-25-close-nested-modal-dialog-using-button-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction-voiceover_macos.collected.json
index e1d2ccb35..9a616ed2f 100644
--- a/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html",
     "setupScript": {
       "name": "openVerificationResultDialogAndFocusCloseButton",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Verification Result' dialog, and sets focus on the 'Close' button inside the second dialog",
diff --git a/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html b/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html
index 9a4dcf984..dd11f42da 100644
--- a/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html
+++ b/build/tests/modal-dialog/test-26-close-nested-modal-dialog-using-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openVerificationResultDialogAndFocusCloseButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-jaws.collected.json b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-jaws.collected.json
index 4241dffad..e8a2c48eb 100644
--- a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-jaws.collected.json
+++ b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html",
     "setupScript": {
       "name": "openAddressAddedDialogAndFocusYourProfileLink",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog",
diff --git a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-nvda.collected.json b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-nvda.collected.json
index 783293143..c196d105a 100644
--- a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-nvda.collected.json
+++ b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html",
     "setupScript": {
       "name": "openAddressAddedDialogAndFocusYourProfileLink",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog",
diff --git a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html
index 05d205ae1..60fbfdb65 100644
--- a/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html
+++ b/build/tests/modal-dialog/test-27-open-nested-modal-dialog-using-link-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-jaws.collected.json b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-jaws.collected.json
index 61ff70942..61b4b1525 100644
--- a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-jaws.collected.json
+++ b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html",
     "setupScript": {
       "name": "openAddressAddedDialogAndFocusYourProfileLink",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog",
diff --git a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-nvda.collected.json b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-nvda.collected.json
index 2921f75c0..62addb642 100644
--- a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-nvda.collected.json
+++ b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html",
     "setupScript": {
       "name": "openAddressAddedDialogAndFocusYourProfileLink",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog",
diff --git a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html
index 485b6967f..8cbac9390 100644
--- a/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html
+++ b/build/tests/modal-dialog/test-28-open-nested-modal-dialog-using-link-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction-voiceover_macos.collected.json b/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction-voiceover_macos.collected.json
index c6aefc2a0..7f170c0ab 100644
--- a/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction-voiceover_macos.collected.json
+++ b/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2020-12-17_13353/dialog.html",
+    "referencePage": "reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html",
     "setupScript": {
       "name": "openAddressAddedDialogAndFocusYourProfileLink",
       "description": "opens the 'Add Delivery Address' dialog followed by the 'Address Added' dialog, and sets focus on the 'your profile' link inside the second dialog",
diff --git a/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html b/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html
index adddcc7ed..295735f3a 100644
--- a/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html
+++ b/build/tests/modal-dialog/test-29-open-nested-modal-dialog-using-link-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.html");
+    displayTestPageAndInstructions("reference/2020-12-17_13353/dialog.openAddressAddedDialogAndFocusYourProfileLink.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
new file mode 100644
index 000000000..659cb49a4
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkFirstRadioButtonAndSetFocusAfterRadioGroup
+          // sets the state of the first radio button to checked, and sets focus on a link after the radio group
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[0].classList.add('focus');
+          radios[0].setAttribute('aria-checked', 'true');
+          radioGroup.setAttribute('aria-activedescendant', radios[0].id);
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
new file mode 100644
index 000000000..8954b7cdf
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkFirstRadioButtonAndSetFocusBeforeRadioGroup
+          // sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[0].classList.add('focus');
+          radios[0].setAttribute('aria-checked', 'true');
+          radioGroup.setAttribute('aria-activedescendant', radios[0].id);
+          testPageDocument.querySelector('#beforelink').focus();
+          testPageDocument.querySelector('#group_label_1').style.display = 'none';
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
new file mode 100644
index 000000000..4523120bf
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkThirdRadioButtonAndSetFocusAfterRadioGroup
+          // sets the state of the third radio button to checked, and sets focus on a link after the radio group
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[2].classList.add('focus');
+          radios[2].setAttribute('aria-checked', 'true');
+          radioGroup.setAttribute('aria-activedescendant', radios[2].id);
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html
new file mode 100644
index 000000000..035e54462
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusAfterRadioGroup
+          // sets focus on a link after the radio group
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html
new file mode 100644
index 000000000..c89ab033b
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusBeforeRadioGroup
+          // sets focus on a link before the radio group, and hides the group heading
+          testPageDocument.querySelector('#beforelink').focus();
+          testPageDocument.querySelector('#group_label_1').style.display = 'none';
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html
new file mode 100644
index 000000000..f7e4ed1d4
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnAndCheckFirstRadioButton
+          // sets focus on the first radio button, and sets its state to checked
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[0].classList.add('focus');
+          radios[0].setAttribute('aria-checked', 'true');
+          radioGroup.setAttribute('aria-activedescendant', radios[0].id);
+          radioGroup.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html
new file mode 100644
index 000000000..07f549ae8
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnFirstRadioButton
+          // sets focus on the first radio button
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[0].classList.add('focus');
+          radioGroup.setAttribute('aria-activedescendant', radios[0].id);
+          radioGroup.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html
new file mode 100644
index 000000000..441ea8b5b
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnSecondRadioButton
+          // sets focus on the second radio button
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[1].classList.add('focus');
+          radioGroup.setAttribute('aria-activedescendant', radios[1].id);
+          radioGroup.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html
new file mode 100644
index 000000000..75ccedc30
--- /dev/null
+++ b/build/tests/radiogroup-aria-activedescendant/reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using aria-activedescendant | WAI-ARIA Authoring Practices 1.2</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio-activedescendant.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnThirdRadioButton
+          // sets focus on the third radio button
+          let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.classList.remove('focus');
+          });
+          radios[2].classList.add('focus');
+          radioGroup.setAttribute('aria-activedescendant', radios[2].id);
+          radioGroup.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using aria-activedescendant</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses <code>aria-activedescendant</code> for informing assistive technologies which radio button has visual focus.
+      </p>
+     <section>
+      <div class="example-header">
+        <h2 id="ex_label">Example</h2>
+      </div>
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+      <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+      <div id="ex1">
+        <h3 id="group_label_1">Pizza Crust</h3>
+
+        <ul class="radiogroup-activedescendant"
+            role="radiogroup"
+            aria-labelledby="group_label_1"
+            aria-activedescendant="rb11"
+            tabindex="0">
+          <li id="rb11"
+              role="radio"
+              aria-checked="false">
+            Regular crust
+
+          <li id="rb12"
+              role="radio"
+              aria-checked="false">
+            Deep dish
+
+          <li id="rb13"
+              role="radio"
+              aria-checked="false">
+            Thin crust
+
+
+      </div>
+      <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+    </main>
+  </body>
+  </html>
diff --git a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
index b891ae6c6..1d5be93a4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
index 47c2cce28..f876288fd 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
index 0f3d12f80..4acfe8427 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
index e7d04b5f7..6c9ba502d 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
index 70d985ccb..7573daaf8 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
index 90cc61257..66159d017 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
index 639fb9e87..62f86a7a7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
index d99975bc2..6db0c4de8 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
@@ -90,7 +90,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 7fc146bd6..57718631f 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
index 3e9c06c2d..0ffd1e0c4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
@@ -89,7 +89,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
index 1cd7e7b60..95d3a464a 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
index 98456f802..946feae2c 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
index febd7aace..b14f2eeb4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
@@ -92,7 +92,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 54f75bd85..e9aa50738 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
index 5317711c3..a70c5c4bc 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
@@ -91,7 +91,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
index d6dae3389..967cfb1ee 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
index 1e6e744ca..7c27b74ac 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
index a0370141c..f4fd5f885 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
@@ -99,7 +99,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 1d1db731f..41f608ac7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
index 07c7a0942..ebceabf13 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
@@ -98,7 +98,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
index 3b61f29df..00c617332 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
index f3a1dc235..241ef04b4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
index 34268f278..0e04e6e40 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
index 09c4b285e..5811b5a7e 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
index c024e0261..efd9b2117 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
index cc0220a02..db307368f 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
index b27dfc6c6..3d51add05 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
index e3591e8f7..1fabcebbd 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
index 26cbe0644..8b2d24dd7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
index f22b2a953..12f9774aa 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
index 75ae4e0f5..65fde1fb7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
index 013205ca6..4883958ca 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html
index fa2c406d7..d0d4a36b0 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-13-navigate-forwards-to-checked-radio-button-interaction.html
@@ -87,7 +87,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
index ab6e17c61..dc50a4d1f 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html
index 643848aca..56e091c6e 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-14-navigate-forwards-to-checked-radio-button-interaction.html
@@ -86,7 +86,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
index d1a7edf04..1cd4aada1 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
index 27089a7d9..e954f80a5 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html
index 759ad9784..b8d6c0bd4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-15-navigate-backwards-to-checked-radio-button-interaction.html
@@ -86,7 +86,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
index 10f95bb1f..3ccd35891 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html
index a1cc30b70..913a0efb7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-16-navigate-backwards-to-checked-radio-button-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
index c3fe7c44e..2936e95b8 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
index 57c0b3eb6..f412cef9a 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html
index dc1acd1df..4bc201bcd 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-17-navigate-out-of-start-of-radio-group-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
index 20a30dc63..a5385ede7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
index c5d097099..44a4b124b 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html
index e974b52b9..9a4b2718c 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-18-navigate-out-of-start-of-radio-group-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
index 506eb4f7f..0cdbbe848 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html
index 344c58270..4ac602ada 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-19-navigate-out-of-start-of-radio-group-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
index 5a3b31876..48f0de36e 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
index 3dfdeff0c..46c09b758 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html
index f4cbeb644..a01c81dc5 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-20-navigate-out-of-end-of-radio-group-reading.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
index 6560d60ad..c1ff49b2c 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
index 1edcb50cb..fe5bb0d12 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html
index 334d27048..49ea253b4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-21-navigate-out-of-end-of-radio-group-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
index 6b393a9d3..0c0c3c1ac 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html
index 788e3d002..807a1c9ae 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-22-navigate-out-of-end-of-radio-group-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
index 270b94ca2..8c4e4e20d 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
index f0d3b024d..4254fad32 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html
index eff327c61..6bfb85548 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-23-read-information-about-unchecked-radio-button-reading.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
index f2de8d120..38f422502 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
index 2dbcf6a85..4efbce9a7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html
index 7036c48dd..bd0ca5d02 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-24-read-information-about-unchecked-radio-button-interaction.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
index f119cd5b9..fba7a1bb7 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html
index 4e71e6b91..f3238cbf8 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-25-read-information-about-unchecked-radio-button-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
index 04dd90187..7398691a3 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
index 190f1e00e..d0bfe8247 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html
index 9bb3e2605..326926370 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-26-read-information-about-checked-radio-button-reading.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
index e7dc01a94..b172e0940 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
index 9fc960e1a..b41a8797e 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html
index 7216a7658..a65094893 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-27-read-information-about-checked-radio-button-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
index d917245cc..0818b848d 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html
index a6d696475..ba78172dc 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-28-read-information-about-checked-radio-button-interaction.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
index 6d6e5244c..a1dce1e07 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
index 01837e170..99b89ec3d 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html
index d237a713e..86b9b6557 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-29-navigate-to-next-radio-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
index 78cb7fd20..30cf0c436 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html
index 6375dda84..8f9c31c60 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-30-navigate-to-next-radio-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
index a3027cd15..8785f6537 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
index 7bc7f7cc9..f8a30fcd3 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html
index 136d827a7..322a3d148 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-31-navigate-to-previous-radio-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
index 1583b48cf..b27d7d4c1 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html
index f3b476c81..847ceacb5 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-32-navigate-to-previous-radio-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnSecondRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
index b2b8e2005..c35f8acb2 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
index 66c7ec169..0a36ff3f8 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html
index 7a6f5746d..c24538c96 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-33-navigate-to-first-radio-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
index b34d2827b..1f4784be4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html
index e6d4aa45a..3c5885bc5 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-34-navigate-to-first-radio-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
index 5e09cacc2..081e05a3c 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
index 577995dd5..ff40e18c5 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html
index d2c8eacdf..275949edf 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-35-navigate-to-last-radio-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
index 1b0a3f865..30fde1bb3 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html
index 68ad23f6a..dd3721de4 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-36-navigate-to-last-radio-button-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-jaws.collected.json
index cb57a6145..f3ffbbcfb 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-nvda.collected.json
index 1194b198d..a89b55a5e 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html
index a1c20dd34..64a2d1bfc 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-37-check-radio-button-reading.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-jaws.collected.json
index adcf6a6af..7351ed493 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-nvda.collected.json
index 0ab99db6d..18390a569 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html
index 02e62abb6..5903e5ca9 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-38-check-radio-button-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction-voiceover_macos.collected.json
index 8ceec51ea..9d65ca736 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.html",
+    "referencePage": "reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html b/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html
index 328c7fc88..d81a0c972 100644
--- a/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html
+++ b/build/tests/radiogroup-aria-activedescendant/test-39-check-radio-button-interaction.html
@@ -63,7 +63,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.html");
+    displayTestPageAndInstructions("reference/2021-3-17_161413/radio-activedescendant.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
new file mode 100644
index 000000000..20d19a66b
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkFirstRadioButtonAndSetFocusAfterRadioGroup
+          // sets the state of the first radio button to checked, and sets focus on a link after the radio group
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          radios[0].setAttribute('aria-checked', 'true');
+          radios[0].tabIndex = 0;
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
new file mode 100644
index 000000000..67d5a2f30
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkFirstRadioButtonAndSetFocusBeforeRadioGroup
+          // sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          radios[0].setAttribute('aria-checked', 'true');
+          radios[0].tabIndex = 0;
+          testPageDocument.querySelector('#group_label_1').style.display = 'none';
+          testPageDocument.querySelector('#beforelink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
new file mode 100644
index 000000000..85b4d92e3
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // checkThirdRadioButtonAndSetFocusAfterRadioGroup
+          // sets the state of the third radio button to checked, and sets focus on a link after the radio group
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          let lastRadio = radios[radios.length - 1];
+          lastRadio.setAttribute('aria-checked', 'true');
+          lastRadio.tabIndex = 0;
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html
new file mode 100644
index 000000000..e89ab8291
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusAfterRadioGroup
+          // sets focus on a link after the radio group
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html
new file mode 100644
index 000000000..65ed8fc91
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusBeforeRadioGroup
+          // sets focus on a link before the radio group, and hides the group heading
+          testPageDocument.querySelector('#beforelink').focus();
+          testPageDocument.querySelector('#group_label_1').style.display = 'none';
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html
new file mode 100644
index 000000000..87fb994c7
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnAndCheckFirstRadioButton
+          // sets focus on the first radio button, and sets its state to checked
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          radios[0].setAttribute('aria-checked', 'true');
+          radios[0].tabIndex = 0;
+          radios[0].focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html
new file mode 100644
index 000000000..d0160935e
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnFirstRadioButton
+          // sets focus on the first radio button
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          radios[0].tabIndex = 0;
+          radios[0].focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html
new file mode 100644
index 000000000..2abeab6d5
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnSecondRadioButton
+          // sets focus on the second radio button
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          radios[1].tabIndex = 0;
+          radios[1].focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html
new file mode 100644
index 000000000..043f82af1
--- /dev/null
+++ b/build/tests/radiogroup-roving-tabindex/reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Radio Group Example Using Roving tabindex</title>
+
+
+    <link rel="stylesheet" href="css/radio.css">
+    <script src="js/radio.js" type="text/javascript"></script>
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnThirdRadioButton
+          // sets focus on the third radio button
+          let radios = testPageDocument.querySelectorAll('[role="radio"]');
+          radios.forEach(r => {
+            r.setAttribute('aria-checked', 'false');
+            r.tabIndex = -1;
+          });
+          let lastRadio = radios[radios.length - 1];
+          lastRadio.tabIndex = 0;
+          lastRadio.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Radio Group Example Using Roving tabindex</h1>
+      <p>
+        This example implements the features of the <a href="https://w3c.github.io/aria-practices/#radiobutton">Radio Group Design Pattern</a>
+        for a radio group for choosing a pizza crust.
+        This implementation uses a roving tabindex for managing focus within the radio group.
+      </p>
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div role="radiogroup" aria-labelledby="group_label_1" id="rg1">
+            <h3 id="group_label_1">Pizza Crust</h3>
+
+            <div role="radio" aria-checked="false" tabindex="0">
+              Regular crust
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Deep dish
+            </div>
+            <div role="radio" aria-checked="false" tabindex="-1">
+              Thin crust
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+  </body>
+</html>
diff --git a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
index 7524bf17b..af093f3d1 100644
--- a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
index faf487ec8..7b3d7f46a 100644
--- a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
index 62c2a561d..9476a8ccd 100644
--- a/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-01-navigate-to-first-unchecked-radio-button-in-group-reading.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 1f4ed2d1b..fda37cba2 100644
--- a/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
index 2687277b2..7ed1daf2b 100644
--- a/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-02-navigate-to-first-unchecked-radio-button-in-group-interaction.html
@@ -81,7 +81,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
index 2dfacf097..04a5251c4 100644
--- a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
index 697fc3349..f8594648c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
index 8da4e2e68..aef13fb44 100644
--- a/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-03-navigate-to-last-unchecked-radio-button-in-group-reading.html
@@ -89,7 +89,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 026619f05..aebc7c846 100644
--- a/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
index a83e9ea04..290e61794 100644
--- a/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-04-navigate-to-last-unchecked-radio-button-in-group-interaction.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
index 599a884d9..3585f4927 100644
--- a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
index 5c42601cf..073d7a796 100644
--- a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
index f042d7fee..d46603b26 100644
--- a/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-05-navigate-to-first-checked-radio-button-in-group-reading.html
@@ -89,7 +89,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
index ff828bb3c..0f15998c8 100644
--- a/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
index 657c16e80..ce25a47ae 100644
--- a/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-06-navigate-to-first-checked-radio-button-in-group-interaction.html
@@ -88,7 +88,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
index d04983589..ef805894c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
index 48b9883a3..b284a0853 100644
--- a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
index 60b1a0db1..dfc37cb2c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-07-navigate-to-last-checked-radio-button-in-group-reading.html
@@ -97,7 +97,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
index 726867ca1..424f63733 100644
--- a/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkThirdRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the third radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
index 396b99207..0d5d8e845 100644
--- a/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-08-navigate-to-last-checked-radio-button-in-group-interaction.html
@@ -96,7 +96,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkThirdRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
index 40e4dd802..11c94b568 100644
--- a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
index a3a79e431..861d5d903 100644
--- a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
index e537ecb94..db3937aec 100644
--- a/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-09-navigate-forwards-to-unchecked-radio-button-interaction.html
@@ -77,7 +77,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
index d2f73c728..ad1a6d180 100644
--- a/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "setFocusBeforeRadioGroup",
       "description": "sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
index fb13a91ff..ec086237e 100644
--- a/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-10-navigate-forwards-to-unchecked-radio-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
index fc66877e3..6ca84b793 100644
--- a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
index dc862ec21..a8e9660a4 100644
--- a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
index ca8e38b98..1f27de66f 100644
--- a/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-11-navigate-backwards-to-unchecked-radio-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
index 67e5a80ba..e82e468e5 100644
--- a/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "setFocusAfterRadioGroup",
       "description": "sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
index 4e8f22c82..978b6f332 100644
--- a/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-12-navigate-backwards-to-unchecked-radio-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
index 9d72597a9..30f28b83c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
index 190bd8267..834807917 100644
--- a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html
index 2a957ccdc..febe3bfdd 100644
--- a/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-13-navigate-forwards-to-checked-radio-button-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
index 30c7b85dd..af7c31aa5 100644
--- a/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusBeforeRadioGroup",
       "description": "sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading",
diff --git a/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html
index f30e57996..36f752dd1 100644
--- a/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-14-navigate-forwards-to-checked-radio-button-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
index 89a8a76da..8535f6237 100644
--- a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-jaws.collected.json
@@ -33,7 +33,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
index 05c47f485..25b675880 100644
--- a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction-nvda.collected.json
@@ -33,7 +33,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html
index f9216d417..ab4cddfdb 100644
--- a/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-15-navigate-backwards-to-checked-radio-button-interaction.html
@@ -83,7 +83,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
index b11569701..9933b8fe4 100644
--- a/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -33,7 +33,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html",
     "setupScript": {
       "name": "checkFirstRadioButtonAndSetFocusAfterRadioGroup",
       "description": "sets the state of the first radio button to checked, and sets focus on a link after the radio group",
diff --git a/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html
index 5011c3d5d..94bc1708d 100644
--- a/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-16-navigate-backwards-to-checked-radio-button-interaction.html
@@ -82,7 +82,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.checkFirstRadioButtonAndSetFocusAfterRadioGroup.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
index ec60195cb..3fe531c66 100644
--- a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
index 40c1f966f..56edcf9b8 100644
--- a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html
index 05e6d33a4..20f02a0f6 100644
--- a/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-17-navigate-out-of-start-of-radio-group-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
index adc80ea85..0a17c0a7c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
index 2fcde496b..ccefbee67 100644
--- a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html
index 61209640c..af596802a 100644
--- a/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-18-navigate-out-of-start-of-radio-group-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
index 0904cdf85..de8781419 100644
--- a/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html
index 8f883013e..7c774a07b 100644
--- a/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-19-navigate-out-of-start-of-radio-group-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
index 6d98348ac..191cf4ec5 100644
--- a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
index 8a99964f2..0af304553 100644
--- a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html
index 2a088d499..1654c0c35 100644
--- a/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-20-navigate-out-of-end-of-radio-group-reading.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
index 30beac32b..b2c6bd00c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
index 32f71bc77..c30c83ef8 100644
--- a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html
index f2d85222b..852ca4698 100644
--- a/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-21-navigate-out-of-end-of-radio-group-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
index dbaecceae..826c016f1 100644
--- a/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html b/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html
index e25c253f5..e26d8717d 100644
--- a/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-22-navigate-out-of-end-of-radio-group-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
index 7f3abb5bd..14b2af727 100644
--- a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
index e3fa2920e..e89e3bc42 100644
--- a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html
index 827d03276..911db1eab 100644
--- a/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-23-read-information-about-unchecked-radio-button-reading.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
index 082cf30c1..095689e07 100644
--- a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
index a7f33cea0..2889c10ab 100644
--- a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html
index 13380af79..a998c823b 100644
--- a/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-24-read-information-about-unchecked-radio-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
index 291521496..2c4c58bb0 100644
--- a/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html
index 5ac86d777..14000be77 100644
--- a/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-25-read-information-about-unchecked-radio-button-interaction.html
@@ -78,7 +78,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
index c01509d75..2ec694c4b 100644
--- a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
index 2df7a9bfb..e58b0d3cc 100644
--- a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html
index de8d2e9fe..8e30105a5 100644
--- a/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-26-read-information-about-checked-radio-button-reading.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
index dc07d7f63..a984489fb 100644
--- a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
index 4a1bfdaec..4b3b74ce0 100644
--- a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html
index 8e0c7a4eb..90b379202 100644
--- a/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-27-read-information-about-checked-radio-button-interaction.html
@@ -80,7 +80,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
index eb62a1c9f..b470991f3 100644
--- a/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnAndCheckFirstRadioButton",
       "description": "sets focus on the first radio button, and sets its state to checked",
diff --git a/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html
index b2f86faaa..67405f257 100644
--- a/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-28-read-information-about-checked-radio-button-interaction.html
@@ -79,7 +79,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnAndCheckFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
index 5b8400ef6..94c2d99af 100644
--- a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
index 13df98e0b..00abdebc6 100644
--- a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html
index b7457bc37..16ef9246e 100644
--- a/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-29-navigate-to-next-radio-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
index 565ba0e44..631d198c9 100644
--- a/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html
index e57591609..f49f2356c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-30-navigate-to-next-radio-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
index 7f92c7b5f..99d445bd8 100644
--- a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
index 5d391a7cd..252281160 100644
--- a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html
index 0707d3165..7e4bd9527 100644
--- a/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-31-navigate-to-previous-radio-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
index 2ae9da344..34b52221d 100644
--- a/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html",
     "setupScript": {
       "name": "setFocusOnSecondRadioButton",
       "description": "sets focus on the second radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html
index 25da25090..7b693fa04 100644
--- a/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-32-navigate-to-previous-radio-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnSecondRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
index d5aec7b24..a15fa3189 100644
--- a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
index d5c5b7301..804c95f5d 100644
--- a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html
index 9933bf954..30d0c039c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-33-navigate-to-first-radio-button-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
index 9ac1053eb..4739f7508 100644
--- a/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html",
     "setupScript": {
       "name": "setFocusOnThirdRadioButton",
       "description": "sets focus on the third radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html
index 09a87f711..1af60ba27 100644
--- a/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-34-navigate-to-first-radio-button-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnThirdRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
index cb86db683..ff172f1ef 100644
--- a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
index 735c5cde6..ad62d49cd 100644
--- a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html
index 6704f7228..5bbf4be7c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-35-navigate-to-last-radio-button-interaction.html
@@ -72,7 +72,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
index 5f5781427..225dfd32f 100644
--- a/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html
index 604ef478d..1572c0e5c 100644
--- a/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-36-navigate-to-last-radio-button-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-jaws.collected.json
index e8388445d..a9cc4ad3f 100644
--- a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-nvda.collected.json
index 6f473dd4d..2f2105f45 100644
--- a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html
index e4a82daed..b93b3c81b 100644
--- a/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html
+++ b/build/tests/radiogroup-roving-tabindex/test-37-check-radio-button-reading.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-jaws.collected.json b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-jaws.collected.json
index 7520ff108..f8c227f9a 100644
--- a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-jaws.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-nvda.collected.json b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-nvda.collected.json
index c4ff75aea..34a3a6ecb 100644
--- a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-nvda.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html
index 4cb437656..46e4977fb 100644
--- a/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-38-check-radio-button-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction-voiceover_macos.collected.json b/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction-voiceover_macos.collected.json
index 7b16d2a93..a34abf4da 100644
--- a/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-15_144141/radio.html",
+    "referencePage": "reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html",
     "setupScript": {
       "name": "setFocusOnFirstRadioButton",
       "description": "sets focus on the first radio button",
diff --git a/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html b/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html
index 06438f69a..03a3b03d8 100644
--- a/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html
+++ b/build/tests/radiogroup-roving-tabindex/test-39-check-radio-button-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.html");
+    displayTestPageAndInstructions("reference/2021-3-15_144141/radio.setFocusOnFirstRadioButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/resources/aria-at-test-window.mjs b/build/tests/resources/aria-at-test-window.mjs
index 47eed2a3e..122152e24 100644
--- a/build/tests/resources/aria-at-test-window.mjs
+++ b/build/tests/resources/aria-at-test-window.mjs
@@ -3,47 +3,32 @@ export class TestWindow {
    * @param {object} options
    * @param {Window | null} [options.window]
    * @param {string} options.pageUri
-   * @param {string} [options.setupScriptName]
    * @param {TestWindowHooks} [options.hooks]
-   * @param {SetupScripts} [options.scripts]
    */
-  constructor({window = null, pageUri, setupScriptName, hooks, scripts = {}}) {
+  constructor({ window = null, pageUri, hooks }) {
     /** @type {Window | null} */
     this.window = window;
 
     /** @type {string} */
     this.pageUri = pageUri;
 
-    /** @type {string} */
-    this.setupScriptName = setupScriptName;
-
     /** @type {TestWindowHooks} */
     this.hooks = {
       windowOpened: () => {},
       windowClosed: () => {},
       ...hooks,
     };
-
-    /** @type {SetupScripts} */
-    this.scripts = scripts;
   }
 
   open() {
-    this.window = window.open(this.pageUri, "_blank", "toolbar=0,location=0,menubar=0,width=400,height=400");
+    this.window = window.open(
+      this.pageUri,
+      '_blank',
+      'toolbar=0,location=0,menubar=0,width=400,height=400'
+    );
 
     this.hooks.windowOpened();
 
-    // If the window is closed, re-enable open popup button
-    this.window.onunload = () => {
-      window.setTimeout(() => {
-        if (this.window.closed) {
-          this.window = undefined;
-
-          this.hooks.windowClosed();
-        }
-      }, 100);
-    };
-
     this.prepare();
   }
 
@@ -52,13 +37,15 @@ export class TestWindow {
       return;
     }
 
-    let setupScriptName = this.setupScriptName;
-    if (!setupScriptName) {
+    if (this.window.closed) {
+      this.window = undefined;
+      this.hooks.windowClosed();
       return;
     }
+
     if (
       this.window.location.origin !== window.location.origin || // make sure the origin is the same, and prevent this from firing on an 'about' page
-      this.window.document.readyState !== "complete"
+      this.window.document.readyState !== 'complete'
     ) {
       window.setTimeout(() => {
         this.prepare();
@@ -66,7 +53,10 @@ export class TestWindow {
       return;
     }
 
-    this.scripts[setupScriptName](this.window.document);
+    // If the window is closed, re-enable open popup button
+    this.window.onunload = () => {
+      window.setTimeout(() => this.prepare(), 100);
+    };
   }
 
   close() {
@@ -81,5 +71,3 @@ export class TestWindow {
  * @property {() => void} windowOpened
  * @property {() => void} windowClosed
  */
-
-/** @typedef {import('./aria-at-test-formatter').SetupScripts} SetupScripts */
diff --git a/build/tests/resources/at-commands.mjs b/build/tests/resources/at-commands.mjs
deleted file mode 100644
index b3b2b6cc3..000000000
--- a/build/tests/resources/at-commands.mjs
+++ /dev/null
@@ -1,110 +0,0 @@
-/** @deprecated See aria-at-test-io-format.mjs */
-
-import * as keys from './keys.mjs';
-
-/**
- * Class for getting AT-specific instructions for a test against a design pattern.
- * @deprecated See aria-at-test-io-format.mjs:CommandsInput
- */
-export class commandsAPI {
-  /**
-   * Creates an API to get AT-specific instructions for a design pattern.
-   * @param {object} commands - A data structure which is a nested object with the following format:
-   *   {
-   *     task: {
-   *       mode: {
-   *         at: [
-   *           key-command (string corresponding to export in keys.mjs),
-   *           optional additional instructions to list after key command (string),
-   *         ]
-   *       }
-   *     }
-   *   }
-   */
-constructor(commands, support) {
-    if (!commands) {
-      throw new Error("You must initialize commandsAPI with a commands data object");
-    }
-
-    if (!support) {
-      throw new Error("You must initialize commandsAPI with a support data object");
-    }
-
-    this.AT_COMMAND_MAP = commands;
-
-    this.MODE_INSTRUCTIONS = {
-      reading: {
-        jaws: `Verify the Virtual Cursor is active by pressing ${keys.ALT_DELETE}. If it is not, turn on the Virtual Cursor by pressing ${keys.INS_Z}.`,
-        nvda: `Insure NVDA is in browse mode by pressing ${keys.ESC}. Note: This command has no effect if NVDA is already in browse mode.`,
-        voiceover_macos: `Toggle Quick Nav ON by pressing the ${keys.LEFT} and ${keys.RIGHT} keys at the same time.`
-      },
-      interaction: {
-        jaws: `Verify the PC Cursor is active by pressing ${keys.ALT_DELETE}. If it is not, turn off the Virtual Cursor by pressing ${keys.INS_Z}.`,
-        nvda: `If NVDA did not make the focus mode sound when the test page loaded, press ${keys.INS_SPACE} to turn focus mode on.`,
-        voiceover_macos: `Toggle Quick Nav OFF by pressing the ${keys.LEFT} and ${keys.RIGHT} keys at the same time.`
-      }
-    };
-
-    this.support = support;
-  }
-
-
-  /**
-   * Get AT-specific instruction
-   * @param {string} mode - The mode of the screen reader, "reading" or "interaction"
-   * @param {string} task - The task of the test.
-   * @param {string} assitiveTech - The assistive technology.
-   * @return {Array} - A list of commands (strings)
-   */
-  getATCommands(mode, task, assistiveTech) {
-    if (!this.AT_COMMAND_MAP[task]) {
-      throw new Error(`Task "${task}" does not exist, please add to at-commands or correct your spelling.`);
-    }
-    else if (!this.AT_COMMAND_MAP[task][mode]) {
-      throw new Error(`Mode "${mode}" instructions for task "${task}" does not exist, please add to at-commands or correct your spelling.`);
-    }
-
-    let commandsData = this.AT_COMMAND_MAP[task][mode][assistiveTech.key] || [];
-    let commands = [];
-
-    for (let c of commandsData) {
-      let innerCommands = [];
-      let commandSequence = c[0].split(',');
-      for (let command of commandSequence) {
-        command = keys[command];
-        if (typeof command === 'undefined') {
-          throw new Error(`Key instruction identifier "${c}" for AT "${assistiveTech.name}", mode "${mode}", task "${task}" is not an available identified. Update you commands.json file to the correct identifier or add your identifier to resources/keys.mjs.`);
-        }
-
-        let furtherInstruction = c[1];
-        command = furtherInstruction ? `${command} ${furtherInstruction}` : command;
-        innerCommands.push(command);
-      }
-      commands.push(innerCommands.join(", then "));
-    }
-
-    return commands;
-  }
-
-  /**
-   * Get AT-specific mode switching instructions
-   * @param {string} mode - The mode of the screen reader, "reading" or "interaction"
-   * @param {string} assistiveTech - The assistive technology.
-   * @return {string} - Instructions for switching into the correct mode.
-   */
-  getModeInstructions(mode, assistiveTech) {
-    if (this.MODE_INSTRUCTIONS[mode] && this.MODE_INSTRUCTIONS[mode][assistiveTech.key]) {
-      return this.MODE_INSTRUCTIONS[mode][assistiveTech.key];
-    }
-    return '';
-  }
-
-  /**
-   * Get AT-specific instruction
-   * @param {string} at - an assitve technology with any capitalization
-   * @return {string} - if this API knows instructions for `at`, it will return the `at` with proper capitalization
-   */
-  isKnownAT(at) {
-    return this.support.ats.find(o => o.key === at.toLowerCase());
-  }
-}
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html
new file mode 100644
index 000000000..22ad26428
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // activateThirdTabAndSetFocusOnTabpanel
+          // activates the third tab in the tab list, and sets focus on the tab panel
+          testPageDocument.querySelectorAll('[role="tab"]').forEach(t => {
+            t.setAttribute('tabindex', '-1');
+            t.setAttribute('aria-selected', 'false');
+          });
+
+          testPageDocument.querySelectorAll('[role="tabpanel"]').forEach(p => {
+            p.classList.add('is-hidden');
+          });
+
+          let thirdTab = testPageDocument.querySelector('#complex');
+          let thirdPanel = testPageDocument.querySelector('#complex-complex');
+
+          thirdTab.removeAttribute('tabindex');
+          thirdTab.setAttribute('aria-selected', 'true');
+          thirdPanel.classList.remove('is-hidden');
+          thirdPanel.focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html
new file mode 100644
index 000000000..ce0f54d19
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusAfterTabpanel
+          // sets focus on a link after the tab panel
+          testPageDocument.querySelector('#afterlink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html
new file mode 100644
index 000000000..5a0bd7d7c
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusBeforeTablist
+          // sets focus on a link before the tab list
+          testPageDocument.querySelector('#beforelink').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html
new file mode 100644
index 000000000..72ab5d11b
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnFirstTab
+          // sets focus on the first tab
+          testPageDocument.querySelector('#nils').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html
new file mode 100644
index 000000000..e184c2145
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnSecondTab
+          // sets focus on the second tab
+          testPageDocument.querySelector('#agnes').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html
new file mode 100644
index 000000000..6d13ae25f
--- /dev/null
+++ b/build/tests/tabs-manual-activation/reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" >
+    <title>Example of Tabs with Manual Activation</title>
+
+
+    <link href="css/tabs.css" rel="stylesheet">
+    <!-- Generated by create-example-tests.js -->
+    <script>
+      (function() {
+        function setupScript(testPageDocument) {
+          // setFocusOnThirdTab
+          // sets focus on the third tab
+          testPageDocument.querySelector('#complex').focus();
+
+        };
+        document.addEventListener('click', function(event) {
+          if (event.target.classList.contains('button-run-test-setup')) {
+            event.target.disabled = true;
+            setupScript(document);
+          }
+        });
+      })();
+    </script>
+    <!-- End of generated output -->
+  </head>
+  <body>
+    <main>
+      <h1>Example of Tabs with Manual Activation</h1>
+      <p>
+          The below example section demonstrates a tabs widget that implements the  <a href="https://w3c.github.io/aria-practices/#tabpanel">tabs design pattern</a>.
+          In this example,  a new panel is displayed only after the user activates a tab with either <kbd>Space</kbd>, <kbd>Enter</kbd>, or a mouse click.
+          Typically, manual activation of tabs is only necessary when panels cannot be displayed instantly, i.e., not all the panel content is present in the DOM.
+      </p>
+
+      <section>
+        <div class="example-header">
+          <h2 id="ex_label">Example</h2>
+        </div>
+        <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <div id="ex1">
+          <div class="tabs">
+            <div role="tablist" aria-label="Entertainment">
+              <button type="button" role="tab" aria-selected="true" aria-controls="nils-tab" id="nils">Nils Frahm</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="agnes-tab" id="agnes" tabindex="-1">Agnes Obel</button>
+              <button type="button" role="tab" aria-selected="false" aria-controls="complex-complex" id="complex" tabindex="-1" data-deletable>Joke</button>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="nils-tab" aria-labelledby="nils">
+              <p>Nils Frahm is a German musician, composer and record producer based in Berlin. He is known for combining classical and electronic music and for an unconventional approach to the piano in which he mixes a grand piano, upright piano, Roland Juno-60, Rhodes piano, drum machine, and Moog Taurus.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="agnes-tab" aria-labelledby="agnes" class="is-hidden">
+              <p>Agnes Caroline Thaarup Obel is a Danish singer/songwriter. Her first album, Philharmonics, was released by PIAS Recordings on 4 October 2010 in Europe. Philharmonics was certified gold in June 2011 by the Belgian Entertainment Association (BEA) for sales of 10,000 Copies.</p>
+            </div>
+
+            <div tabindex="0" role="tabpanel" id="complex-complex" aria-labelledby="complex" class="is-hidden">
+              <p>Fear of complicated buildings:</p>
+              <p>A complex complex complex.</p>
+            </div>
+          </div>
+        </div>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+        <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+        <!-- Generated by create-example-tests.js -->
+        <div style="position: relative; left: 0; right: 0; height: 2rem;">
+          <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+        </div>
+        <!-- End of generated output -->
+      </section>
+    </main>
+    <script src="js/tabs.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-jaws.collected.json
index f3acad0cb..70c9ba00d 100644
--- a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html",
     "setupScript": {
       "name": "setFocusBeforeTablist",
       "description": "sets focus on a link before the tab list",
diff --git a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-nvda.collected.json
index 6d9324fb4..f3bc86c65 100644
--- a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html",
     "setupScript": {
       "name": "setFocusBeforeTablist",
       "description": "sets focus on a link before the tab list",
diff --git a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html
index b62804adc..64abde9bc 100644
--- a/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-01-navigate-forwards-to-tab-list-reading.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-jaws.collected.json
index 6ec2e22c8..8306b7393 100644
--- a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html",
     "setupScript": {
       "name": "activateThirdTabAndSetFocusOnTabpanel",
       "description": "activates the third tab in the tab list, and sets focus on the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-nvda.collected.json
index a875bcdc2..1c5222717 100644
--- a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html",
     "setupScript": {
       "name": "activateThirdTabAndSetFocusOnTabpanel",
       "description": "activates the third tab in the tab list, and sets focus on the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html
index 63aaa7e71..3c53f4138 100644
--- a/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-02-navigate-backwards-to-tab-list-reading.html
@@ -97,7 +97,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-jaws.collected.json
index 954e86510..32239d7c2 100644
--- a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html",
     "setupScript": {
       "name": "setFocusBeforeTablist",
       "description": "sets focus on a link before the tab list",
diff --git a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-nvda.collected.json
index 1055c4328..93ee9ed7a 100644
--- a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html",
     "setupScript": {
       "name": "setFocusBeforeTablist",
       "description": "sets focus on a link before the tab list",
diff --git a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html
index aac521b15..a5f0ad93d 100644
--- a/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-03-navigate-forwards-to-tab-list-interaction.html
@@ -85,7 +85,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-jaws.collected.json
index 0516724d0..df6e58cc8 100644
--- a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-jaws.collected.json
@@ -37,7 +37,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html",
     "setupScript": {
       "name": "activateThirdTabAndSetFocusOnTabpanel",
       "description": "activates the third tab in the tab list, and sets focus on the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-nvda.collected.json
index 1cbaed7af..9e8d82cbf 100644
--- a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction-nvda.collected.json
@@ -37,7 +37,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html",
     "setupScript": {
       "name": "activateThirdTabAndSetFocusOnTabpanel",
       "description": "activates the third tab in the tab list, and sets focus on the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html
index b0868232a..00d59db39 100644
--- a/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-04-navigate-backwards-to-tab-list-interaction.html
@@ -97,7 +97,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction-voiceover_macos.collected.json
index 8bb79da3a..4d674aa78 100644
--- a/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html",
     "setupScript": {
       "name": "setFocusBeforeTablist",
       "description": "sets focus on a link before the tab list",
diff --git a/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html
index 2ff9fef0a..8ada26598 100644
--- a/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-05-navigate-forwards-to-tab-list-interaction.html
@@ -84,7 +84,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusBeforeTablist.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction-voiceover_macos.collected.json
index a8fb9cb49..767c48b22 100644
--- a/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction-voiceover_macos.collected.json
@@ -37,7 +37,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html",
     "setupScript": {
       "name": "activateThirdTabAndSetFocusOnTabpanel",
       "description": "activates the third tab in the tab list, and sets focus on the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html
index 617d76b5c..c5a275afd 100644
--- a/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-06-navigate-backwards-to-tab-list-interaction.html
@@ -96,7 +96,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.activateThirdTabAndSetFocusOnTabpanel.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-jaws.collected.json
index 876872a2f..8f0be61f4 100644
--- a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-nvda.collected.json
index 266858eb4..31e3cee85 100644
--- a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html
index 68dca5f5a..0fb6b6f1e 100644
--- a/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-07-read-information-about-tab-in-tab-list-reading.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-jaws.collected.json
index 4914d7a8f..372356e37 100644
--- a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-nvda.collected.json
index 9a1e6120e..000434ffd 100644
--- a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html
index 19c901770..3d24dee2a 100644
--- a/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-08-read-information-about-tab-in-tab-list-interaction.html
@@ -74,7 +74,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction-voiceover_macos.collected.json
index e76efe789..3e1242638 100644
--- a/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html
index f1bf5e574..f0d696864 100644
--- a/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-09-read-information-about-tab-in-tab-list-interaction.html
@@ -73,7 +73,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-jaws.collected.json
index 4eb36d867..30e03042d 100644
--- a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-nvda.collected.json
index f32a27291..72cb663e7 100644
--- a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html
index 412bb061f..8ad74caec 100644
--- a/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-10-navigate-to-next-tab-in-tab-list-reading.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-jaws.collected.json
index 64b176802..085e2dbab 100644
--- a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-nvda.collected.json
index 3aa14b0cb..7a83627a4 100644
--- a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html
index e930bcdc8..a7fcf90d5 100644
--- a/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-11-navigate-to-next-tab-in-tab-list-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction-voiceover_macos.collected.json
index dd53aab24..1531870b9 100644
--- a/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html
index 82d320495..548511209 100644
--- a/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-12-navigate-to-next-tab-in-tab-list-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-jaws.collected.json
index 33dd83d4a..b97223786 100644
--- a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-nvda.collected.json
index dfebad4ba..c92357252 100644
--- a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html
index a5501a881..68bbcbcb3 100644
--- a/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-13-navigate-to-previous-tab-in-tab-list-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-jaws.collected.json
index 271e2bed4..062ed991c 100644
--- a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-nvda.collected.json
index 5178f69ab..cbe4d03b2 100644
--- a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html
index efc1c9272..f3a054fe2 100644
--- a/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-14-navigate-to-previous-tab-in-tab-list-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction-voiceover_macos.collected.json
index 5f3564c15..6f7168514 100644
--- a/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html
index 6c791d997..1aad3cba5 100644
--- a/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-15-navigate-to-previous-tab-in-tab-list-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-jaws.collected.json
index fa48eec93..6a0aa43aa 100644
--- a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-nvda.collected.json
index f0c2f4ee3..f8590ac7c 100644
--- a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html
index 4dd1f4521..53225694b 100644
--- a/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-16-navigate-to-first-tab-in-tab-list-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction-voiceover_macos.collected.json
index 698827323..b02143991 100644
--- a/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html
index 65e0f80b2..8cc456370 100644
--- a/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-17-navigate-to-first-tab-in-tab-list-interaction.html
@@ -66,7 +66,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-jaws.collected.json
index 960f41b62..143c29601 100644
--- a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-nvda.collected.json
index 5e196f6a3..e8d5f9ac3 100644
--- a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html
index 376777461..57bb87127 100644
--- a/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-18-navigate-to-last-tab-in-tab-list-interaction.html
@@ -62,7 +62,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction-voiceover_macos.collected.json
index 766b31bf7..7cbf383a1 100644
--- a/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html
index 5c6864c59..dd6547bfb 100644
--- a/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-19-navigate-to-last-tab-in-tab-list-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-jaws.collected.json
index 57153be5a..e8bb2538e 100644
--- a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-nvda.collected.json
index 07f41419f..7d67ac5d4 100644
--- a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html
index cebf217f3..bed57e46a 100644
--- a/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html
+++ b/build/tests/tabs-manual-activation/test-20-navigate-forwards-to-tab-panel-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-jaws.collected.json
index 2ee7d38a8..4e39a9a83 100644
--- a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html",
     "setupScript": {
       "name": "setFocusAfterTabpanel",
       "description": "sets focus on a link after the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-nvda.collected.json
index f12714146..2e9c3799f 100644
--- a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html",
     "setupScript": {
       "name": "setFocusAfterTabpanel",
       "description": "sets focus on a link after the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html
index 6ec830461..fc7080df5 100644
--- a/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html
+++ b/build/tests/tabs-manual-activation/test-21-navigate-backwards-to-tab-panel-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction-voiceover_macos.collected.json
index afa497e9b..6a01c9134 100644
--- a/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html",
     "setupScript": {
       "name": "setFocusOnFirstTab",
       "description": "sets focus on the first tab",
diff --git a/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html b/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html
index 3a0b9c402..0f205277b 100644
--- a/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html
+++ b/build/tests/tabs-manual-activation/test-22-navigate-forwards-to-tab-panel-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnFirstTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction-voiceover_macos.collected.json
index d8158d233..a5100133b 100644
--- a/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html",
     "setupScript": {
       "name": "setFocusAfterTabpanel",
       "description": "sets focus on a link after the tab panel",
diff --git a/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html b/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html
index 4b85eb1d0..1ff83291a 100644
--- a/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html
+++ b/build/tests/tabs-manual-activation/test-23-navigate-backwards-to-tab-panel-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusAfterTabpanel.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-jaws.collected.json
index 9163fa61f..3567bbef0 100644
--- a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-nvda.collected.json
index e8dd10b70..c75dd0442 100644
--- a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html
index dfdd622e4..b4a05f278 100644
--- a/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-24-activate-tab-in-tab-list-reading.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-jaws.collected.json
index 84d0ff44a..c7e6b0ed9 100644
--- a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-jaws.collected.json
@@ -21,7 +21,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-nvda.collected.json
index d25adf5d8..63baa13b5 100644
--- a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction-nvda.collected.json
@@ -21,7 +21,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html
index 22f73d038..2f4fdfe78 100644
--- a/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-25-activate-tab-in-tab-list-interaction.html
@@ -57,7 +57,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction-voiceover_macos.collected.json
index 3b3b661a9..e3b6dd81e 100644
--- a/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction-voiceover_macos.collected.json
@@ -21,7 +21,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html",
     "setupScript": {
       "name": "setFocusOnSecondTab",
       "description": "sets focus on the second tab",
diff --git a/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html
index fe03514a4..009c9ceaf 100644
--- a/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-26-activate-tab-in-tab-list-interaction.html
@@ -56,7 +56,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnSecondTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-jaws.collected.json b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-jaws.collected.json
index 9a66f525f..f6a8d22cb 100644
--- a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-nvda.collected.json b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-nvda.collected.json
index 250ef26c3..a6e721b89 100644
--- a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html
index 545eadd55..c340cd0c4 100644
--- a/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html
+++ b/build/tests/tabs-manual-activation/test-27-delete-tab-from-tab-list-reading.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-jaws.collected.json b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-jaws.collected.json
index 55f11e975..357c92771 100644
--- a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-jaws.collected.json
+++ b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-jaws.collected.json
@@ -29,7 +29,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-nvda.collected.json b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-nvda.collected.json
index 1570304f3..44c6a201c 100644
--- a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-nvda.collected.json
+++ b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction-nvda.collected.json
@@ -29,7 +29,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html
index 698d77ea6..7fc687bc5 100644
--- a/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-28-delete-tab-from-tab-list-interaction.html
@@ -71,7 +71,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction-voiceover_macos.collected.json b/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction-voiceover_macos.collected.json
index 6199d3acc..19a503932 100644
--- a/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction-voiceover_macos.collected.json
+++ b/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction-voiceover_macos.collected.json
@@ -29,7 +29,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-2-15_124757/tabs.html",
+    "referencePage": "reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html",
     "setupScript": {
       "name": "setFocusOnThirdTab",
       "description": "sets focus on the third tab",
diff --git a/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html b/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html
index f9c15f100..5e5285ea1 100644
--- a/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html
+++ b/build/tests/tabs-manual-activation/test-29-delete-tab-from-tab-list-interaction.html
@@ -70,7 +70,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.html");
+    displayTestPageAndInstructions("reference/2021-2-15_124757/tabs.setFocusOnThirdTab.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusAfterButton.html b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusAfterButton.html
new file mode 100644
index 000000000..0a986ae37
--- /dev/null
+++ b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusAfterButton.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Toggle Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <script src="js/button.js"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusAfterButton
+        // sets focus on a link after the button
+        testPageDocument.querySelector('#afterlink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Toggle Button Example</h1>
+
+    <p>
+      The following toggle button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p style="display: none;">This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <div style="display: none;" tabindex="-1" role="button" id="action">Print Page</div>
+
+        <p>This <q>Mute</q> toggle button uses an <code>a</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <a tabindex="0" role="button" id="toggle" aria-pressed="false">
+          Mute
+          <svg aria-hidden="true" focusable="false">
+            <use xlink:href="#icon-sound"></use>
+          </svg>
+        </a>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none" id="svg_definitions">
+          <defs>
+            <symbol id="icon-mute" viewBox="0 0 75 75">
+              <polygon
+                 id="polygon1"
+                 points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                 style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;" />
+              <path
+                 id="path3003"
+                 d="M 48.651772,50.269646 69.395223,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round" />
+              <path
+                 id="path3003-1"
+                 d="M 69.395223,50.269646 48.651772,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+            <symbol id="icon-sound" viewBox="0 0 75 75">
+              <polygon points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;"/>
+              <path d="M 48.128,49.03 C 50.057,45.934 51.19,42.291 51.19,38.377 C 51.19,34.399 50.026,30.703 48.043,27.577"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 55.082,20.537 C 58.777,25.523 60.966,31.694 60.966,38.377 C 60.966,44.998 58.815,51.115 55.178,56.076"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 61.71,62.611 C 66.977,55.945 70.128,47.531 70.128,38.378 C 70.128,29.161 66.936,20.696 61.609,14.01"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+          </defs>
+        </svg>
+
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusBeforeButton.html b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusBeforeButton.html
new file mode 100644
index 000000000..d9433885e
--- /dev/null
+++ b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusBeforeButton.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Toggle Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <script src="js/button.js"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusBeforeButton
+        // sets focus on a link before the button
+        testPageDocument.querySelector('#beforelink').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Toggle Button Example</h1>
+
+    <p>
+      The following toggle button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p style="display: none;">This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <div style="display: none;" tabindex="-1" role="button" id="action">Print Page</div>
+
+        <p>This <q>Mute</q> toggle button uses an <code>a</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <a tabindex="0" role="button" id="toggle" aria-pressed="false">
+          Mute
+          <svg aria-hidden="true" focusable="false">
+            <use xlink:href="#icon-sound"></use>
+          </svg>
+        </a>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none" id="svg_definitions">
+          <defs>
+            <symbol id="icon-mute" viewBox="0 0 75 75">
+              <polygon
+                 id="polygon1"
+                 points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                 style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;" />
+              <path
+                 id="path3003"
+                 d="M 48.651772,50.269646 69.395223,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round" />
+              <path
+                 id="path3003-1"
+                 d="M 69.395223,50.269646 48.651772,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+            <symbol id="icon-sound" viewBox="0 0 75 75">
+              <polygon points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;"/>
+              <path d="M 48.128,49.03 C 50.057,45.934 51.19,42.291 51.19,38.377 C 51.19,34.399 50.026,30.703 48.043,27.577"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 55.082,20.537 C 58.777,25.523 60.966,31.694 60.966,38.377 C 60.966,44.998 58.815,51.115 55.178,56.076"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 61.71,62.611 C 66.977,55.945 70.128,47.531 70.128,38.378 C 70.128,29.161 66.936,20.696 61.609,14.01"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+          </defs>
+        </svg>
+
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButton.html b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButton.html
new file mode 100644
index 000000000..71f456c76
--- /dev/null
+++ b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButton.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Toggle Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <script src="js/button.js"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusOnButton
+        // sets focus on the button
+        testPageDocument.querySelector('#toggle').focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Toggle Button Example</h1>
+
+    <p>
+      The following toggle button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p style="display: none;">This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <div style="display: none;" tabindex="-1" role="button" id="action">Print Page</div>
+
+        <p>This <q>Mute</q> toggle button uses an <code>a</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <a tabindex="0" role="button" id="toggle" aria-pressed="false">
+          Mute
+          <svg aria-hidden="true" focusable="false">
+            <use xlink:href="#icon-sound"></use>
+          </svg>
+        </a>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none" id="svg_definitions">
+          <defs>
+            <symbol id="icon-mute" viewBox="0 0 75 75">
+              <polygon
+                 id="polygon1"
+                 points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                 style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;" />
+              <path
+                 id="path3003"
+                 d="M 48.651772,50.269646 69.395223,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round" />
+              <path
+                 id="path3003-1"
+                 d="M 69.395223,50.269646 48.651772,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+            <symbol id="icon-sound" viewBox="0 0 75 75">
+              <polygon points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;"/>
+              <path d="M 48.128,49.03 C 50.057,45.934 51.19,42.291 51.19,38.377 C 51.19,34.399 50.026,30.703 48.043,27.577"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 55.082,20.537 C 58.777,25.523 60.966,31.694 60.966,38.377 C 60.966,44.998 58.815,51.115 55.178,56.076"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 61.71,62.611 C 66.977,55.945 70.128,47.531 70.128,38.378 C 70.128,29.161 66.936,20.696 61.609,14.01"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+          </defs>
+        </svg>
+
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html
new file mode 100644
index 000000000..cfb79c645
--- /dev/null
+++ b/build/tests/toggle-button/reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Toggle Button Example</title>
+
+
+  <link rel="stylesheet" href="css/button.css">
+  <script src="js/button.js"></script>
+  <!-- Generated by create-example-tests.js -->
+  <script>
+    (function() {
+      function setupScript(testPageDocument) {
+        // setFocusOnButtonAndSetStateToPressed
+        // sets focus on the button, and sets its state to 'pressed'
+        let button = testPageDocument.querySelector('#toggle');
+        button.setAttribute('aria-pressed', 'true');
+        button.querySelector('use').setAttribute('xlink:href', '#icon-sound');
+        button.focus();
+
+      };
+      document.addEventListener('click', function(event) {
+        if (event.target.classList.contains('button-run-test-setup')) {
+          event.target.disabled = true;
+          setupScript(document);
+        }
+      });
+    })();
+  </script>
+  <!-- End of generated output -->
+</head>
+<body>
+  <main>
+    <h1>Toggle Button Example</h1>
+
+    <p>
+      The following toggle button example demonstrates the <a href="https://w3c.github.io/aria-practices/#button">button design pattern.</a>
+    </p>
+
+    <section>
+    <div class="example-header">
+      <h2 id="ex_label">Example</h2>
+    </div>
+
+      <div role="separator" id="ex_start_sep" aria-labelledby="ex_start_sep ex_label" aria-label="Start of"></div>
+
+      <div id="example">
+        <p style="display: none;">This <q>Print</q> action button uses a <code>div</code> element.</p>
+        <div style="display: none;" tabindex="-1" role="button" id="action">Print Page</div>
+
+        <p>This <q>Mute</q> toggle button uses an <code>a</code> element.</p>
+        <a id="beforelink" href="#beforelink">Navigate forwards from here</a>
+        <a tabindex="0" role="button" id="toggle" aria-pressed="false">
+          Mute
+          <svg aria-hidden="true" focusable="false">
+            <use xlink:href="#icon-sound"></use>
+          </svg>
+        </a>
+        <a id="afterlink" href="#afterlink">Navigate backwards from here</a>
+
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none" id="svg_definitions">
+          <defs>
+            <symbol id="icon-mute" viewBox="0 0 75 75">
+              <polygon
+                 id="polygon1"
+                 points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                 style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;" />
+              <path
+                 id="path3003"
+                 d="M 48.651772,50.269646 69.395223,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round" />
+              <path
+                 id="path3003-1"
+                 d="M 69.395223,50.269646 48.651772,25.971024"
+                 style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+            <symbol id="icon-sound" viewBox="0 0 75 75">
+              <polygon points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769"
+                style="stroke:currentColor;stroke-width:5;stroke-linejoin:round;fill:currentColor;"/>
+              <path d="M 48.128,49.03 C 50.057,45.934 51.19,42.291 51.19,38.377 C 51.19,34.399 50.026,30.703 48.043,27.577"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 55.082,20.537 C 58.777,25.523 60.966,31.694 60.966,38.377 C 60.966,44.998 58.815,51.115 55.178,56.076"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+              <path d="M 61.71,62.611 C 66.977,55.945 70.128,47.531 70.128,38.378 C 70.128,29.161 66.936,20.696 61.609,14.01"
+                style="fill:none;stroke:currentColor;stroke-width:5;stroke-linecap:round"/>
+            </symbol>
+          </defs>
+        </svg>
+
+      </div>
+
+      <div role="separator" id="ex_end_sep" aria-labelledby="ex_end_sep ex_label" aria-label="End of"></div>
+      <!-- Generated by create-example-tests.js -->
+      <div style="position: relative; left: 0; right: 0; height: 2rem;">
+        <button class="button-run-test-setup" autofocus style="height: 100%; width: 100%;">Run Test Setup</button>
+      </div>
+      <!-- End of generated output -->
+    </section>
+  </main>
+</body>
+</html>
diff --git a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-jaws.collected.json
index d29002eef..65adbf934 100644
--- a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-nvda.collected.json
index 30e41c218..cce1183a3 100644
--- a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html
index bc50d9fbc..189103b1d 100644
--- a/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-01-navigate-forwards-to-not-pressed-toggle-button-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-jaws.collected.json
index b9b1bee8b..967fbfa92 100644
--- a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-nvda.collected.json
index c039cb6e9..898d13193 100644
--- a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html
index 52d0a73ff..69c568ec9 100644
--- a/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-02-navigate-backwards-to-not-pressed-toggle-button-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
index 98760703a..c5806b655 100644
--- a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
index dbd412e39..e7d689162 100644
--- a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html
index 2b80e1cc8..0bd970a2c 100644
--- a/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-03-navigate-forwards-to-not-pressed-toggle-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
index 36d934daa..78160143e 100644
--- a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
index 4c1cc3c08..7787a311f 100644
--- a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html
index d3ae4a322..fef8cf8d9 100644
--- a/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-04-navigate-backwards-to-not-pressed-toggle-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
index 7f07ea6ed..d6903f9fc 100644
--- a/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html
index cfdc92649..d58bf19f9 100644
--- a/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-05-navigate-forwards-to-not-pressed-toggle-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
index bfef40c0b..6b02d3bd2 100644
--- a/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html
index f0d93946b..a0ac475fc 100644
--- a/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-06-navigate-backwards-to-not-pressed-toggle-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-jaws.collected.json
index 395dc284e..9bddfad0b 100644
--- a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-nvda.collected.json
index e5b4819d3..574247077 100644
--- a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html
index 15720e179..b04f68282 100644
--- a/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-07-navigate-forwards-to-pressed-toggle-button-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-jaws.collected.json
index 3952983de..02312ab12 100644
--- a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-nvda.collected.json
index a6af2fc40..1660c9ea1 100644
--- a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html
index 481647234..48f0d0aea 100644
--- a/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-08-navigate-backwards-to-pressed-toggle-button-reading.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-jaws.collected.json
index ca9f4989c..c7acc9ed2 100644
--- a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-nvda.collected.json
index 13b6cd235..98c75f940 100644
--- a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html
index ad78b554d..f253ef12c 100644
--- a/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-09-navigate-forwards-to-pressed-toggle-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-jaws.collected.json
index 045f273e4..190186360 100644
--- a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-nvda.collected.json
index 05ca5fdfc..b7e5e8d60 100644
--- a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html
index e885c48e5..66bb03618 100644
--- a/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-10-navigate-backwards-to-pressed-toggle-button-interaction.html
@@ -76,7 +76,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
index 94d2ad3e5..7c75b5eea 100644
--- a/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusBeforeButton.html",
     "setupScript": {
       "name": "setFocusBeforeButton",
       "description": "sets focus on a link before the button",
diff --git a/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html
index 201e099e6..9daa8c2e2 100644
--- a/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-11-navigate-forwards-to-pressed-toggle-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusBeforeButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
index ea9209473..63f65f142 100644
--- a/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusAfterButton.html",
     "setupScript": {
       "name": "setFocusAfterButton",
       "description": "sets focus on a link after the button",
diff --git a/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html
index 989ed36a7..da288cfff 100644
--- a/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-12-navigate-backwards-to-pressed-toggle-button-interaction.html
@@ -75,7 +75,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusAfterButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-jaws.collected.json
index a47e21cd0..37da7d4d6 100644
--- a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-nvda.collected.json
index 3faa78f5c..1a96ca2ea 100644
--- a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html
index 778ac0d2c..d7693ebb3 100644
--- a/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-13-read-information-about-not-pressed-toggle-button-reading.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-jaws.collected.json
index fc2e5abd1..ddc11566e 100644
--- a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-nvda.collected.json
index a0cd62294..47fd00f0e 100644
--- a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html
index 1557c46a8..7b66f3fb5 100644
--- a/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-14-read-information-about-not-pressed-toggle-button-interaction.html
@@ -65,7 +65,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
index 7c29b9604..f68d2dc73 100644
--- a/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html
index 186381fc1..6eedea525 100644
--- a/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-15-read-information-about-not-pressed-toggle-button-interaction.html
@@ -64,7 +64,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-jaws.collected.json
index f94944115..481420949 100644
--- a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-nvda.collected.json
index d337dacc5..503671fd6 100644
--- a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html
index 36350a299..982fe9a82 100644
--- a/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-16-read-information-about-pressed-toggle-button-reading.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-jaws.collected.json
index 4666eede0..c3e2a7f81 100644
--- a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-nvda.collected.json
index 9aace5bfa..c81b4869f 100644
--- a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html
index 4cb1b400b..36ae19a53 100644
--- a/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-17-read-information-about-pressed-toggle-button-interaction.html
@@ -68,7 +68,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction-voiceover_macos.collected.json
index 20e0efbbd..3513a23e3 100644
--- a/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html
index d80f97fa9..4f9c3ec8e 100644
--- a/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-18-read-information-about-pressed-toggle-button-interaction.html
@@ -67,7 +67,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-jaws.collected.json
index 998037b5c..8e6b3911d 100644
--- a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-nvda.collected.json
index 7d599b102..76d562f1b 100644
--- a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html
index 131c4c0d8..29fb0fea4 100644
--- a/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-19-operate-not-pressed-toggle-button-reading.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-jaws.collected.json
index 39125d7ca..015579905 100644
--- a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-nvda.collected.json
index 49114225c..9c4e5c1e3 100644
--- a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html
index 503ccb930..d0c4c2173 100644
--- a/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-20-operate-not-pressed-toggle-button-interaction.html
@@ -58,7 +58,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
index 8f4df39bb..c6a359ef9 100644
--- a/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButton.html",
     "setupScript": {
       "name": "setFocusOnButton",
       "description": "sets focus on the button",
diff --git a/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html
index c3e8eaef4..7b85edcfe 100644
--- a/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-21-operate-not-pressed-toggle-button-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButton.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-jaws.collected.json b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-jaws.collected.json
index cc571d0ca..e02856212 100644
--- a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-jaws.collected.json
+++ b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-nvda.collected.json b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-nvda.collected.json
index 13ea91a4e..37313de1d 100644
--- a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-nvda.collected.json
+++ b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "reading",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html
index 8ff3f074d..76882b5cd 100644
--- a/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html
+++ b/build/tests/toggle-button/test-22-operate-pressed-toggle-button-reading.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-jaws.collected.json b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-jaws.collected.json
index cb93dbb4f..854a0b80e 100644
--- a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-jaws.collected.json
+++ b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-jaws.collected.json
@@ -25,7 +25,7 @@
       "name": "JAWS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-nvda.collected.json b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-nvda.collected.json
index 3d6eb85b9..2e572389e 100644
--- a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-nvda.collected.json
+++ b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction-nvda.collected.json
@@ -25,7 +25,7 @@
       "name": "NVDA"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html
index e43bec5a7..f1ca67c70 100644
--- a/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-23-operate-pressed-toggle-button-interaction.html
@@ -61,7 +61,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file
diff --git a/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction-voiceover_macos.collected.json b/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction-voiceover_macos.collected.json
index e31451de2..2bdaeb965 100644
--- a/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction-voiceover_macos.collected.json
+++ b/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction-voiceover_macos.collected.json
@@ -25,7 +25,7 @@
       "name": "VoiceOver for macOS"
     },
     "mode": "interaction",
-    "referencePage": "reference/2021-3-29_145942/button.html",
+    "referencePage": "reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html",
     "setupScript": {
       "name": "setFocusOnButtonAndSetStateToPressed",
       "description": "sets focus on the button, and sets its state to 'pressed'",
diff --git a/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html b/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html
index a8080a0b2..94f2a7c79 100644
--- a/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html
+++ b/build/tests/toggle-button/test-24-operate-pressed-toggle-button-interaction.html
@@ -60,7 +60,7 @@
 };
     initialize(supportJson, commandJson);
     verifyATBehavior(testJson);
-    displayTestPageAndInstructions("reference/2021-3-29_145942/button.html");
+    displayTestPageAndInstructions("reference/2021-3-29_145942/button.setFocusOnButtonAndSetStateToPressed.html");
   });
 </script>
   
\ No newline at end of file