diff --git a/index.html b/index.html
index 47bfd8566..21b4f9c5d 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/checkbox/index.html">Index</a></td>
             <td><a href="./review/checkbox.html">Review</a></td>
             <td>26</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/af45067" target="_blank">af45067 Change Command+Up&#x2F;Down to Option+Up&#x2F;Down in some commands
+            <td><a href="https://github.com/w3c/aria-at/commit/0220017" target="_blank">0220017 Merge branch &#39;tests&#x2F;combobox-select-only&#39; of https:&#x2F;&#x2F;github.com&#x2F;w3c&#x2F;aria-at into tests&#x2F;combobox-select-only
 </a></td>
           </tr>
           <tr>
@@ -48,7 +48,7 @@ <h1>Test Patterns for Review</h1>
             <td><a href="./tests/combobox-autocomplete-both/index.html">Index</a></td>
             <td><a href="./review/combobox-autocomplete-both.html">Review</a></td>
             <td>30</td>
-            <td><a href="https://github.com/w3c/aria-at/commit/af45067" target="_blank">af45067 Change Command+Up&#x2F;Down to Option+Up&#x2F;Down in some commands
+            <td><a href="https://github.com/w3c/aria-at/commit/0220017" target="_blank">0220017 Merge branch &#39;tests&#x2F;combobox-select-only&#39; of https:&#x2F;&#x2F;github.com&#x2F;w3c&#x2F;aria-at into tests&#x2F;combobox-select-only
 </a></td>
           </tr>
           <tr>
@@ -63,7 +63,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/af45067" target="_blank">af45067 Change Command+Up&#x2F;Down to Option+Up&#x2F;Down in some commands
+            <td><a href="https://github.com/w3c/aria-at/commit/0220017" target="_blank">0220017 Merge branch &#39;tests&#x2F;combobox-select-only&#39; of https:&#x2F;&#x2F;github.com&#x2F;w3c&#x2F;aria-at into tests&#x2F;combobox-select-only
 </a></td>
           </tr>
     </table>
diff --git a/review/checkbox.html b/review/checkbox.html
index 25e4f80b0..d46ae0b2a 100644
--- a/review/checkbox.html
+++ b/review/checkbox.html
@@ -140,25 +140,22 @@
 },	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },	focusonfirstlink: function(testPageDocument){
 	// Move focus to the link just before the meunbar
 	testPageDocument.querySelector('a').focus();
@@ -218,7 +215,7 @@ <h2>Test 1: Navigate to an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-01-navigate-to-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -291,7 +288,7 @@ <h2>Test 2: Navigate to an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-02-navigate-to-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -357,7 +354,7 @@ <h2>Test 3: Navigate to an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-03-navigate-to-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -403,7 +400,7 @@ <h2>Test 4: Navigate to a checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-04-navigate-to-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -486,7 +483,7 @@ <h2>Test 5: Navigate to a checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-05-navigate-to-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -562,7 +559,7 @@ <h2>Test 6: Navigate to a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-06-navigate-to-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -613,7 +610,7 @@ <h2>Test 7: Operate a checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-07-operate-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -676,7 +673,7 @@ <h2>Test 8: Operate a checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-08-operate-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -737,7 +734,7 @@ <h2>Test 9: Operate a checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-09-operate-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -779,7 +776,7 @@ <h2>Test 10: Read an unchecked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-10-read-unchecked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -857,7 +854,7 @@ <h2>Test 11: Read an unchecked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-11-read-unchecked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -935,7 +932,7 @@ <h2>Test 12: Read an unchecked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-12-read-unchecked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -985,7 +982,7 @@ <h2>Test 13: Read a checked checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-13-read-checked-checkbox-reading.html?at=jaws">jaws</a></li>
@@ -1063,7 +1060,7 @@ <h2>Test 14: Read a checked checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-14-read-checked-checkbox-interaction.html?at=jaws">jaws</a></li>
@@ -1141,7 +1138,7 @@ <h2>Test 15: Read a checked checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-15-read-checked-checkbox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1191,7 +1188,7 @@ <h2>Test 16: Read grouping information of a grouped checkbox in reading mode</h2
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-16-read-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1255,7 +1252,7 @@ <h2>Test 17: Read grouping information of a grouped checkbox in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-17-read-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1319,7 +1316,7 @@ <h2>Test 18: Read grouping information of a grouped checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-18-read-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1363,7 +1360,7 @@ <h2>Test 19: Navigate sequentially through a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-19-navigate-sequentially-through-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1432,7 +1429,7 @@ <h2>Test 20: Navigate sequentially through a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1478,7 +1475,7 @@ <h2>Test 21: Navigate into a checkbox group in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-21-navigate-into-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1555,7 +1552,7 @@ <h2>Test 22: Navigate into a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-22-navigate-into-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1624,7 +1621,7 @@ <h2>Test 23: Navigate into a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-23-navigate-into-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1674,7 +1671,7 @@ <h2>Test 24: Navigate out of a checkbox group  in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-24-navigate-out-of-checkbox-group-reading.html?at=jaws">jaws</a></li>
@@ -1743,7 +1740,7 @@ <h2>Test 25: Navigate out of a checkbox group in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-25-navigate-out-of-checkbox-group-interaction.html?at=jaws">jaws</a></li>
@@ -1812,7 +1809,7 @@ <h2>Test 26: Navigate out of a checkbox group</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/checkbox/test-26-navigate-out-of-checkbox-group-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
diff --git a/review/combobox-autocomplete-both.html b/review/combobox-autocomplete-both.html
index 27dbcb17f..ed6f5526e 100644
--- a/review/combobox-autocomplete-both.html
+++ b/review/combobox-autocomplete-both.html
@@ -140,25 +140,22 @@
 },	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },	focusonfirstlink: function(testPageDocument){
 	// Move focus to the link just before the meunbar
 	testPageDocument.querySelector('a').focus();
@@ -218,7 +215,7 @@ <h2>Test 1: Navigate to empty, editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-01-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -288,7 +285,7 @@ <h2>Test 2: Navigate sequentially to empty, editable combobox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-02-navigate-by-line-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -354,7 +351,7 @@ <h2>Test 3: Navigate to empty, editable combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-03-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -420,7 +417,7 @@ <h2>Test 4: Read empty, editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-04-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -486,7 +483,7 @@ <h2>Test 5: Read empty, editable combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-05-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -552,7 +549,7 @@ <h2>Test 6: Navigate to filled, editable, collapsed  combobox in reading mode</h
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-06-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -634,7 +631,7 @@ <h2>Test 7: Navigate to filled, editable, collapsed  combobox in interaction mod
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-07-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -712,7 +709,7 @@ <h2>Test 8: Read filled, editable, collapsed combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-08-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -790,7 +787,7 @@ <h2>Test 9: Read filled, editable, collapsed combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-09-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -868,7 +865,7 @@ <h2>Test 10: Navigate to filled, editable, expanded combobox in reading mode</h2
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-10-navigate-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -950,7 +947,7 @@ <h2>Test 11: Navigate sequentially to filled, editable, expanded combobox in rea
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-11-navigate-by-line-to-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1018,7 +1015,7 @@ <h2>Test 12: Navigate to filled, editable, expanded combobox in interaction mode
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-12-navigate-to-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1096,7 +1093,7 @@ <h2>Test 13: Read filled, editable, expanded combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-13-read-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1174,7 +1171,7 @@ <h2>Test 14: Read filled, editable, expanded combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-14-read-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1252,7 +1249,7 @@ <h2>Test 15: Navigate to editable combobox with commands that switch mode from r
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-15-navigate-to-combobox-with-keys-that-switch-modes-reading.html?at=jaws">jaws</a></li>
@@ -1312,7 +1309,7 @@ <h2>Test 16: Activate editable combobox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-16-activate-combobox-reading.html?at=jaws">jaws</a></li>
@@ -1382,7 +1379,7 @@ <h2>Test 17: Open combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-17-open-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1456,7 +1453,7 @@ <h2>Test 18: Close combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-18-close-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1526,7 +1523,7 @@ <h2>Test 19: Open combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-19-activate-states-button-reading.html?at=jaws">jaws</a></li>
@@ -1594,7 +1591,7 @@ <h2>Test 20: Open combobox with 'States' button</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-20-activate-states-button-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1637,7 +1634,7 @@ <h2>Test 21: Close combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-21-activate-states-button-reading.html?at=jaws">jaws</a></li>
@@ -1709,7 +1706,7 @@ <h2>Test 22: Close combobox with 'States' button in reading mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-22-activate-states-button-interaction.html?at=jaws">jaws</a></li>
@@ -1779,7 +1776,7 @@ <h2>Test 23: Navigate into popup from empty combobox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-23-navigate-into-popup-from-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1857,7 +1854,7 @@ <h2>Test 24: Type portion of valid value in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-24-type-in-empty-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1933,7 +1930,7 @@ <h2>Test 25: Navigate options in popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-25-navigate-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2009,7 +2006,7 @@ <h2>Test 26: Read popup item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-26-read-option-in-listbox-popup-reading.html?at=jaws">jaws</a></li>
@@ -2084,7 +2081,7 @@ <h2>Test 27: Read popup item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-27-read-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2159,7 +2156,7 @@ <h2>Test 28: Activate option in popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-28-choose-combobox-option-interaction.html?at=jaws">jaws</a></li>
@@ -2237,7 +2234,7 @@ <h2>Test 29: Cancel option selection in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-29-cancel-selection-interaction.html?at=jaws">jaws</a></li>
@@ -2315,7 +2312,7 @@ <h2>Test 30: Initiate caret movement from listbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-autocomplete-both/test-30-initiate-caret-movement-from-listbox-interaction.html?at=jaws">jaws</a></li>
diff --git a/review/combobox-select-only.html b/review/combobox-select-only.html
index 829d884e4..9b143d779 100644
--- a/review/combobox-select-only.html
+++ b/review/combobox-select-only.html
@@ -140,25 +140,22 @@
 },	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },	focusonfirstlink: function(testPageDocument){
 	// Move focus to the link just before the meunbar
 	testPageDocument.querySelector('a').focus();
@@ -218,7 +215,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-01-navigate-forwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -303,7 +300,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-02-navigate-backwards-to-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -382,7 +379,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-03-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -461,7 +458,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-04-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -540,7 +537,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-05-navigate-forwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -592,7 +589,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-06-navigate-backwards-to-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -644,7 +641,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-07-read-information-about-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -723,7 +720,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-08-read-information-about-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -802,7 +799,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-09-read-information-about-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -854,7 +851,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-10-open-collapsed-select-only-combobox-reading.html?at=jaws">jaws</a></li>
@@ -941,7 +938,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-11-open-collapsed-select-only-combobox-interaction.html?at=jaws">jaws</a></li>
@@ -1036,7 +1033,7 @@ <h2>Test 12: Open a collapsed select-only combobox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-12-open-collapsed-select-only-combobox-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1097,7 +1094,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-13-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=jaws">jaws</a></li>
@@ -1184,7 +1181,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-14-open-collapsed-select-only-combobox-to-first-option-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1240,7 +1237,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1327,7 +1324,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1383,7 +1380,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1470,7 +1467,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1526,7 +1523,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-19-read-information-about-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -1610,7 +1607,7 @@ <h2>Test 20: Read information about a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-20-read-information-about-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1665,7 +1662,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1743,7 +1740,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-22-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -1821,7 +1818,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1873,7 +1870,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-24-navigate-backwards-to-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -1925,7 +1922,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2003,7 +2000,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2053,7 +2050,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-27-navigate-to-first-option-in-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2131,7 +2128,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2209,7 +2206,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-29-navigate-to-first-option-in-listbox-popup-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -2259,7 +2256,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2309,7 +2306,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2387,7 +2384,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2465,7 +2462,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2515,7 +2512,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2565,7 +2562,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>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2648,7 +2645,7 @@ <h2>Test 36: Select an option in a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2702,7 +2699,7 @@ <h2>Test 37: Close a listbox popup in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/combobox-select-only/test-37-close-listbox-popup-interaction.html?at=jaws">jaws</a></li>
@@ -2781,7 +2778,7 @@ <h2>Test 38: Close a listbox popup</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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/review/menubar-editor.html b/review/menubar-editor.html
index 2ad69ee78..3d97312a3 100644
--- a/review/menubar-editor.html
+++ b/review/menubar-editor.html
@@ -140,25 +140,22 @@
 },	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },	focusonfirstlink: function(testPageDocument){
 	// Move focus to the link just before the meunbar
 	testPageDocument.querySelector('a').focus();
@@ -218,7 +215,7 @@ <h2>Test 1: Navigate to menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-01-navigate-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -299,7 +296,7 @@ <h2>Test 2: Activate menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-02-activate-menubar-reading.html?at=jaws">jaws</a></li>
@@ -362,7 +359,7 @@ <h2>Test 3: Navigate to menubar with commands that switch mode from reading to i
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-03-tab-to-menubar-reading.html?at=jaws">jaws</a></li>
@@ -443,7 +440,7 @@ <h2>Test 4: Navigate to menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-04-navigate-to-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -522,7 +519,7 @@ <h2>Test 5: Navigate to menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-05-navigate-to-menubar-interaction.html?at=voiceover_macos">voiceover_macos</a></li>
@@ -573,7 +570,7 @@ <h2>Test 6: Navigate to menu item in menubar in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-06-navigate-to-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -642,7 +639,7 @@ <h2>Test 7: Navigate to menu item in menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-07-navigate-to-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -721,7 +718,7 @@ <h2>Test 8: Navigate to menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -772,7 +769,7 @@ <h2>Test 9: Navigate to open menu item in menubar in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -851,7 +848,7 @@ <h2>Test 10: Navigate to open menu item in menubar</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -901,7 +898,7 @@ <h2>Test 11: Open submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-11-open-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -981,7 +978,7 @@ <h2>Test 12: Open submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1033,7 +1030,7 @@ <h2>Test 13: Close submenu in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-13-close-submenu-of-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1111,7 +1108,7 @@ <h2>Test 14: Close submenu</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1161,7 +1158,7 @@ <h2>Test 15: Navigate to checked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1239,7 +1236,7 @@ <h2>Test 16: Navigate to checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1290,7 +1287,7 @@ <h2>Test 17: Navigate to unchecked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1368,7 +1365,7 @@ <h2>Test 18: Navigate to unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1419,7 +1416,7 @@ <h2>Test 19: Navigate to unchecked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1499,7 +1496,7 @@ <h2>Test 20: Navigate to unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1551,7 +1548,7 @@ <h2>Test 21: Navigate to checked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1637,7 +1634,7 @@ <h2>Test 22: Navigate to checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1692,7 +1689,7 @@ <h2>Test 23: Read menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-23-read-menuitem-in-menubar-reading.html?at=jaws">jaws</a></li>
@@ -1766,7 +1763,7 @@ <h2>Test 24: Read menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</li>
         <li>Tests:
           <ul>
               <li><a href="../tests/menubar-editor/test-24-read-menuitem-in-menubar-interaction.html?at=jaws">jaws</a></li>
@@ -1850,7 +1847,7 @@ <h2>Test 25: Read menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1904,7 +1901,7 @@ <h2>Test 26: Read unchecked menu item radio in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -1988,7 +1985,7 @@ <h2>Test 27: Read unchecked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2072,7 +2069,7 @@ <h2>Test 28: Read unchecked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2126,7 +2123,7 @@ <h2>Test 29: Read checked menu item radio in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2210,7 +2207,7 @@ <h2>Test 30: Read checked menu item radio in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2294,7 +2291,7 @@ <h2>Test 31: Read checked menu item radio</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2348,7 +2345,7 @@ <h2>Test 32: Read unchecked menu item checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2432,7 +2429,7 @@ <h2>Test 33: Read unchecked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2516,7 +2513,7 @@ <h2>Test 34: Read unchecked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2570,7 +2567,7 @@ <h2>Test 35: Read checked menu item checkbox in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2654,7 +2651,7 @@ <h2>Test 36: Read checked menu item checkbox in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2738,7 +2735,7 @@ <h2>Test 37: Read checked menu item checkbox</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2792,7 +2789,7 @@ <h2>Test 38: Read disabled menu item in reading mode</h2>
       <ul>
         <li>Mode: reading</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2874,7 +2871,7 @@ <h2>Test 39: Read disabled menu item in interaction mode</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: jaws, nvda</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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>
@@ -2956,7 +2953,7 @@ <h2>Test 40: Read disabled menu item</h2>
       <ul>
         <li>Mode: interaction</li>
         <li>Applies to: voiceover_macos</li>
-        <li>Lasted edited: Sun Nov 22 13:31:24 2020 -0600</li>
+        <li>Lasted edited: Sun Nov 22 14:48:29 2020 -0600</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/tests/combobox-select-only/scripts.js b/tests/combobox-select-only/scripts.js
index 5839a49e3..c8c364d9a 100644
--- a/tests/combobox-select-only/scripts.js
+++ b/tests/combobox-select-only/scripts.js
@@ -74,137 +74,113 @@ var scripts = {
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListboxToGuava: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Guave'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(11);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(11);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },
 	openListbox: function(testPageDocument){
 	// sets focus on and expands the Combobox
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.setTimeout(onSelectReady, () => {
-	console.log('Opening listbox');
-	window.selectController.updateMenuState(true)
-	}, 500);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
 },
 	openListboxToHuckleberry: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Huckleberry'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(2);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(12);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 },
 	openListboxToApple: function(testPageDocument){
 	// sets focus on and expands the Combobox, and sets the focused option to 'Apple'
 	testPageDocument.querySelector('[role="combobox"]').focus();
-	window.selectController.updateMenuState(true);
-	window.selectController.onOptionChange(1);
+	testPageDocument.defaultView.selectController.updateMenuState(true);
+	testPageDocument.defaultView.selectController.onOptionChange(1);
 }
 };
\ No newline at end of file