diff --git a/data/tests/apg/aria-1-2-combobox-with-list-autocomplete-example.json b/data/tests/apg/aria-1-2-combobox-with-list-autocomplete-example.json
index 9d2e016..5c0da4a 100644
--- a/data/tests/apg/aria-1-2-combobox-with-list-autocomplete-example.json
+++ b/data/tests/apg/aria-1-2-combobox-with-list-autocomplete-example.json
@@ -4566,19 +4566,19 @@
     "nvda": {
       "browsers": {
         "chrome": {
-          "at_version": "2021.1",
+          "at_version": "2023.1",
           "os_version": "Windows 11 version 22h2",
           "browser_version": "116",
           "date": "2023-08-22"
         },
         "edge": {
-          "at_version": "2021.1",
+          "at_version": "2023.1",
           "os_version": "Windows 11 version 22h2",
           "browser_version": "115",
           "date": "2023-08-22"
         },
         "firefox": {
-          "at_version": "2019.1.1",
+          "at_version": "2023.1",
           "browser_version": "116",
           "os_version": "Windows 11 version 22h2",
           "date": "2023-08-22"
diff --git a/data/tests/tech/aria/aria-haspopup-attribute.json b/data/tests/tech/aria/aria-haspopup-attribute.json
index e12a8b3..5da2d13 100644
--- a/data/tests/tech/aria/aria-haspopup-attribute.json
+++ b/data/tests/tech/aria/aria-haspopup-attribute.json
@@ -790,13 +790,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens list\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_listbox",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -809,13 +809,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens tree\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_tree",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -828,13 +828,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens grid\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_grid",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -847,13 +847,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens dialog\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_dialog",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         }
@@ -925,13 +925,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens list\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_listbox",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -944,13 +944,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens tree\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_tree",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -963,13 +963,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action menu button subMenu\"",
+          "output": "\"action menu button opens grid\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_grid",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -982,13 +982,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens dialog\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_dialog",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         }
@@ -1060,13 +1060,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens list\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_listbox",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -1079,13 +1079,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens tree\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_tree",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -1098,13 +1098,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens grid\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_grid",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         },
@@ -1117,13 +1117,13 @@
             "focus_location": "before target"
           },
           "after": "target",
-          "output": "\"action button subMenu\"",
+          "output": "\"action button opens dialog\"",
           "results": [
             {
               "feature_id": "aria/aria-haspopup_attribute",
               "feature_assertion_id": "convey_value_dialog",
               "applied_to": "html/button_element",
-              "result": "fail"
+              "result": "pass"
             }
           ]
         }
@@ -1841,6 +1841,10 @@
     {
       "date": "2023-08-16",
       "message": "Updated results. Jaws and Orca now support."
+    },
+    {
+      "date": "2023-09-05",
+      "message": "Updated NVDA results. Now supports all values."
     }
   ],
   "versions": {
@@ -1885,22 +1889,22 @@
     "nvda": {
       "browsers": {
         "chrome": {
-          "at_version": "2021.1",
+          "at_version": "2023.2",
           "os_version": "Windows 11 version 22h2",
           "browser_version": "116",
-          "date": "2023-08-16"
+          "date": "2023-09-05"
         },
         "edge": {
-          "at_version": "2021.1",
+          "at_version": "2023.2",
           "os_version": "Windows 11 version 22h2",
           "browser_version": "115",
-          "date": "2023-08-16"
+          "date": "2023-09-05"
         },
         "firefox": {
-          "at_version": "2019.1.1",
+          "at_version": "2023.2",
           "browser_version": "116",
           "os_version": "Windows 11 version 22h2",
-          "date": "2023-08-16"
+          "date": "2023-09-05"
         },
         "ie": {
           "at_version": "2019.1.1",