diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini
index 36bbe637384..ad694b733cb 100644
--- a/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini
+++ b/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini
@@ -8,3 +8,12 @@
   [DOMTokenList behavior of ElementInternals.states: Modifications]
     expected: FAIL
 
+  [CustomStateSet behavior of ElementInternals.states: Exceptions]
+    expected: FAIL
+
+  [CustomStateSet behavior of ElementInternals.states: Initial state]
+    expected: FAIL
+
+  [CustomStateSet behavior of ElementInternals.states: Modifications]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
index cc89f8c8d33..724a02da004 100644
--- a/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
+++ b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
@@ -1,7 +1,20 @@
 [Event-dispatch-click.html]
+  expected: TIMEOUT
   [event state during post-click handling]
     expected: FAIL
 
   [submit button should not activate if the event listener disables it]
     expected: FAIL
 
+  [disabling radio in onclick listener shouldn't suppress onchange]
+    expected: TIMEOUT
+
+  [disabling checkbox in onclick listener shouldn't suppress oninput]
+    expected: TIMEOUT
+
+  [disabling radio in onclick listener shouldn't suppress oninput]
+    expected: TIMEOUT
+
+  [disabling checkbox in onclick listener shouldn't suppress onchange]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/dom/nodes/Document-createEvent.https.html.ini b/tests/wpt/metadata-layout-2020/dom/nodes/Document-createEvent.https.html.ini
new file mode 100644
index 00000000000..10ff562dd38
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/nodes/Document-createEvent.https.html.ini
@@ -0,0 +1,58 @@
+[Document-createEvent.https.html]
+  [createEvent('DRAGEVENT') should be initialized correctly.]
+    expected: FAIL
+
+  [DEVICEMOTIONEVENT should be an alias for DeviceMotionEvent.]
+    expected: FAIL
+
+  [createEvent('DeviceMotionEvent') should be initialized correctly.]
+    expected: FAIL
+
+  [devicemotionevent should be an alias for DeviceMotionEvent.]
+    expected: FAIL
+
+  [createEvent('DeviceOrientationEvent') should be initialized correctly.]
+    expected: FAIL
+
+  [DRAGEVENT should be an alias for DragEvent.]
+    expected: FAIL
+
+  [DEVICEORIENTATIONEVENT should be an alias for DeviceOrientationEvent.]
+    expected: FAIL
+
+  [Should throw NOT_SUPPORTED_ERR for non-legacy event interface "TouchEvent"]
+    expected: FAIL
+
+  [createEvent('dragevent') should be initialized correctly.]
+    expected: FAIL
+
+  [createEvent('DEVICEMOTIONEVENT') should be initialized correctly.]
+    expected: FAIL
+
+  [createEvent('devicemotionevent') should be initialized correctly.]
+    expected: FAIL
+
+  [DragEvent should be an alias for DragEvent.]
+    expected: FAIL
+
+  [dragevent should be an alias for DragEvent.]
+    expected: FAIL
+
+  [deviceorientationevent should be an alias for DeviceOrientationEvent.]
+    expected: FAIL
+
+  [DeviceOrientationEvent should be an alias for DeviceOrientationEvent.]
+    expected: FAIL
+
+  [createEvent('DEVICEORIENTATIONEVENT') should be initialized correctly.]
+    expected: FAIL
+
+  [createEvent('DragEvent') should be initialized correctly.]
+    expected: FAIL
+
+  [createEvent('deviceorientationevent') should be initialized correctly.]
+    expected: FAIL
+
+  [DeviceMotionEvent should be an alias for DeviceMotionEvent.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 251d31212bd..add6ffaa386 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -321,12 +321,15 @@
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini
new file mode 100644
index 00000000000..1fdc37f08bc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini
@@ -0,0 +1,4 @@
+[unset_context_name.html]
+  [Window.name is reset after navigating to a different origin]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 1b855cfef21..2035b892030 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,19 +1,10 @@
 [select-event.html]
-  [input type search: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -26,33 +17,15 @@
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -65,12 +38,39 @@
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini
new file mode 100644
index 00000000000..18ff1b7eca3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini
@@ -0,0 +1,7 @@
+[popup-element-basic.tentative.html]
+  [popup element exists]
+    expected: FAIL
+
+  [popup element basic show/hide behavior]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini
new file mode 100644
index 00000000000..a6c854723ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini
@@ -0,0 +1,7 @@
+[popup-open.tentative.html]
+  [On setting, the content open attribute must be removed if the IDL open attribute is set to false, and must be present if the IDL open attribute is set to true.]
+    expected: FAIL
+
+  [The IDL open attribute must return true if the content open attribute is set, and false if it is absent.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..5602ea31dbe 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,5 +4,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/touch-events/historical.html.ini b/tests/wpt/metadata-layout-2020/touch-events/historical.html.ini
new file mode 100644
index 00000000000..12675fcde52
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/touch-events/historical.html.ini
@@ -0,0 +1,19 @@
+[historical.html]
+  [TouchList::identifiedTouch]
+    expected: FAIL
+
+  [Touch::webkitRotationAngle]
+    expected: FAIL
+
+  [TouchEvent::initTouchEvent]
+    expected: FAIL
+
+  [Touch::webkitRadiusY]
+    expected: FAIL
+
+  [Touch::webkitRadiusX]
+    expected: FAIL
+
+  [Touch::webkitForce]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
index 8d1eab1b44d..3935496d6ef 100644
--- a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
@@ -10,4 +10,12 @@
 
 
 [constructor-reftypes.tentative.any.worker.html]
-  expected: ERROR
+  [initialize anyfunc table with a bad default value]
+    expected: FAIL
+
+  [initialize externref table with default value]
+    expected: FAIL
+
+  [initialize anyfunc table with default value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
index 98f99a32f81..dd417d75980 100644
--- a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
@@ -1,5 +1,10 @@
 [set-reftypes.tentative.any.worker.html]
-  expected: ERROR
+  [Arguments for externref table set]
+    expected: FAIL
+
+  [Arguments for anyfunc table set]
+    expected: FAIL
+
 
 [set-reftypes.tentative.any.html]
   [Arguments for externref table set]
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 4a3f76d392d..b6a4e2ff0d0 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -563,3 +563,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t2.8580460955235994e+33\t9.3139332532882690e-1\t2.8580460955235994e+33\t3.0685705145187411e+33\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.8580460955235994e+33 at index of 28696.\n\tMax RelError of 3.0685705145187411e+33 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (43.9840572017468 dB) is not greater than or equal to 65.737. Got 43.9840572017468.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[25222\]\t8.3282489238748033e-20\t-8.0183947086334229e-1\t8.0183947086334229e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[25223\]\t-3.5574635863304138e-1\t-8.3769923448562622e-1\t4.8195287585258484e-1\t5.7532925423826975e-1\t3.8985999999999999e-3\n\tMax AbsError of 8.0183947086334229e-1 at index of 25222.\n\tMax RelError of 1.0000000000000000e+0 at index of 25222.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
index dd49aa8e457..c2c57aec558 100644
--- a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
@@ -1,5 +1,4 @@
 [003.html]
-  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index a7c8b42317c..8d57fd67807 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -129763,12 +129763,12 @@
       ]
      ],
      "lab-001.html": [
-      "f507f86c79c45181d16714893db5f6c97c079086",
+      "177cf96ef1dfede4a1194d72182d97191e866cb2",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129776,12 +129776,12 @@
       ]
      ],
      "lab-002.html": [
-      "bcf04e36835b491b494af36b2ae6bf9d593d29f1",
+      "e30696995dbc2a582ae17b83ff216cc1c66d726d",
       [
        null,
        [
         [
-         "/css/css-color/blacktext-ref.html",
+         "/css/css-color/blacksquare-ref.html",
          "=="
         ]
        ],
@@ -129789,12 +129789,12 @@
       ]
      ],
      "lab-003.html": [
-      "ddf2d1780ec639e495e66feb6e576a9ba20ccedc",
+      "9308e16456cd5746ddd60c23066dff4c94dad7d8",
       [
        null,
        [
         [
-         "/css/css-color/whitetext-ref.html",
+         "/css/css-color/whitesquare-ref.html",
          "=="
         ]
        ],
@@ -129802,7 +129802,7 @@
       ]
      ],
      "lab-004.html": [
-      "056835ac477cdb8dda3637125a14561949dcca73",
+      "b2ebfc187a7a3bd30acfccf4609442fd5693af69",
       [
        null,
        [
@@ -129815,7 +129815,7 @@
       ]
      ],
      "lab-005.html": [
-      "8149771fb64049e7b27d9c67b7f6e79853eff12f",
+      "69285d583252a65de89e4078de511da0b6504d24",
       [
        null,
        [
@@ -129828,7 +129828,7 @@
       ]
      ],
      "lab-006.html": [
-      "0f175ab5ec73d95c2ca2470516c888dd2238554f",
+      "55d6351ddb6aca74c93368b1d7a0a026ae0df668",
       [
        null,
        [
@@ -129841,7 +129841,7 @@
       ]
      ],
      "lab-007.html": [
-      "a99cebd2572c02288cb25b1440ee5f71413aa803",
+      "89edbb75496a9056cb7250eb1ac31f6914ec21fb",
       [
        null,
        [
@@ -129854,12 +129854,12 @@
       ]
      ],
      "lch-001.html": [
-      "6bc0c5f7da6054d2f1a4d6662410210e8a6dea7f",
+      "904e2e5bd7c75dade264e22aa3a145ad56625d67",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129867,12 +129867,12 @@
       ]
      ],
      "lch-002.html": [
-      "52a546290719dae3bc4af371f0e6ea100a1dc9a0",
+      "7eec1a14ac6bfa9d23f8c55869e317e1689f1759",
       [
        null,
        [
         [
-         "/css/css-color/blacktext-ref.html",
+         "/css/css-color/blacksquare-ref.html",
          "=="
         ]
        ],
@@ -129880,12 +129880,12 @@
       ]
      ],
      "lch-003.html": [
-      "7539e9d583f15e3a39abf3dcd773d3ceb8fe1ce0",
+      "f323d4978c94730c4a098bd5ae23dfce146fd2b6",
       [
        null,
        [
         [
-         "/css/css-color/whitetext-ref.html",
+         "/css/css-color/whitesquare-ref.html",
          "=="
         ]
        ],
@@ -129893,12 +129893,12 @@
       ]
      ],
      "lch-004.html": [
-      "67d71a8ba3673fb004c059e666f9c8dadecfe992",
+      "30eac4542286b7af9cee2a2d3cb7b4b1081cbbec",
       [
        null,
        [
         [
-         "/css/css-color/lab-004-ref.html",
+         "/css/css-color/lch-004-ref.html",
          "=="
         ]
        ],
@@ -129906,12 +129906,12 @@
       ]
      ],
      "lch-005.html": [
-      "571f7aaab7b20387b433b699fbe6bd288c6bee10",
+      "ed32cb92cb402c6875c9ab95d7d6b523cd63f833",
       [
        null,
        [
         [
-         "/css/css-color/lab-005-ref.html",
+         "/css/css-color/lch-005-ref.html",
          "=="
         ]
        ],
@@ -129919,12 +129919,12 @@
       ]
      ],
      "lch-006.html": [
-      "ea490937c57d7590cef519e1b7f9084e038a9861",
+      "457e88d405d8f840e4b238dfa39b2a80676481f6",
       [
        null,
        [
         [
-         "/css/css-color/lab-006-ref.html",
+         "/css/css-color/lch-006-ref.html",
          "=="
         ]
        ],
@@ -129932,12 +129932,12 @@
       ]
      ],
      "lch-007.html": [
-      "6d9a9740414494139ac8dd537a8d2d32ce61d06e",
+      "009347c1af72a295656b0f6a16e8fea94d789744",
       [
        null,
        [
         [
-         "/css/css-color/lab-007-ref.html",
+         "/css/css-color/lch-007-ref.html",
          "=="
         ]
        ],
@@ -129971,12 +129971,12 @@
       ]
      ],
      "predefined-001.html": [
-      "65cf808556b03e305431e4bf292b02a4a0295be3",
+      "ea8bd693f22dcb80323681da1eebcf936c6ceae5",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -129984,12 +129984,12 @@
       ]
      ],
      "predefined-002.html": [
-      "4e125f96b571e932843065411a456620223c883e",
+      "a6f9a1b013421582e0ac4b6a15166c5321316510",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -129997,12 +129997,12 @@
       ]
      ],
      "predefined-003.html": [
-      "1d014cb0483553d273c702985531c381bf1b6b01",
+      "cb05147f996563d2d35d22fa5ad70b8cab2da1ad",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130010,12 +130010,12 @@
       ]
      ],
      "predefined-004.html": [
-      "f1bf6ddea30fd7db0c92f6e644ec53b76c8843b7",
+      "6c4399dcf72d8c1ba5b8f47f29f7bc89f411e032",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130023,12 +130023,12 @@
       ]
      ],
      "predefined-005.html": [
-      "780b929d8565f33241a701ddb83a16687100c6b6",
+      "99b611c063eb878aadaa1adfa788fc506a52a46c",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130036,12 +130036,12 @@
       ]
      ],
      "predefined-006.html": [
-      "f53fb79a021358e9856b379c5c189201e20bfbd2",
+      "998865e13a7f732933063915a4efb06675a6e497",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130049,12 +130049,12 @@
       ]
      ],
      "predefined-007.html": [
-      "d67979318270449c331da4f76a73b9184e8c1372",
+      "c008fef5ca9df0baabf359872c4d81080f29e03c",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130062,12 +130062,12 @@
       ]
      ],
      "predefined-008.html": [
-      "57bbe3a51e790258bd968e54ff15975c5d8a66a3",
+      "00bbc6249dd0a72c9e274369d7bfe6a837bbfe76",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130075,12 +130075,12 @@
       ]
      ],
      "predefined-009.html": [
-      "e29305ec981eaf3cc050e761149823dd8edfe812",
+      "27d818e817ec255fcc8126caff035ede6025db14",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130088,12 +130088,12 @@
       ]
      ],
      "predefined-010.html": [
-      "a0eb9952e1e912f7a6878364f32ace1672d54ad2",
+      "391c001273832bd5c9e316c90a3542cf552a9cec",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130101,12 +130101,12 @@
       ]
      ],
      "predefined-011.html": [
-      "37a16f1b9f232a8925bc3c161d98780a0c0e0e0f",
+      "e79a7e46de861143efdefa859c8d5c96d119b7bb",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130114,12 +130114,12 @@
       ]
      ],
      "predefined-012.html": [
-      "a4ead24196971458cb5809a6aeb9849d1b04bb04",
+      "76a23ef292178bacb1cf6b757948a480091a479e",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130127,12 +130127,12 @@
       ]
      ],
      "predefined-013.html": [
-      "ed4a48f90b0882fa7426564d6d5a81c0dd31b355",
+      "c13a37a6e2b9049099f950561bd2ab60405f7d03",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130140,12 +130140,12 @@
       ]
      ],
      "predefined-014.html": [
-      "51f72650bd71e0531ac779cfb07a4368ee412cc1",
+      "76903b9aba915cbb0c58a563fa40530a7d00f7bf",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130153,12 +130153,12 @@
       ]
      ],
      "predefined-015.html": [
-      "27641397fa49f353b921a831a8a31be7eaaa8ae2",
+      "50ca436115192a92e1f76d3383f06c1b66cd22ee",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130166,12 +130166,12 @@
       ]
      ],
      "predefined-016.html": [
-      "7b7c653010c9fe691dc357bfcd7b74bfb0a0c98b",
+      "c8a666164a92a8e5d192da971bf65450fa86b0bc",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -130179,12 +130179,12 @@
       ]
      ],
      "predefined-017.html": [
-      "ee1ebb6711f347807d8f6372032f3cdcf5cd11ef",
+      "766fdfe0899b883c054b8f6100b6f222eae47fd2",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-ref.html",
+         "/css/css-color/greensquare-090-ref.html",
          "=="
         ]
        ],
@@ -169414,6 +169414,19 @@
        {}
       ]
      ],
+     "incremental-scroll.html": [
+      "be1a1cbb74c33394a2ab3afd0a14eb635818fc23",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/incremental-scroll-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "input-scrollable-region-001.html": [
       "96fedfed746e903f06c3f3fd5e13a47bc54466e5",
       [
@@ -169726,6 +169739,19 @@
        {}
       ]
      ],
+     "overflow-hidden-resize-with-stacking-context-child.html": [
+      "8569ac153329c96b5dd27f43fd549163380694e8",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflow-negative-margin-dynamic.html": [
       "5eec139521adec4a2c6a9687e2e18cd0fbdea181",
       [
@@ -172437,7 +172463,7 @@
       ]
      ],
      "position-relative-table-tfoot-top-absolute-child.html": [
-      "e23585af8539ebbdf09b456d1f3cfc9befbfe426",
+      "e98712b22bb62a14709ddcbd1b6ee5a8ba1a273d",
       [
        null,
        [
@@ -253882,6 +253908,19 @@
         {}
        ]
       ],
+      "will-change-in-foreign-object-paint-order.html": [
+       "b6f50cfa75ddcd44e1313d66474aad81509f7400",
+       [
+        null,
+        [
+         [
+          "/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "will-change-in-transformed-foreign-object.html": [
        "4b6e940b2f5f0b093208bd3d9a7ecd1f1776e736",
        [
@@ -255147,6 +255186,19 @@
         {}
        ]
       ],
+      "pattern-inheritance-template-pattern-removed.svg": [
+       "b80f81095ac0ab2275cf8d21696f92694757f2f1",
+       [
+        null,
+        [
+         [
+          "/svg/pservers/reftests/reference/green-100x100.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "radialgradient-basic-002.svg": [
        "04d8d3025ee0f039a05bdd439f2dc02c13f49a23",
        [
@@ -262598,7 +262650,7 @@
      []
     ],
     "accept-ch-cache-revalidation.https.html.headers": [
-     "d54a29a3f91fd40377dc0162b55f16022248d35e",
+     "6f01afb921bd98c7de89fc1f1054db49b7a12ed8",
      []
     ],
     "accept-ch-feature-policy-navigation.https.html.headers": [
@@ -262820,7 +262872,7 @@
      ]
     },
     "sec-ch-quotes.https.html.headers": [
-     "1e99ac7203b350ea80c24f4737ede4363fa8efeb",
+     "7ce8173856179f3758adf4a671582e2fa28a9880",
      []
     ],
     "service-workers": {
@@ -303460,6 +303512,10 @@
       "a0e70aa6539e88373bc8615c3f4e1453010e85d5",
       []
      ],
+     "blacksquare-ref.html": [
+      "14bc74b33fa848b6f3056adf24fa9645483e7e2e",
+      []
+     ],
      "blacktext-ref.html": [
       "ddfa9100cbef6094375df8b40eeb9673e690d4f7",
       []
@@ -303472,6 +303528,10 @@
       "73b420189ec8bc073e8b6a2e4bfd628653bd4a78",
       []
      ],
+     "greensquare-090-ref.html": [
+      "18bdcf55c47a0710011c58ff1613daba080ed129",
+      []
+     ],
      "greensquare-ref.html": [
       "35a31f8f56468e5c273e2a9efd3ab614c6adc977",
       []
@@ -303489,19 +303549,35 @@
       []
      ],
      "lab-004-ref.html": [
-      "1919ab4e4f6e29bcdfd3d5730705d7f13299742a",
+      "d7c83b0766fee7bf62156254ee824ed4864cf2a5",
       []
      ],
      "lab-005-ref.html": [
-      "207973e38ebc4269f669bb20760f3da73998227d",
+      "7c6fd236d428e88df6cd91fe44f943a8dcc2bd9f",
       []
      ],
      "lab-006-ref.html": [
-      "8747c97bbfb235a8e993b15cce7a31df3dc50ee3",
+      "1525205772eb17d8a43ef1cc7891b0bc29d8050f",
       []
      ],
      "lab-007-ref.html": [
-      "00bdb09d4f6e6f04c012535e08066bff788e5d23",
+      "9d0bc0c6c765b45b54b76bfeeb2e8e9720f9540d",
+      []
+     ],
+     "lch-004-ref.html": [
+      "2bc1e8285720e69646f1f17fd2c1fd7a0c4d76fd",
+      []
+     ],
+     "lch-005-ref.html": [
+      "3636541afde40b85dee9132f537518aa09bfe24c",
+      []
+     ],
+     "lch-006-ref.html": [
+      "bfe6d8dbf71b04e6fbaa49a4996fc3eb4949c6d2",
+      []
+     ],
+     "lch-007-ref.html": [
+      "95a260e8f2f4ae9085a33734c28a7d16da73fa82",
       []
      ],
      "opacity-overlapping-letters-ref.html": [
@@ -303724,6 +303800,10 @@
       "85a391d5a2cdaf43b62819f20d9879ed1dead584",
       []
      ],
+     "whitesquare-ref.html": [
+      "ea7103759ba65a30434c7f996e9957c5519b11fd",
+      []
+     ],
      "whitetext-ref.html": [
       "0237a810eb9df12c418cffa5eb39563e4cd3f555",
       []
@@ -317516,6 +317596,10 @@
       "09081e25039a2a07c6dd798fc68ff7b8a07bc333",
       []
      ],
+     "incremental-scroll-ref.html": [
+      "131e54ec2913621bd0cd6e3adf8e22e03b129d8a",
+      []
+     ],
      "overflow-body-propagation-007-ref.html": [
       "66f9b1c3b0098c0cc448775cde0d94b4325a94a8",
       []
@@ -318762,7 +318846,7 @@
        []
       ],
       "selection-input-011-ref.html": [
-       "b49b0b00fa2a8b4f802a95d1309cc26c7fde8935",
+       "ce9f129e119f12757371885a6748d6d81e976cf3",
        []
       ],
       "selection-intercharacter-011-ref.html": [
@@ -318782,7 +318866,7 @@
        []
       ],
       "selection-textarea-011-ref.html": [
-       "5c78176d606c8e5619b068f03611f8e0894ab138",
+       "34b9913cf3c5dc3ab4276020f1de7e03fc4ae788",
        []
       ]
      },
@@ -334343,7 +334427,7 @@
       []
      ],
      "testharness-api.md": [
-      "fb0af83c9a92409207e380dd17717f8a026f2d95",
+      "a91c0511ee9fc4fca8becdbcb972c8bdbc663ab2",
       []
      ],
      "testharness-tutorial.md": [
@@ -334887,7 +334971,7 @@
       []
      ],
      "Document-createEvent.js": [
-      "9e614ab16b85e2634692a79202abeb65a11a0b7d",
+      "57e8e966f838ab4e023466ee43ab891945164e8a",
       []
      ],
      "Document-createProcessingInstruction.js": [
@@ -338147,15 +338231,15 @@
     ],
     "resources": {
      "test-expectations.js": [
-      "7e540ed18701c87adf013c5381df6252535417b3",
+      "cc9b4ca3d121413ca4fa4bae5f255ff1e6dbe68e",
       []
      ],
      "window-tests-blob.js": [
-      "0d6db5399118372da9ca783eeb2551e435ea85d7",
+      "e21733ce7f1afc8410899d1b5e58d56ec642c43c",
       []
      ],
      "window-tests-enumeration.js": [
-      "29bb581bd3dacf465966601466c6923025ba3145",
+      "838e5c34346286545fe7aa5cd7faf8bcb2310fe8",
       []
      ]
     }
@@ -339278,6 +339362,14 @@
         "c.html": [
          "db494e878e2a6034955d5853cf6f53119a8740a7",
          []
+        ],
+        "unset_context_name-1.sub.html": [
+         "97918a1f9925a763a91da86908de1638e11d5bc6",
+         []
+        ],
+        "unset_context_name_stash.py": [
+         "411a4587bcedd43b65db9b5403867266c1011af4",
+         []
         ]
        },
        "support": {
@@ -339297,11 +339389,7 @@
          "460db2e9792619c7f6db07cb7e4f9dee0f17c117",
          []
         ]
-       },
-       "unset_context_name.html": [
-        "6814ed50e2f5ecb7b4fc46d47d6feedb87eb466e",
-        []
-       ]
+       }
       },
       "navigating-across-documents": {
        "001-1.html": [
@@ -352224,7 +352312,7 @@
          []
         ],
         "multiTouchPointsReleaseSecondPoint.html.ini": [
-         "58988a75d414f2f86ec0249304bba91f6d3f25da",
+         "c4f524f627e7f553ea25995a9a9778502e6263bd",
          []
         ],
         "multiTouchPointsTwoTouchStarts.html.ini": [
@@ -352712,7 +352800,7 @@
      []
     ],
     "html.idl": [
-     "5b30344ab7db4d3374c07a02a7b9453d18cccdf9",
+     "bb44c1327471ec25b7fefac25758335ea0ae7c51",
      []
     ],
     "idle-detection.tentative.idl": [
@@ -352964,7 +353052,7 @@
      []
     ],
     "selection-api.idl": [
-     "b6626292183422e7961f53e757e062448ae3df72",
+     "d8f8e7828720cc8e39587eefc449c09d84829a23",
      []
     ],
     "serial.idl": [
@@ -358895,7 +358983,7 @@
       []
      ],
      "conftest.py": [
-      "1baf6622b0599c44fb85d267288031a05e4243dc",
+      "de0d29794d9f7e1c6e206852a51149ada98974b3",
       []
      ],
      "harness.html": [
@@ -358957,11 +359045,11 @@
         []
        ],
        "api-tests-1.html": [
-        "237b4ea876e589cb6e231872dc816d7171e47c3e",
+        "41a765f55745c0b8c7f4891aa2b34c5860a72565",
         []
        ],
        "api-tests-2.html": [
-        "08a2b893c244dae40518749ac4b6bdccaa284a03",
+        "ba7a08f48fd7ac86c9387e03bf3df881550577aa",
         []
        ],
        "api-tests-3.html": [
@@ -359293,7 +359381,7 @@
       }
      },
      "tox.ini": [
-      "266a6e8952e04d901206483614bda9097933bb8e",
+      "fc26aa6cc0efb67437314fbfa6fd012006fbb09c",
       []
      ],
      "variants.js": [
@@ -359342,7 +359430,7 @@
      []
     ],
     "testharness.js": [
-     "f7fe7531710d235976d036e4b022f21d53b286b1",
+     "e2e364102e43891001e2e97a3f4bd11871fc6bb3",
      []
     ],
     "testharness.js.headers": [
@@ -362763,6 +362851,10 @@
        "28e7e310c07b4443693cc6150b5690b16b95d829",
        []
       ],
+      "will-change-in-foreign-object-paint-order-ref.html": [
+       "684de0cf0cbb59fdbe488573b19d9b55974ce93a",
+       []
+      ],
       "will-change-in-transformed-foreign-object-ref.html": [
        "1e66eb99094556ebd7da056ce5d5e68733b7848d",
        []
@@ -364324,7 +364416,7 @@
      []
     ],
     "requirements_mypy.txt": [
-     "d5e04b94d534cbb6491aa0a04950c56434725ff2",
+     "5df717758aaabeb2b871b91d9bfd50952cfc6667",
      []
     ],
     "runner": {
@@ -364417,7 +364509,7 @@
       []
      ],
      "serve.py": [
-      "0a5f16ef57e4740138f14f2e5c1a5fb797af915a",
+      "f09fe2422377b7ad248fa824a131130f9f58c194",
       []
      ],
      "test_functional.py": [
@@ -371833,7 +371925,7 @@
         []
        ],
        "firefox.py": [
-        "b8f1c7d8286fdef935ce8dbf3e2ed513f202d04f",
+        "e4841bb57935acf11cb0da1e3020ccc25703d2e0",
         []
        ],
        "firefox_android.py": [
@@ -397187,55 +397279,10 @@
       }
      ]
     ],
-    "compression-with-detach.tentative.any.js": [
+    "compression-with-detach.tentative.window.js": [
      "786bba21c800ca9f067a6d033f0345a52bfbb218",
      [
-      "compression/compression-with-detach.tentative.any.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/compression-with-detach.tentative.any.serviceworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/compression-with-detach.tentative.any.sharedworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/compression-with-detach.tentative.any.worker.html",
+      "compression/compression-with-detach.tentative.window.html",
       {
        "script_metadata": [
         [
@@ -397610,55 +397657,10 @@
       }
      ]
     ],
-    "decompression-with-detach.tentative.any.js": [
+    "decompression-with-detach.tentative.window.js": [
      "a2f8bda09148f0d323022b1f93be78d83c4aa654",
      [
-      "compression/decompression-with-detach.tentative.any.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/decompression-with-detach.tentative.any.serviceworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/decompression-with-detach.tentative.any.sharedworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "resources/concatenate-stream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "compression/decompression-with-detach.tentative.any.worker.html",
+      "compression/decompression-with-detach.tentative.window.html",
       {
        "script_metadata": [
         [
@@ -417976,6 +417978,13 @@
     },
     "css-sizing": {
      "animation": {
+      "aspect-ratio-interpolation.html": [
+       "3c9afe06fa69893daee2e1877cd6cf75ad32ae81",
+       [
+        null,
+        {}
+       ]
+      ],
       "height-composition.html": [
        "094e247dcf22d9bd665b244993b6239265ee73bb",
        [
@@ -431008,14 +431017,14 @@
     "state": {
      "tentative": {
       "ElementInternals-states.html": [
-       "7290a84d410dd7874124fa54e603d485b69ef9da",
+       "22c95a75bdf9d5d0ab65783502f2c6526ee8f9c4",
        [
         null,
         {}
        ]
       ],
       "state-pseudo-class.html": [
-       "966dd1c9a79a9f1f2ae910d58afa1f8efa2e1044",
+       "3e3806a042d8364a6cf9fbf7c26e0afc3945ea75",
        [
         null,
         {}
@@ -431655,7 +431664,7 @@
       ]
      ],
      "Event-dispatch-click.html": [
-      "bbc408df88256668e7f4cacc0837065c3c7d1c16",
+      "a92bde13d2475fe3b78c67489606f8afe9aee1f1",
       [
        null,
        {}
@@ -432722,7 +432731,7 @@
       ]
      ],
      "Document-createEvent.https.html": [
-      "b4fb8cd0a31382d2f6d235b500ed8c667012b9e1",
+      "8e948a37e68630efd955398cdaca89571b042c73",
       [
        null,
        {}
@@ -458920,7 +458929,7 @@
      ]
     ],
     "font_access-chooser-multiple.tentative.manual.https.html": [
-     "a6b0febc8baf4197b45321d9069f2bc5c8ec816f",
+     "bf70a0a7192a6d7b49d40a653110ccf2d75f0b7e",
      [
       null,
       {
@@ -458929,7 +458938,7 @@
      ]
     ],
     "font_access-chooser-selection.tentative.manual.https.html": [
-     "73d0e7938efad2b8cb462e67612f9e5505af3693",
+     "e8a1e8d91b21eed5b074f860cedd5f768cec3d8e",
      [
       null,
       {
@@ -458938,7 +458947,7 @@
      ]
     ],
     "font_access-chooser.tentative.manual.https.html": [
-     "8f623daa0b86c1af6141fee0cf8a8783559f2b16",
+     "499d8be4a1fcc15367ba5c07e21dd695d17c51f8",
      [
       null,
       {
@@ -459861,11 +459870,13 @@
          {}
         ]
        ],
-       "unset_context_name-1.html": [
-        "d3d67d0f82681118b4e0f5492115f0988f7ca07a",
+       "unset_context_name.html": [
+        "285f6d7428144e87c22bd4342cfce4ab1c6aa448",
         [
          null,
-         {}
+         {
+          "timeout": "long"
+         }
         ]
        ],
        "window-name-after-cross-origin-aux-frame-navigation.sub.html": [
@@ -462030,7 +462041,7 @@
        ]
       ],
       "sandbox-inherited-from-required-csp.html": [
-       "d1bc4d1e04d01177943b91893156d715ec2ed15a",
+       "04f485cc663af203c83e75a23a28c46c5034a9ce",
        [
         null,
         {}
@@ -484230,7 +484241,7 @@
         ]
        ],
        "canvas-aspect-ratio.html": [
-        "ab36eeede733f094d2e6340ddf6ce4d82d7a24d6",
+        "f523fd7219b204f1a7ac91805c206563d354e3ba",
         [
          null,
          {}
@@ -491415,6 +491426,22 @@
         ]
        ]
       },
+      "the-popup-element": {
+       "popup-element-basic.tentative.html": [
+        "41fa7d4e7f1adefc790e2e39b3b1e1a450499516",
+        [
+         null,
+         {}
+        ]
+       ],
+       "popup-open.tentative.html": [
+        "d622b7d10538625d9db3858a933d7740e323986f",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "the-summary-element": {
        "activation-behavior.html": [
         "4a3693bd2dafe710b82054bfadd8bcaa97b16db5",
@@ -511535,7 +511562,7 @@
      ]
     ],
     "payment-request-constructor-thcrash.https.html": [
-     "9763615bdd186d0a8a656af8a89bfdf8bbfac186",
+     "80ee1606852a9ceb457ff0cf8cb0bce584bf82e2",
      [
       null,
       {
@@ -542097,7 +542124,7 @@
    },
    "touch-events": {
     "historical.html": [
-     "a6bd80e2bf541e7f19dcfe05bc2dad5fecb5ba9d",
+     "16ddf519037ca52272280d1768eed33f349d82d4",
      [
       null,
       {}
@@ -545708,7 +545735,7 @@
      ]
     ],
     "mark.any.js": [
-     "781bbcbfca6cc042b7ef4d493f46215cf7a0d7df",
+     "7e814d2074ca8bb9015bea02b741ce9875decec2",
      [
       "user-timing/mark.any.html",
       {}
@@ -547775,7 +547802,7 @@
      ],
      "table": {
       "constructor-reftypes.tentative.any.js": [
-       "35db2c73599b945b6b8843f3747f2d4212ced0f0",
+       "9bac1409f5a2897a869138bb188f8c5dda8aef89",
        [
         null,
         {
@@ -547789,10 +547816,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -547812,10 +547835,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -547835,10 +547854,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -548190,7 +548205,7 @@
        ]
       ],
       "set-reftypes.tentative.any.js": [
-       "83b36a32415cf0981514617f1e67acee625c6c4b",
+       "e9488d0d4fab68c9f80967536ff75bf7bde14b5a",
        [
         null,
         {
@@ -548204,10 +548219,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -548227,10 +548238,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -548250,10 +548257,6 @@
            "script",
            "assertions.js"
           ],
-          [
-           "script",
-           "/wasm/jsapi/wasm-constants.js"
-          ],
           [
            "script",
            "/wasm/jsapi/wasm-module-builder.js"
@@ -561411,7 +561414,7 @@
       ]
      ],
      "idlharness.https.window.js": [
-      "ca20f4253898937c61aac108d9caeef1d39e2831",
+      "7fadbdbc2b4ff9810861e90683741bd3ea985b0b",
       [
        "webxr/dom-overlay/idlharness.https.window.html",
        {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini b/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini
index 36bbe637384..ad694b733cb 100644
--- a/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini
+++ b/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini
@@ -8,3 +8,12 @@
   [DOMTokenList behavior of ElementInternals.states: Modifications]
     expected: FAIL
 
+  [CustomStateSet behavior of ElementInternals.states: Exceptions]
+    expected: FAIL
+
+  [CustomStateSet behavior of ElementInternals.states: Initial state]
+    expected: FAIL
+
+  [CustomStateSet behavior of ElementInternals.states: Modifications]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
index 0d0d0f8f150..cc9c946c4f0 100644
--- a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
@@ -1,8 +1,21 @@
 [Event-dispatch-click.html]
   type: testharness
+  expected: TIMEOUT
   [event state during post-click handling]
     expected: FAIL
 
   [submit button should not activate if the event listener disables it]
     expected: FAIL
 
+  [disabling radio in onclick listener shouldn't suppress onchange]
+    expected: TIMEOUT
+
+  [disabling checkbox in onclick listener shouldn't suppress oninput]
+    expected: TIMEOUT
+
+  [disabling radio in onclick listener shouldn't suppress oninput]
+    expected: TIMEOUT
+
+  [disabling checkbox in onclick listener shouldn't suppress onchange]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/dom/nodes/Document-createEvent.https.html.ini b/tests/wpt/metadata/dom/nodes/Document-createEvent.https.html.ini
index 27e4386c2d2..a1b43443101 100644
--- a/tests/wpt/metadata/dom/nodes/Document-createEvent.https.html.ini
+++ b/tests/wpt/metadata/dom/nodes/Document-createEvent.https.html.ini
@@ -53,3 +53,6 @@
   [DeviceMotionEvent should be an alias for DeviceMotionEvent.]
     expected: FAIL
 
+  [Should throw NOT_SUPPORTED_ERR for non-legacy event interface "TouchEvent"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 64520b5ad94..acbf73e09be 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -321,12 +321,15 @@
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini
new file mode 100644
index 00000000000..1fdc37f08bc
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/unset_context_name.html.ini
@@ -0,0 +1,4 @@
+[unset_context_name.html]
+  [Window.name is reset after navigating to a different origin]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 1b855cfef21..2035b892030 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,19 +1,10 @@
 [select-event.html]
-  [input type search: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -26,33 +17,15 @@
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -65,12 +38,39 @@
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini
new file mode 100644
index 00000000000..18ff1b7eca3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html.ini
@@ -0,0 +1,7 @@
+[popup-element-basic.tentative.html]
+  [popup element exists]
+    expected: FAIL
+
+  [popup element basic show/hide behavior]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini
new file mode 100644
index 00000000000..a6c854723ee
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html.ini
@@ -0,0 +1,7 @@
+[popup-open.tentative.html]
+  [On setting, the content open attribute must be removed if the IDL open attribute is set to false, and must be present if the IDL open attribute is set to true.]
+    expected: FAIL
+
+  [The IDL open attribute must return true if the content open attribute is set, and false if it is absent.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..edae5e5adcd 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -5,5 +5,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/touch-events/historical.html.ini b/tests/wpt/metadata/touch-events/historical.html.ini
index 6c6f450a153..d38805c7efb 100644
--- a/tests/wpt/metadata/touch-events/historical.html.ini
+++ b/tests/wpt/metadata/touch-events/historical.html.ini
@@ -13,3 +13,7 @@
 
   [TouchList::identifiedTouch]
     expected: FAIL
+
+  [TouchEvent::initTouchEvent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
index 8d1eab1b44d..3935496d6ef 100644
--- a/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
+++ b/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
@@ -10,4 +10,12 @@
 
 
 [constructor-reftypes.tentative.any.worker.html]
-  expected: ERROR
+  [initialize anyfunc table with a bad default value]
+    expected: FAIL
+
+  [initialize externref table with default value]
+    expected: FAIL
+
+  [initialize anyfunc table with default value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
index 98f99a32f81..dd417d75980 100644
--- a/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
+++ b/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
@@ -1,5 +1,10 @@
 [set-reftypes.tentative.any.worker.html]
-  expected: ERROR
+  [Arguments for externref table set]
+    expected: FAIL
+
+  [Arguments for anyfunc table set]
+    expected: FAIL
+
 
 [set-reftypes.tentative.any.html]
   [Arguments for externref table set]
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 539ecee17de..f9c3a35e4ea 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -791,3 +791,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t2.8580460955235994e+33\t9.3139332532882690e-1\t2.8580460955235994e+33\t3.0685705145187411e+33\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.8580460955235994e+33 at index of 28696.\n\tMax RelError of 3.0685705145187411e+33 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (43.9840572017468 dB) is not greater than or equal to 65.737. Got 43.9840572017468.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[25222\]\t8.3282489238748033e-20\t-8.0183947086334229e-1\t8.0183947086334229e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[25223\]\t-3.5574635863304138e-1\t-8.3769923448562622e-1\t4.8195287585258484e-1\t5.7532925423826975e-1\t3.8985999999999999e-3\n\tMax AbsError of 8.0183947086334229e-1 at index of 25222.\n\tMax RelError of 1.0000000000000000e+0 at index of 25222.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index 49f489d2a1c..d6e39444229 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,6 +1,5 @@
 [003.html]
   type: testharness
-  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/sequence-hole.html.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/sequence-hole.html.ini
index 9c8ef1f49af..9c4525b4bd5 100644
--- a/tests/wpt/mozilla/meta-layout-2020/mozilla/sequence-hole.html.ini
+++ b/tests/wpt/mozilla/meta-layout-2020/mozilla/sequence-hole.html.ini
@@ -2,6 +2,3 @@
   [Sequences with holes and a getter on the prototype are correctly handled]
     expected: FAIL
 
-  [Sequences with holes are correctly handled]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/sequence-hole.html.ini b/tests/wpt/mozilla/meta/mozilla/sequence-hole.html.ini
index e3da43f8d3b..b35a039b3f7 100644
--- a/tests/wpt/mozilla/meta/mozilla/sequence-hole.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/sequence-hole.html.ini
@@ -1,3 +1,6 @@
 [sequence-hole.html]
   type: testharness
   prefs: [dom.testbinding.enabled:true]
+  [Sequences with holes and a getter on the prototype are correctly handled]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers
index d54a29a3f91..6f01afb921b 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers
+++ b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers
@@ -1 +1 @@
-Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,ua-arch,ua-platform,ua-platform-version,ua-model
+Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,sec-ch-ua,sec-ch-ua-arch,sec-ch-ua-platform,sec-ch-ua-platform-version,sec-ch-ua-model
diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers b/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers
index 1e99ac7203b..7ce81738561 100644
--- a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers
+++ b/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers
@@ -1 +1 @@
-Accept-CH: ua,ua-arch,ua-platform,ua-platform-version,ua-model
+Accept-CH: sec-ch-ua,sec-ch-ua-arch,sec-ch-ua-platform,sec-ch-ua-platform-version,sec-ch-ua-model
diff --git a/tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.any.js b/tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.any.js
rename to tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.window.js
diff --git a/tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.any.js b/tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.any.js
rename to tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.window.js
diff --git a/tests/wpt/web-platform-tests/css/css-color/blacksquare-ref.html b/tests/wpt/web-platform-tests/css/css-color/blacksquare-ref.html
new file mode 100644
index 00000000000..14bc74b33fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/blacksquare-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Black square reference</title>
+<style>
+    .test { background-color: #000000; width: 12em; height: 12em; }
+</style>
+<body>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/greensquare-090-ref.html b/tests/wpt/web-platform-tests/css/css-color/greensquare-090-ref.html
new file mode 100644
index 00000000000..18bdcf55c47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/greensquare-090-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Green square #009900 reference</title>
+<style>
+    .test { background-color: #009900; width: 12em; height: 12em;}
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-001.html b/tests/wpt/web-platform-tests/css/css-color/lab-001.html
index f507f86c79c..177cf96ef1d 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-001.html
@@ -3,11 +3,13 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="lab() with no alpha">
 <style>
-    .test {color: lab(46.277% -47.562 48.583)} /* green (sRGB #008000) converted to Lab */
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lab(46.2775% -47.5621 48.5837); } /* green (sRGB #008000) converted to Lab */
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-002.html b/tests/wpt/web-platform-tests/css/css-color/lab-002.html
index bcf04e36835..e30696995db 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-002.html
@@ -3,12 +3,13 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="blacksquare-ref.html">
 <meta name="assert" content="lab() with no alpha">
 <style>
-    .test { color: red; }
-    .test { color: lab(0% 0 0)} /* black (sRGB #000000) converted to Lab */
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lab(0% 0 0); } /* black (sRGB #000000) converted to Lab */
 </style>
 <body>
-    <p class="test">Test passes if this text is black</p>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-003.html b/tests/wpt/web-platform-tests/css/css-color/lab-003.html
index ddf2d1780ec..9308e16456c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-003.html
@@ -3,12 +3,14 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="whitetext-ref.html">
+<link rel="match" href="whitesquare-ref.html">
 <meta name="assert" content="lab() with no alpha">
 <style>
-    .test { color: red; background-color: #333; padding: 3px;}
-    .test { color: lab(100% 0 0);} /* white (sRGB #FFFFFF) converted to Lab */
+    body { background-color: grey; }
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lab(100% 0 0); } /* white (sRGB #FFFFFF) converted to Lab */
 </style>
 <body>
-    <p class="test">Test passes if this text is white</p>
+    <p>Test passes if you see a white square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html
index 1919ab4e4f6..d7c83b0766f 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html
@@ -2,10 +2,9 @@
 <meta charset="utf-8">
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <style>
-    .match { color: rgb(75.62% 30.45% 47.56%)} /* lab(50 50 0) converted to sRGB */
+    .test { background-color: rgb(75.6208% 30.4487% 47.5634%); width: 12em; height: 12em; } /* lab(50% 50 0) converted to sRGB */
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004.html b/tests/wpt/web-platform-tests/css/css-color/lab-004.html
index 056835ac477..b2ebfc187a7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-004.html
@@ -6,12 +6,12 @@
 <link rel="match" href="lab-004-ref.html">
 <meta name="assert" content="lab() with no alpha, positive a axis">
 <style>
-    .test { color: red; }
-    .test { color: lab(50% 50 0)}
-    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lab(50 50 0) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(75.6208% 30.4487% 47.5634%); width: 12em; height: 6em; margin-bottom: 0; }/* lab(50% 50 0) converted to sRGB */
+    .test { background-color: lab(50% 50 0); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html
index 207973e38eb..7c6fd236d42 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html
@@ -2,10 +2,9 @@
 <meta charset="utf-8">
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <style>
-    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lab(70 -45 0) converted to sRGB */
+    .test { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 12em; } /* lab(70% -45 0) converted to sRGB */
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005.html b/tests/wpt/web-platform-tests/css/css-color/lab-005.html
index 8149771fb64..69285d58325 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-005.html
@@ -6,12 +6,12 @@
 <link rel="match" href="lab-005-ref.html">
 <meta name="assert" content="lab() with no alpha, negative a axis">
 <style>
-    .test { color: red; }
-    .test { color: lab(70% -45 0)}
-    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lab(70 -45 0) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 6em; margin-bottom: 0; } /* lab(70% -45 0) converted to sRGB */
+    .test { background-color: lab(70% -45 0); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html
index 8747c97bbfb..1525205772e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html
@@ -2,10 +2,9 @@
 <meta charset="utf-8">
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <style>
-    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lab(70 0 70) converted to sRGB */
+    .test { background-color: rgb(76.6254% 66.3607% 5.5775%); width: 12em; height: 12em; } /* lab(70% 0 70) converted to sRGB */
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006.html b/tests/wpt/web-platform-tests/css/css-color/lab-006.html
index 0f175ab5ec7..55d6351ddb6 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-006.html
@@ -6,12 +6,12 @@
 <link rel="match" href="lab-006-ref.html">
 <meta name="assert" content="lab() with no alpha, positive b axis">
 <style>
-    .test { color: red; }
-    .test { color: lab(70% 0 70)}
-    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lab(70 0 70) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(76.6254% 66.3607% 5.5775%); width: 12em; height: 6em; margin-bottom: 0; } /* lab(70% 0 70) converted to sRGB */
+    .test { background-color: lab(70% 0 70); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html
index 00bdb09d4f6..9d0bc0c6c76 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html
@@ -2,10 +2,9 @@
 <meta charset="utf-8">
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <style>
-    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lab(55 0 -60) converted to sRGB */
+    .test { background-color: rgb(12.8128% 53.105% 92.7645%); width: 12em; height: 12em; } /* lab(55% 0 -60) converted to sRGB */
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007.html b/tests/wpt/web-platform-tests/css/css-color/lab-007.html
index a99cebd2572..89edbb75496 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-007.html
@@ -6,12 +6,12 @@
 <link rel="match" href="lab-007-ref.html">
 <meta name="assert" content="lab() with no alpha, negative b axis">
 <style>
-    .test { color: red; }
-    .test { color: lab(55% 0 -60)}
-    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lab(55 0 -60) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(12.8128% 53.105% 92.7645%); width: 12em; height: 6em; margin-bottom: 0; } /* lab(55% 0 -60) converted to sRGB */
+    .test { background-color: lab(55% 0 -60); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-001.html b/tests/wpt/web-platform-tests/css/css-color/lch-001.html
index 6bc0c5f7da6..904e2e5bd7c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-001.html
@@ -3,11 +3,13 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="lch() with no alpha">
 <style>
-    .test {color: lch(46.277% 67.945 134.427)} /* green (sRGB #008000) converted to LCH */
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lch(46.2775% 67.9892 134.3912); } /* green (sRGB #008000) converted to LCH */
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-002.html b/tests/wpt/web-platform-tests/css/css-color/lch-002.html
index 52a54629071..7eec1a14ac6 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-002.html
@@ -3,12 +3,13 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="blacksquare-ref.html">
 <meta name="assert" content="lch() with no alpha">
 <style>
-    .test { color: red; }
-    .test { color: lch(0% 0 0)} /* black (sRGB #000000) converted to LCH */
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lch(0% 0 0); } /* black (sRGB #000000) converted to LCH */
 </style>
 <body>
-    <p class="test">Test passes if this text is black</p>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-003.html b/tests/wpt/web-platform-tests/css/css-color/lch-003.html
index 7539e9d583f..f323d4978c9 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-003.html
@@ -3,12 +3,14 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="whitetext-ref.html">
+<link rel="match" href="whitesquare-ref.html">
 <meta name="assert" content="lch() with no alpha">
 <style>
-    .test { color: red; background-color: #333; padding: 3px;}
-    .test { color: lch(100% 0 0);} /* white (sRGB #FFFFFF) converted to LCH */
+    body { background-color: grey; }
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lch(100% 0 0); } /* white (sRGB #FFFFFF) converted to LCH */
 </style>
 <body>
-    <p class="test">Test passes if this text is white</p>
+    <p>Test passes if you see a white square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/lch-004-ref.html
new file mode 100644
index 00000000000..2bc1e828572
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-004-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .test { background-color: rgb(75.6208% 30.4487% 47.5634%); width: 12em; height: 12em; } /* lch(50% 50 0) converted to sRGB (happens to be the same as lab(50% 50 0)) */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-004.html b/tests/wpt/web-platform-tests/css/css-color/lch-004.html
index 67d71a8ba36..30eac454228 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-004.html
@@ -3,15 +3,15 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="lab-004-ref.html">
-<meta name="assert" content="lch() with no alpha, positive a axis">
+<link rel="match" href="lch-004-ref.html">
+<meta name="assert" content="lch() with no alpha, positive a axis (when converted to Lab)">
 <style>
-    .test { color: red; }
-    .test { color: lch(50% 50 0)}
-    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lch(50 50 0) converted to sRGB (happens to be the same as lab(50 50 0)*/
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(75.6208% 30.4487% 47.5634%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(50% 50 0) converted to sRGB (happens to be the same as lab(50% 50 0)) */
+    .test { background-color: lch(50% 50 0); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-005-ref.html b/tests/wpt/web-platform-tests/css/css-color/lch-005-ref.html
new file mode 100644
index 00000000000..3636541afde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-005-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .test { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 12em; } /* lch(70% 45 180) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-005.html b/tests/wpt/web-platform-tests/css/css-color/lch-005.html
index 571f7aaab7b..ed32cb92cb4 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-005.html
@@ -3,15 +3,15 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="lab-005-ref.html">
-<meta name="assert" content="lch() with no alpha, negative a axis">
+<link rel="match" href="lch-005-ref.html">
+<meta name="assert" content="lch() with no alpha, negative a axis (when converted to Lab)">
 <style>
-    .test { color: red; }
-    .test { color: lch(70% 45 -180)}
-    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lch(70 45 180) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(70% 45 180) converted to sRGB */
+    .test { background-color: lch(70% 45 -180); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-006-ref.html b/tests/wpt/web-platform-tests/css/css-color/lch-006-ref.html
new file mode 100644
index 00000000000..bfe6d8dbf71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-006-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .test { background-color: rgb(76.6254% 66.3607% 5.5775%); width: 12em; height: 12em; } /* lch(70% 70 90) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-006.html b/tests/wpt/web-platform-tests/css/css-color/lch-006.html
index ea490937c57..457e88d405d 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-006.html
@@ -3,15 +3,15 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="lab-006-ref.html">
-<meta name="assert" content="lch() with no alpha, positive b axis">
+<link rel="match" href="lch-006-ref.html">
+<meta name="assert" content="lch() with no alpha, positive b axis (when converted to Lab)">
 <style>
-    .test { color: red; }
-    .test { color: lch(70% 70 90)}
-    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lch(70 70 90) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(76.6254% 66.3607% 5.5775%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(70% 70 90) converted to sRGB */
+    .test { background-color: lch(70% 70 90); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-007-ref.html b/tests/wpt/web-platform-tests/css/css-color/lch-007-ref.html
new file mode 100644
index 00000000000..95a260e8f2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-007-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .test { background-color: rgb(12.8128% 53.105% 92.7645%); width: 12em; height: 12em; } /* lch(55% 60 270) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-007.html b/tests/wpt/web-platform-tests/css/css-color/lch-007.html
index 6d9a9740414..009347c1af7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-007.html
@@ -3,15 +3,15 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="lab-007-ref.html">
-<meta name="assert" content="lab() with no alpha, negative b axis">
+<link rel="match" href="lch-007-ref.html">
+<meta name="assert" content="lch() with no alpha, negative b axis (when converted to Lab)">
 <style>
-    .test { color: red; }
-    .test { color: lch(56% 58 275)}
-    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lch(56 58 275) converted to sRGB */
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(12.8128% 53.105% 92.7645%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(55% 60 270) converted to sRGB */
+    .test { background-color: lch(55% 60 270); }
 </style>
 <body>
-    <p>Test passes if the two lines of filler text are the same color.</p>
-    <p class="test">Filler text. Filler text. Filler text. </p>
-    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-001.html b/tests/wpt/web-platform-tests/css/css-color/predefined-001.html
index 65cf808556b..ea8bd693f22 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-001.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, srgb, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit srgb value as decimal matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-002.html b/tests/wpt/web-platform-tests/css/css-color/predefined-002.html
index 4e125f96b57..a6f9a1b0134 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-002.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, srgb, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit srgb value as percent matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-003.html b/tests/wpt/web-platform-tests/css/css-color/predefined-003.html
index 1d014cb0483..cb05147f996 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-003.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, default srgb, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with default srgb value as decimal matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-004.html b/tests/wpt/web-platform-tests/css/css-color/predefined-004.html
index f1bf6ddea30..6c4399dcf72 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-004.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, default srgb, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with default srgb value as percent matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-005.html b/tests/wpt/web-platform-tests/css/css-color/predefined-005.html
index 780b929d856..99b611c063e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-005.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, display-p3, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit display-p3 value as decimal matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-006.html b/tests/wpt/web-platform-tests/css/css-color/predefined-006.html
index f53fb79a021..998865e13a7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-006.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, display-p3, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit display-p3 value as percent matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-007.html b/tests/wpt/web-platform-tests/css/css-color/predefined-007.html
index d6797931827..c008fef5ca9 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-007.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, a98-rgb, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit a98-rgb value as decimal matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-008.html b/tests/wpt/web-platform-tests/css/css-color/predefined-008.html
index 57bbe3a51e7..00bbc6249dd 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-008.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-008.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, a98-rgb, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit a98-rgb value as percent matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-009.html b/tests/wpt/web-platform-tests/css/css-color/predefined-009.html
index e29305ec981..27d818e817e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-009.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-009.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, prophoto-rgb, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit prophoto-rgb value as decimal matches sRGB #009900. Note that prophoto-rgb uses a D50 white so the chromatic adaptation step from Lab must be skipped.">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-010.html b/tests/wpt/web-platform-tests/css/css-color/predefined-010.html
index a0eb9952e1e..391c0012738 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-010.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-010.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, prophoto-rgb, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit prophoto-rgb value as percent matches sRGB #009900. Note that prophoto-rgb uses a D50 white so the chromatic adaptation step from Lab must be skipped.">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-011.html b/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
index 37a16f1b9f2..e79a7e46de8 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, rec2020, decimal values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit rec2020 value as decimal matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-012.html b/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
index a4ead241969..76a23ef2921 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, rec2020, percent values</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit rec2020 value as percent matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-013.html b/tests/wpt/web-platform-tests/css/css-color/predefined-013.html
index ed4a48f90b0..c13a37a6e2b 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-013.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-013.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, lab</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit lab value matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-014.html b/tests/wpt/web-platform-tests/css/css-color/predefined-014.html
index 51f72650bd7..76903b9aba9 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-014.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-014.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, fallback</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with invalid colorspace, fallback matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-015.html b/tests/wpt/web-platform-tests/css/css-color/predefined-015.html
index 27641397fa4..50ca4361151 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-015.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-015.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, fallback</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with colorspace which matches sRGB #009900, red fallback">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-016.html b/tests/wpt/web-platform-tests/css/css-color/predefined-016.html
index 7b7c653010c..c8a666164a9 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-016.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-016.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, lab</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit XYZ value matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-017.html b/tests/wpt/web-platform-tests/css/css-color/predefined-017.html
index ee1ebb6711f..766fdfe0899 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-017.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-017.html
@@ -3,7 +3,7 @@
 <title>CSS Color 4: predefined colorspaces, lab</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-ref.html">
+<link rel="match" href="greensquare-090-ref.html">
 <meta name="assert" content="Color function with explicit XYZ percentage value matches sRGB #009900">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
diff --git a/tests/wpt/web-platform-tests/css/css-color/whitesquare-ref.html b/tests/wpt/web-platform-tests/css/css-color/whitesquare-ref.html
new file mode 100644
index 00000000000..ea7103759ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/whitesquare-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>White square reference</title>
+<style>
+    body { background-color: grey; }
+    .test { background-color: #FFFFFF; width: 12em; height: 12em; }
+</style>
+<body>
+    <p>Test passes if you see a white square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll-ref.html
new file mode 100644
index 00000000000..131e54ec291
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<div id="target" style="background: white; overflow: scroll; width: 500px; height: 500px;
+                        font-size: 40px; will-change: transform">
+</div>
+<script>
+for (var i = 0; i < 500; i++) {
+  var div = document.createElement("div");
+  div.textContent = i;
+  target.appendChild(div);
+}
+target.scrollTop = 10000;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll.html b/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll.html
new file mode 100644
index 00000000000..be1a1cbb74c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scroll-container">
+<link rel="match" href="incremental-scroll-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<div id="target" style="background: white; overflow: scroll; width: 500px; height: 500px;
+                        font-size: 40px; will-change: transform">
+</div>
+<script>
+for (var i = 0; i < 500; i++) {
+  var div = document.createElement("div");
+  div.textContent = i;
+  target.appendChild(div);
+}
+
+function scroll() {
+  target.scrollTop += 500;
+  if (target.scrollTop < 10000) {
+    waitForAtLeastOneFrame().then(scroll);
+  } else if (window.testRunner) {
+    takeScreenshot();
+  }
+}
+
+waitForAtLeastOneFrame().then(scroll);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html
new file mode 100644
index 00000000000..8569ac15332
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>overflow:hidden changes size with stacking context child</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-hidden">
+<link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<script src="/common/rendering-utils.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<style>
+#container {
+  overflow: hidden;
+  width: 100px;
+  height: 20px;
+}
+#stacking-context {
+  position: relative;
+  background: red;
+  z-index: 100;
+}
+.content {
+  width: 100px;
+  height: 20px;
+  background: green;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div id="container">
+  <div id="stacking-context">
+    <div class="content"></div>
+    <div class="content"></div>
+    <div class="content"></div>
+    <div class="content"></div>
+    <div class="content"></div>
+  </div>
+</div>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  container.style.height = '100px';
+  takeScreenshot();
+});
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html b/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html
index e23585af853..e98712b22bb 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html
+++ b/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html
@@ -37,7 +37,7 @@ td > div {
 .relative {
   position: relative;
   top: 50px;
-  background-color: green;
+  background-color: white;
 }
 
 .absolute {
@@ -55,7 +55,7 @@ td > div {
         <tr><td><div></div></td></tr>
       </tbody>
       <tfoot class="relative">
-        <tr><td><div class="absolute"></div></td></tr>
+        <tr><td style="width:50px;height:50px"><div class="absolute"></div></td></tr>
       </tfoot>
     </table>
   </div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html
index b49b0b00fa2..ce9f129e119 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html
@@ -19,6 +19,36 @@
     }
   </style>
 
+  <script>
+  function startReference()
+  {
+    /*
+    Some browsers, like Chromium 80+ or Safari 14+, will
+    transfer focus to a selected element like a text input
+    and therefore style the border of such element according
+    to an user agent stylesheet rule, such as:
+    :focus {outline: -webkit-focus-ring-color auto 1px;} .
+    So, we deliberately trigger such focus with the focus()
+    method in the reference file.
+    */
+
+    document.getElementById("ref").focus();
+
+    /*
+    When a text input element is focused in Firefox
+    82+, then the caret becomes visible and blinking and
+    it is painted with the ::selected's color which is
+    the green color in this case. We therefore counter,
+    neutralize this by resetting the caret's color to the
+    background color.
+    */
+
+    document.getElementById("ref").style.caretColor = "yellow";
+  }
+  </script>
+
+  <body onload="startReference();">
+
   <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
 
-  <div><input type="text" value="Selected Text"></div>
+  <div><input id="ref" type="text" value="Selected Text"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html
index 5c78176d606..34b9913cf3c 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html
@@ -22,6 +22,37 @@
     }
   </style>
 
+  <script>
+  function startReference()
+  {
+    /*
+    Some browsers, like Chromium 80+ or Safari 14+, will
+    transfer focus to a selected element like a textarea
+    and therefore style the border of such element according
+    to an user agent stylesheet rule, such as:
+    :focus {outline: -webkit-focus-ring-color auto 1px;} .
+    So, we deliberately trigger such focus with the focus()
+    method in the reference file.
+    */
+
+    document.getElementById("ref").focus();
+
+    /*
+    When a textarea element is focused in Firefox
+    82+, then the caret becomes visible and blinking and
+    it is painted with the ::selected's color which is
+    the green color in this case. We therefore counter,
+    neutralize this by resetting the caret's color to the
+    background color.
+    */
+
+    document.getElementById("ref").style.caretColor = "yellow";
+
+  }
+  </script>
+
+  <body onload="startReference();">
+
   <p>Test passes if each glyph of both "Selected" is green with a yellow background and if there is <strong>no red</strong>.
 
-  <div><textarea rows="2" cols="8">Selected Selected </textarea></div>
+  <div><textarea id="ref" rows="2" cols="8">Selected Selected </textarea></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html b/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
new file mode 100644
index 00000000000..3c9afe06fa6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>aspect-ratio interpolation</title>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<meta name="assert" content="aspect-ratio supports animation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.target {
+  font-size: 16px;
+  background-color: black;
+  width: 10px;
+  aspect-ratio: 0.5;
+}
+</style>
+
+<body>
+  <template id="target-template">
+    <div class="container">
+      <div class="target"></div>
+    </div>
+  </template>
+</body>
+
+<script>
+test_interpolation({
+  property: 'aspect-ratio',
+  from: '0.5',
+  to: '2',
+}, [
+  {at: -0.5, expect: '0.25 / 1'},
+  {at: 0, expect: '0.5 / 1'},
+  {at: 0.5, expect: '1 / 1'},
+  {at: 1, expect: '2 / 1'},
+  {at: 1.5, expect: '4 / 1'}
+]);
+
+test_interpolation({
+  property: 'aspect-ratio',
+  from: '1 / 2',
+  to: '2 / 1',
+}, [
+  {at: -0.5, expect: '0.25 / 1'},
+  {at: 0, expect: '0.5 / 1'},
+  {at: 0.5, expect: '1 / 1'},
+  {at: 1, expect: '2 / 1'},
+  {at: 1.5, expect: '4 / 1'}
+]);
+
+// Test neutral keyframe
+test_interpolation({
+  property: 'aspect-ratio',
+  from: '',
+  to: '2 / 1',
+}, [
+  {at: -0.5, expect: '0.25 / 1'},
+  {at: 0, expect: '0.5 / 1'},
+  {at: 0.5, expect: '1 / 1'},
+  {at: 1, expect: '2 / 1'},
+  {at: 1.5, expect: '4 / 1'}
+]);
+
+test_interpolation({
+  property: 'aspect-ratio',
+  from: 'auto 1 / 2',
+  to: 'auto 2 / 1',
+}, [
+  {at: -0.5, expect: 'auto 0.25 / 1'},
+  {at: 0, expect: 'auto 0.5 / 1'},
+  {at: 0.5, expect: 'auto 1 / 1'},
+  {at: 1, expect: 'auto 2 / 1'},
+  {at: 1.5, expect: 'auto 4 / 1'}
+]);
+
+test_no_interpolation({
+  property: 'aspect-ratio',
+  from: 'auto',
+  to: '2 / 1',
+});
+
+test_no_interpolation({
+  property: 'aspect-ratio',
+  from: 'auto 1 / 1',
+  to: '2 / 1',
+});
+
+// If either number in the ratio is 0 or infinite, it represents a degenerate
+// ratio and will not be interpolated:
+// https://drafts.csswg.org/css-values-4/#combine-ratio
+test_no_interpolation({
+  property: 'aspect-ratio',
+  from: '1 / 0',
+  to: '1 / 1',
+});
+test_no_interpolation({
+  property: 'aspect-ratio',
+  from: '1 / 1',
+  to: '0 / 1',
+});
+
+test_composition({
+  property: 'aspect-ratio',
+  underlying: '0.5 / 1',
+  replaceFrom: '1 / 1',
+  addTo: '2 / 1',
+}, [
+  {at: 0, expect: '1 / 1'},
+  {at: 0.5, expect: '1 / 1'},
+  {at: 1, expect: '1 / 1'}
+]);
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html b/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html
index 7290a84d410..22c95a75bdf 100644
--- a/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html
+++ b/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html
@@ -17,49 +17,36 @@ customElements.define("test-element", TestElement);
 test(() => {
   let i = (new TestElement()).internals;
 
-  assert_true(i.states instanceof DOMTokenList);
-  assert_equals(i.states.length, 0);
-  assert_false(i.states.contains('foo'));
-  assert_equals(i.states.value, '');
-  assert_equals(i.states.toString(), '');
-}, 'DOMTokenList behavior of ElementInternals.states: Initial state');
+  assert_true(i.states instanceof CustomStateSet);
+  assert_equals(i.states.size, 0);
+  assert_false(i.states.has('foo'));
+  assert_false(i.states.has('--foo'));
+  assert_equals(i.states.toString(), '[object CustomStateSet]');
+}, 'CustomStateSet behavior of ElementInternals.states: Initial state');
 
 test(() => {
   let i = (new TestElement()).internals;
   assert_throws_js(TypeError, () => { i.states.supports('foo'); });
   assert_throws_dom('SyntaxError', () => { i.states.add(''); });
-  assert_throws_dom('InvalidCharacterError', () => { i.states.add('a\tb'); });
-}, 'DOMTokenList behavior of ElementInternals.states: Exceptions');
+  assert_throws_dom('SyntaxError', () => { i.states.add('--a\tb'); });
+}, 'CustomStateSet behavior of ElementInternals.states: Exceptions');
 
 test(() => {
   let i = (new TestElement()).internals;
-  i.states.add('foo', 'bar', 'foo');
-  assert_equals(i.states.length, 2);
-  assert_true(i.states.contains('foo'));
-  assert_true(i.states.contains('bar'));
-  assert_equals(i.states.item(0), 'foo');
-  assert_equals(i.states.item(1), 'bar');
-  assert_equals(i.states[0], 'foo');
-  assert_equals(i.states[1], 'bar');
-  assert_equals(i.states.value, 'foo bar');
-  i.states.remove('foo');
-  assert_array_equals(i.states, ['bar']);
-  assert_equals(i.states.value, 'bar');
-  i.states.toggle('foo');
-  assert_array_equals(i.states, ['bar', 'foo']);
-  assert_equals(i.states.value, 'bar foo');
-  i.states.replace('bar', 'baz');
-  assert_array_equals(i.states, ['baz', 'foo']);
-  assert_equals(i.states.value, 'baz foo');
-
-  i.states.value = '  c u s t o o o o  m';
-  assert_equals(i.states.length, 6);
-  assert_array_equals(i.states, ['c', 'u', 's', 't', 'o', 'm']);
-
-  i.states.value = '';
-  // No throw for a token which can't be a CSS <ident>.
-  i.states.add('foo)');
-  assert_array_equals(i.states, ['foo)']);
-}, 'DOMTokenList behavior of ElementInternals.states: Modifications');
+  i.states.add('--foo');
+  i.states.add('--bar');
+  i.states.add('--foo');
+  assert_equals(i.states.size, 2);
+  assert_true(i.states.has('--foo'));
+  assert_true(i.states.has('--bar'));
+  assert_array_equals([...i.states], ['--foo', '--bar']);
+  i.states.delete('--foo');
+  assert_array_equals([...i.states], ['--bar']);
+  i.states.add('--foo');
+  assert_array_equals([...i.states], ['--bar', '--foo']);
+  i.states.delete('--bar');
+  i.states.add('--baz');
+  assert_array_equals([...i.states], ['--foo', '--baz']);
+}, 'CustomStateSet behavior of ElementInternals.states: Modifications');
 </script>
 
diff --git a/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html b/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html
index 966dd1c9a79..3e3806a042d 100644
--- a/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html
+++ b/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html
@@ -94,7 +94,7 @@ test(() => {
   element.focus();
   let states = element.i.states;
 
-  states.value = '--foo';
+  states.add('--foo');
   assert_true(element.matches(':focus:--foo'));
   assert_true(element.matches(':--foo:focus'));
 }, ':--foo and other pseudo classes');
@@ -109,10 +109,11 @@ test(() => {
   innerStates.add('--innerFoo');
   assert_equals(getComputedStyle(inner).opacity, '0.5',
       '::part() followed by :--foo');
-  innerStates.replace('--innerFoo', '--innerfoo');
+  innerStates.delete('--innerFoo');
+  innerStates.add('--innerfoo');
   assert_equals(getComputedStyle(inner).opacity, '0',
       ':--foo matching should be case-sensitive');
-  innerStates.remove('--innerfoo');
+  innerStates.delete('--innerfoo');
 
   outer.i.states.add('--outerFoo');
   assert_equals(getComputedStyle(inner).opacity, '0.25',
@@ -124,7 +125,7 @@ test(() => {
   document.body.appendChild(outer);
 
   assert_equals(getComputedStyle(outer).borderStyle, 'solid');
-  outer.i.states.toggle('--dotted');
+  outer.i.states.add('--dotted');
   assert_equals(getComputedStyle(outer).borderStyle, 'dotted');
 }, ':--foo and :host()');
 </script>
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
index fb0af83c9a9..a91c0511ee9 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
@@ -652,8 +652,8 @@ the following methods:
 
   `add_result_callback(callback)` - callback called with a test argument
 
-  `add_completion_callback(callback)` - callback called with an array of tests
-                                        and a status object
+  `add_completion_callback(callback)` - callback called with an array of tests,
+                                        a status object, and an array of asserts
 
 Tests have the following properties:
 
@@ -673,6 +673,21 @@ Tests have the following properties:
  * `message` - An error message set when the status is `PRECONDITION_FAILED`
                or `ERROR`.
 
+  Asserts have the following properties:
+
+  * `test` - The test that caused the assert.
+
+  * `assert_name` - The name of the assert that ran e.g. `assert_equals`
+
+  * `args` - An array of string representations of arguments passed to the assert
+             function.
+
+  * `status` - An integer representing the assert status. This has the same values
+               as the status property on a test.
+
+For performance reasons asserts are only tracked when visual output is enabled.
+When it's disabled the array of asserts will be empty.
+
 ## External API ##
 
 In order to collect the results of multiple pages containing tests, the test
diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
index bbc408df882..a92bde13d24 100644
--- a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
+++ b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
@@ -289,6 +289,23 @@ test(t => {
   assert_false(input.checked);
 }, `disabled radio should get legacy-canceled-activation behavior 2`);
 
+for (const type of ["checkbox", "radio"]) {
+  for (const handler of ["oninput", "onchange"]) {
+    async_test(t => {
+      const input = document.createElement("input");
+      input.type = type;
+      input.onclick = t.step_func(ev => {
+        input.disabled = true;
+      });
+      input[handler] = t.step_func(ev => {
+        assert_equals(input.checked, true);
+        t.done();
+      });
+      input.click();
+    }, `disabling ${type} in onclick listener shouldn't suppress ${handler}`);
+  }
+}
+
 async_test(function(t) {
   var form = document.createElement("form")
   var didSubmit = false
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html b/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html
index b4fb8cd0a31..8e948a37e68 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html
@@ -134,6 +134,7 @@ var someNonCreateableEvents = [
   "SpeechSynthesisEvent",
   "SyncEvent",
   "TimeEvent",
+  "TouchEvent",
   "TrackEvent",
   "TransitionEvent",
   "WebGLContextEvent",
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js b/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js
index 9e614ab16b8..57e8e966f83 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js
+++ b/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js
@@ -17,7 +17,6 @@ var aliases = {
   "StorageEvent": "StorageEvent",
   "SVGEvents": "Event",
   "TextEvent": "CompositionEvent",
-  "TouchEvent": "TouchEvent",
   "UIEvent": "UIEvent",
   "UIEvents": "UIEvent",
 };
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-chooser-multiple.tentative.manual.https.html b/tests/wpt/web-platform-tests/font-access/font_access-chooser-multiple.tentative.manual.https.html
index a6b0febc8ba..bf70a0a7192 100644
--- a/tests/wpt/web-platform-tests/font-access/font_access-chooser-multiple.tentative.manual.https.html
+++ b/tests/wpt/web-platform-tests/font-access/font_access-chooser-multiple.tentative.manual.https.html
@@ -17,8 +17,8 @@
     await new Promise(resolve => step_timeout(resolve, 100));
 
     await window.test_driver.bless('show a font chooser.<br>Please select at least one font.');
-    const promise = navigator.fonts.showFontChooser()
-    promise_rejects_dom(t, 'SecurityError', navigator.fonts.showFontChooser());
+    const promise = navigator.fonts.query()
+    promise_rejects_dom(t, 'SecurityError', navigator.fonts.query());
     const fonts = await promise;
-  }, 'showFontChooser multiple choosers');
+  }, 'query() multiple choosers');
 </script>
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-chooser-selection.tentative.manual.https.html b/tests/wpt/web-platform-tests/font-access/font_access-chooser-selection.tentative.manual.https.html
index 73d0e7938ef..e8a1e8d91b2 100644
--- a/tests/wpt/web-platform-tests/font-access/font_access-chooser-selection.tentative.manual.https.html
+++ b/tests/wpt/web-platform-tests/font-access/font_access-chooser-selection.tentative.manual.https.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<title>Local Font Access: Chooser</title>
+<title>Local Font Access: Chooser, Selection Options</title>
 <meta charset=utf-8>
 
 <script src="/resources/testharness.js"></script>
@@ -21,24 +21,24 @@
       promise_test(async t => {
         await window.test_driver.bless('show a font chooser.<br />Please select all the fonts that shows up.');
         // Arial is considered to be web-safe.
-        const fonts = await navigator.fonts.showFontChooser({select: ['ArialMT']});
+        const fonts = await navigator.fonts.query({select: ['ArialMT']});
         assert_true(Array.isArray(fonts));
         assert_equals(fonts.length, 1);
 
         const postscriptName = fonts[0].postscriptName;
         assert_equals(typeof postscriptName, "string");
         assert_greater_than(postscriptName.length, 0);
-      }, 'showFontChooser with selection works');
+      }, 'query() with selection works');
 
       promise_test(async t => {
         await window.test_driver.bless('show a font chooser.<br />Please select all the fonts that shows up.');
-        const fonts = await navigator.fonts.showFontChooser({select: []});
+        const fonts = await navigator.fonts.query({select: []});
         assert_true(Array.isArray(fonts));
         assert_greater_than_equal(fonts.length, 1);
 
         const postscriptName = fonts[0].postscriptName;
         assert_equals(typeof postscriptName, "string");
         assert_greater_than(postscriptName.length, 0);
-      }, 'showFontChooser with empty selection bag works');
+      }, 'query() with empty selection bag works');
     })();
 </script>
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.manual.https.html b/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.manual.https.html
index 8f623daa0b8..499d8be4a1f 100644
--- a/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.manual.https.html
+++ b/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.manual.https.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<title>Local Font Access: Chooser</title>
 <meta charset=utf-8>
 
 <script src="/resources/testharness.js"></script>
@@ -16,13 +17,13 @@
     await new Promise(resolve => step_timeout(resolve, 100));
 
     await window.test_driver.bless('show a font chooser.<br />Please select at least one font.');
-    const fonts = await navigator.fonts.showFontChooser();
+    const fonts = await navigator.fonts.query();
     assert_true(Array.isArray(fonts));
     assert_greater_than_equal(fonts.length, 1);
 
     const postscriptName = fonts[0].postscriptName;
     assert_equals(typeof postscriptName, "string");
     assert_greater_than(postscriptName.length, 0);
-  }, 'showFontChooser works');
+  }, 'query() with chooser works');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
index 7e540ed1870..cc9b4ca3d12 100644
--- a/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
+++ b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
@@ -306,14 +306,14 @@ function getMoreExpectedTables(expectations) {
   return output;
 }
 
-async function filterEnumeration(iterator, expectedFonts) {
+async function filterEnumeration(fonts, expectedFonts) {
   const nameSet = new Set();
   for (const e of expectedFonts) {
     nameSet.add(e.postscriptName);
   }
 
   const output = [];
-  for await (const f of iterator) {
+  for (const f of fonts) {
     if (nameSet.has(f.postscriptName)) {
       output.push(f);
     }
@@ -492,6 +492,11 @@ async function simulateUserActivation() {
 
 function font_access_test(test_function, name, properties) {
   return promise_test(async (t) => {
+    if (!isPlatformSupported()) {
+      await promise_rejects_dom(
+          t, 'NotSupportedError', navigator.fonts.query());
+      return;
+    }
     await test_driver.set_permission({name: 'font-access'}, 'granted');
     await simulateUserActivation();
     await test_function(t, name, properties);
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
index 0d6db539911..e21733ce7f1 100644
--- a/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
@@ -1,19 +1,9 @@
 'use strict';
 
 font_access_test(async t => {
-  const iterator = navigator.fonts.query();
-
-  if (!isPlatformSupported()) {
-    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
-      for await (const f of iterator) {
-      }
-    })());
-    return;
-  }
-
-  const expectedFonts = await filterEnumeration(iterator,
-                                                getEnumerationTestSet({
-                                                  labelFilter: [TEST_SIZE_CATEGORY.small]}));
+  const fonts = await navigator.fonts.query({persistentAccess: true});
+  const expectedFonts = await filterEnumeration(
+      fonts, getEnumerationTestSet({labelFilter: [TEST_SIZE_CATEGORY.small]}));
   const additionalExpectedTables = getMoreExpectedTables(expectedFonts);
 
   for (const f of expectedFonts) {
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
index 29bb581bd3d..838e5c34346 100644
--- a/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
@@ -1,8 +1,6 @@
 'use strict';
 
 const standard_fonts_tests = [
-  null,
-  undefined,
   {},
   {select: []},
 ];
@@ -11,49 +9,22 @@ for (const test of standard_fonts_tests) {
   const inputAsString = JSON.stringify(test) ? JSON.stringify(test) : test;
 
   font_access_test(async t => {
-    if (!isPlatformSupported()) {
-      await promise_rejects_dom(
-          t, 'NotSupportedError', (async () => {
-            for await (const f of navigator.fonts.query()) {
-            }
-          })());
-      return;
-    }
+    const fonts =
+        await navigator.fonts.query({persistentAccess: true, ...test});
 
-    const iterator = navigator.fonts.query();
-
-    assert_equals(typeof iterator, 'object', 'query() should return an Object');
-    assert_true(
-        !!iterator[Symbol.asyncIterator],
-        'query() has an asyncIterator method');
-
-    const availableFonts = [];
-    for await (const f of iterator) {
-      availableFonts.push(f);
-    }
-
-    assert_fonts_exist(availableFonts, getEnumerationTestSet());
+    assert_fonts_exist(fonts, getEnumerationTestSet());
   }, `query(): standard fonts returned for input: ${inputAsString}`);
 }
 
 font_access_test(async t => {
-  const iterator = navigator.fonts.query();
-
-  if (!isPlatformSupported()) {
-    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
-                                for await (const f of iterator) {
-                                }
-                              })());
-    return;
-  }
-
+  const fonts = await navigator.fonts.query({persistentAccess: true});
   // The following tests that fonts are sorted. Postscript names are expected to
   // be encoded in a subset of the ASCII character set.
   // See: https://docs.microsoft.com/en-us/typography/opentype/spec/name
   // Should the Postscript name contain characters that are multi-byte, this
   // test may erroneously fail.
   let previousFont = null;
-  for await (const font of iterator) {
+  for (const font of fonts) {
     if (previousFont) {
       assert_true(
           previousFont.postscriptName < font.postscriptName,
@@ -66,21 +37,12 @@ font_access_test(async t => {
 }, 'query(): fonts are sorted');
 
 font_access_test(async t => {
-  if (!isPlatformSupported()) {
-    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
-                                for await (const f of navigator.fonts.query()) {
-                                }
-                              })());
-    return;
-  }
+  const test = {
+    persistentAccess: true,
+    select: [getEnumerationTestSet()[0].postscriptName]
+  };
+  const fonts = await navigator.fonts.query(test);
 
-  const test = {select: [getEnumerationTestSet()[0].postscriptName]};
-  const iterator = navigator.fonts.query(test);
-
-  const fonts = [];
-  for await (const f of iterator) {
-    fonts.push(f);
-  }
   assert_postscript_name_exists(fonts, test.select);
   assert_equals(
       fonts.length, test.select.length,
@@ -107,20 +69,8 @@ const non_ascii_input = [
 
 for (const test of non_ascii_input) {
   font_access_test(async t => {
-    if (!isPlatformSupported()) {
-      await promise_rejects_dom(
-          t, 'NotSupportedError', (async () => {
-            for await (const f of navigator.fonts.query()) {
-            }
-          })());
-      return;
-    }
-
-    const fonts = [];
-    const iterator = navigator.fonts.query(test);
-    for await (const f of iterator) {
-      fonts.push(f);
-    }
+    const fonts =
+        await navigator.fonts.query({persistentAccess: true, ...test});
     assert_equals(
         fonts.length, 0,
         `There should be no results. Instead got: ${JSON.stringify(fonts)}`);
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html
new file mode 100644
index 00000000000..97918a1f992
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<!-- test must be run in a top level browsing context -->
+<title>window.name test helper</title>
+<script>
+const search = window.location.search.replace("?", "");
+const steps = search.split("|");
+
+async function proceedTest() {
+  while (steps.length) {
+    const step = steps.shift();
+
+    if (step.startsWith("report=")) {
+      const id = step.split("=")[1];
+      const stashURL = new URL("unset_context_name_stash.py", location);
+      stashURL.searchParams.set('id', id);
+      stashURL.searchParams.set('value', window.name);
+
+      await fetch(stashURL, { method: "POST" });
+      continue;
+    }
+
+    if (step === "close") {
+      window.close();
+      break;
+    }
+
+    if (step === "navigate") {
+      const url = new URL(window.location);
+      url.host = "{{hosts[][www]}}:{{ports[http][0]}}";
+      url.search = "?" + steps.join("|");
+      window.location = url.href;
+      break;
+    }
+
+    if (step.startsWith("set=")) {
+      window.name = step.split("=")[1];
+      continue;
+    }
+
+    throw new Error("Unsupported step!");
+  }
+}
+
+proceedTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py
new file mode 100644
index 00000000000..411a4587bce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py
@@ -0,0 +1,13 @@
+def main(request, response):
+    key = request.GET.first(b"id")
+    if request.method == "POST":
+        value = request.GET.first(b"value")
+        request.server.stash.take(key)
+        request.server.stash.put(key, value)
+        return b"OK"
+    else:
+        value = request.server.stash.take(key)
+        if value is not None:
+            return value
+        else:
+            return b"NONE"
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html
deleted file mode 100644
index d3d67d0f826..00000000000
--- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!doctype html>
-<title>window.name after navigating to a different origin</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-test(function() {assert_equals(window.name, "")})
-</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html
index 6814ed50e2f..285f6d74281 100644
--- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html
@@ -1,7 +1,32 @@
 <!doctype html>
-<!-- test must be run in a top level browsing context -->
-<title>window.name after navigating to a different origin</title>
+<title>window.name is reset after navigating to a different origin</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
 <script>
-window.name = "test_window";
-location.href = location.href.replace("http://", "http://www.").replace("unset_context_name", "unset_context_name-1");
+
+async function pollResultAndCheck(t, id, expected) {
+  const stashURL = new URL("resources/unset_context_name_stash.py", location);
+  stashURL.searchParams.set('id', id);
+
+  let res = "NONE";
+  while (res == "NONE") {
+    await new Promise(resolve => { t.step_timeout(resolve, 100); });
+
+    const response = await fetch(stashURL);
+    res = await response.text();
+  }
+  if (res !== expected) {
+    assert_unreached('Stash result does not equal expected result.')
+  }
+}
+
+promise_test(async t => {
+  const id = token();
+
+  window.open(`resources/unset_context_name-1.sub.html?set=${id}|navigate|report=${id}|close`, "_blank", "noopener");
+  await pollResultAndCheck(t, id, "");
+}, "Window.name is reset after navigating to a different origin");
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html
index d1bc4d1e04d..04f485cc663 100644
--- a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html
@@ -9,31 +9,47 @@
 // Check sandbox flags are properly defined when its parent requires them and
 // the child allows it.
 
-const same_origin = get_host_info().HTTPS_ORIGIN;
-const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+const same_origin = get_host_info().HTTP_ORIGIN;
+const cross_origin = get_host_info().HTTP_REMOTE_ORIGIN;
 const check_sandbox_url =
   "/html/browsers/sandboxing/resources/check-sandbox-flags.html?pipe=";
 const allow_csp_from_star = "|header(Allow-CSP-From,*)";
 
 // Return a promise, resolving when |element| triggers |event_name| event.
-const future = (element, event_name) => {
+const future = (element, event_name, source) => {
   return new Promise(resolve => {
-    element.addEventListener(event_name, event => resolve(event))
+    element.addEventListener(event_name, event => {
+      if (!source || source.contentWindow == event.source)
+        resolve(event)
+    })
   });
 };
 
 const check_sandbox_script = `
+<script>
   try {
     document.domain = document.domain;
     parent.postMessage("document-domain-is-allowed", "*");
   } catch (exception) {
     parent.postMessage("document-domain-is-disallowed", "*");
   }
+</scr`+`ipt>
 `;
 
 const sandbox_policy = "sandbox allow-scripts allow-same-origin";
 
-promise_test(async test => {
+// Test using the modern async/await primitives are easier to read/write.
+// However they run sequentially, contrary to async_test. This is the parallel
+// version, to avoid timing out.
+let promise_test_parallel = (promise, description) => {
+  async_test(test => {
+    promise(test)
+    .then(() => {test.done();})
+    .catch(test.step_func(error => { throw error; }));
+  }, description);
+};
+
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
 
@@ -43,16 +59,15 @@ promise_test(async test => {
   iframe.src = "/fetch/api/resources/infinite-slow-response.py";
   document.body.appendChild(iframe);
 
-  const iframe_reply = future(window, "message");
-  iframe.contentWindow.location =
-    `javascript:${encodeURI(check_sandbox_script)}`;
+  const iframe_reply = future(window, "message", iframe);
+  iframe.contentDocument.write(check_sandbox_script);
   const result = await iframe_reply;
   iframe.remove();
 
-  assert_equals(result.data, "document-domain-is-not-allowed");
+  assert_equals(result.data, "document-domain-is-disallowed");
 }, "initial empty document");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.src = "data:text/html,dummy";
 
@@ -65,73 +80,71 @@ promise_test(async test => {
   iframe.src = "about:blank";
   await iframe_load_2;
 
-  const iframe_reply = future(window, "message");
-  iframe.contentWindow.location =
-    `javascript:${encodeURI(check_sandbox_script)}`;
+  const iframe_reply = future(window, "message", iframe);
+  iframe.contentDocument.write(check_sandbox_script);
   const result = await iframe_reply;
 
-  assert_equals(result.data, "document-domain-is-not-allowed");
+  assert_equals(result.data, "document-domain-is-disallowed");
 }, "about:blank");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
   iframe.src =
-    `data:text/html,<script>${encodeURI(check_sandbox_script)}</scr`+`ipt>`;
+    `data:text/html,${encodeURI(check_sandbox_script)}`;
 
-  const iframe_reply = future(window, "message");
+  const iframe_reply = future(window, "message", iframe);
   document.body.appendChild(iframe);
   const result = await iframe_reply;
 
   assert_equals(result.data, "document-domain-is-disallowed");
 }, "data-url");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
-  iframe.srcdoc = `<script>${check_sandbox_script}</scr`+`ipt>`;
+  iframe.srcdoc = check_sandbox_script;
 
-  const iframe_reply = future(window, "message");
+  const iframe_reply = future(window, "message", iframe);
   document.body.appendChild(iframe);
   const result = await iframe_reply;
 
-  assert_equals(result.data, "document-domain-is-not-allowed");
+  assert_equals(result.data, "document-domain-is-disallowed");
 }, "srcdoc");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
 
-  const blob = new Blob(
-    [ `<script>${check_sandbox_script}</scr`+`ipt>` ], { type: "text/html" });
+  const blob = new Blob([check_sandbox_script], { type: "text/html" });
 
   iframe.src = URL.createObjectURL(blob);
 
-  const iframe_reply = future(window, "message");
+  const iframe_reply = future(window, "message", iframe);
   document.body.appendChild(iframe);
   const result = await iframe_reply;
 
   assert_equals(result.data, "document-domain-is-disallowed");
 }, "blob URL");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
   iframe.src = same_origin + check_sandbox_url + allow_csp_from_star;
 
-  const iframe_reply = future(window, "message");
+  const iframe_reply = future(window, "message", iframe);
   document.body.appendChild(iframe);
   const result = await iframe_reply;
 
   assert_equals(result.data, "document-domain-is-disallowed");
 }, "same-origin");
 
-promise_test(async test => {
+promise_test_parallel(async test => {
   const iframe = document.createElement("iframe");
   iframe.csp = sandbox_policy;
   iframe.src = cross_origin + check_sandbox_url + allow_csp_from_star;
 
-  const iframe_reply = future(window, "message");
+  const iframe_reply = future(window, "message", iframe);
   document.body.appendChild(iframe);
   const result = await iframe_reply;
 
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html
index ab36eeede73..f523fd7219b 100644
--- a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html
@@ -11,20 +11,17 @@
 </style>
 <body>
 <script>
-let t = async_test("Canvas width and height attributes are used as the surface size");
 function assert_ratio(img, expected) {
   let epsilon = 0.001;
   assert_approx_equals(parseInt(getComputedStyle(img).width, 10) / parseInt(getComputedStyle(img).height, 10), expected, epsilon);
 }
 // Create and append a new canvas and immediately check the ratio.
-t.step(function() {
+test(function() {
   var canvas = document.createElement("canvas");
   canvas.setAttribute("width", "250");
   canvas.setAttribute("height", "100");
   document.body.appendChild(canvas);
   // Canvases always use the aspect ratio from their surface size.
   assert_ratio(canvas, 2.5);
-
-  t.done();
-});
+}, "Canvas width and height attributes are used as the surface size");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html
new file mode 100644
index 00000000000..41fa7d4e7f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel=help href="https://github.com/MicrosoftEdge/MSEdgeExplainers/blob/main/Popup/explainer.md">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<popup id=popup>This is a popup</popup>
+
+<script>
+  test(function() {
+    assert_true(document.createElement('popup') instanceof HTMLPopupElement);
+  }, "popup element exists")
+
+  test(function() {
+    const popup = document.getElementById('popup');
+    assert_equals(window.getComputedStyle(popup).getPropertyValue('display'),'none');
+    assert_equals(popup.getAttribute('open'),null);
+    popup.show();
+    assert_equals(popup.getAttribute('open'),"");
+    assert_equals(window.getComputedStyle(popup).getPropertyValue('display'),'block');
+    popup.hide();
+    assert_equals(popup.getAttribute('open'),null);
+    assert_equals(window.getComputedStyle(popup).getPropertyValue('display'),'none');
+  }, "popup element basic show/hide behavior")
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html
new file mode 100644
index 00000000000..d622b7d1053
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-open.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel=help href="https://github.com/MicrosoftEdge/MSEdgeExplainers/blob/main/Popup/explainer.md">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<popup id=p1>This is a closed popup</popup>
+<popup id=p2 open>This is an open popup</popup>
+
+<script>
+  var popup1 = document.getElementById('p1');
+  var popup2 = document.getElementById('p2');
+
+  test(function(){
+    assert_false(popup1.open);
+    assert_true(popup2.open);
+  }, "The IDL open attribute must return true if the content open attribute is set, and false if it is absent.");
+
+  test(function(){
+    assert_false(popup1.hasAttribute("open"));
+    popup1.open = true;
+    assert_true(popup1.hasAttribute("open"));
+    popup1.open = false;
+    assert_true(popup2.hasAttribute("open"));
+    popup2.open = false;
+    assert_false(popup2.hasAttribute("open"));
+  }, "On setting, the content open attribute must be removed if the IDL open attribute is set to false, and must be present if the IDL open attribute is set to true.");
+</script>
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
index 58988a75d41..c4f524f627e 100644
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
@@ -5,3 +5,4 @@
   [TestDriver actions: two touch points with one moving one pause]
     expected:
       if product == "safari": FAIL
+      if product == "chrome": [PASS, FAIL]
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 5b30344ab7d..bb44c132747 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1440,8 +1440,8 @@ interface mixin CanvasPath {
   undefined bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
   undefined arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
   undefined rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  undefined arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
-  undefined ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+  undefined arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean counterclockwise = false);
+  undefined ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean counterclockwise = false);
 };
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/selection-api.idl b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
index b6626292183..d8f8e782872 100644
--- a/tests/wpt/web-platform-tests/interfaces/selection-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
@@ -27,7 +27,7 @@ interface Selection {
   [CEReactions]
   undefined deleteFromDocument();
   boolean containsNode(Node node, optional boolean allowPartialContainment = false);
-  stringifier DOMString ();
+  stringifier;
 };
 
 partial interface Document {
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-constructor-thcrash.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-constructor-thcrash.https.html
index 9763615bdd1..80ee1606852 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-constructor-thcrash.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-constructor-thcrash.https.html
@@ -96,7 +96,7 @@ test(() => {
   }
   // Now, let's add an abusive amount of methods.
   while (evilMethods.length < ABUSIVE_AMOUNT) {
-    evilMethods = evilMethods.concat(evilMethods);
+    evilMethods.push({supportedMethods: "evil-method" + evilMethods.length});
   }
   try {
     new PaymentRequest(evilMethods, defaultDetails);
diff --git a/tests/wpt/web-platform-tests/resources/test/conftest.py b/tests/wpt/web-platform-tests/resources/test/conftest.py
index 1baf6622b05..de0d29794d9 100644
--- a/tests/wpt/web-platform-tests/resources/test/conftest.py
+++ b/tests/wpt/web-platform-tests/resources/test/conftest.py
@@ -39,7 +39,11 @@ def pytest_collect_file(path, parent):
         return
     test_type = test_type.split(os.path.sep)[1]
 
-    return HTMLItem(str(path), test_type, parent)
+    # Handle the deprecation of Node construction in pytest6
+    # https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
+    if hasattr(HTMLItem, "from_parent"):
+        return HTMLItem.from_parent(parent, filename=str(path), test_type=test_type)
+    return HTMLItem(parent, str(path), test_type)
 
 
 def pytest_configure(config):
@@ -83,7 +87,7 @@ def resolve_uri(context, uri):
 
 
 class HTMLItem(pytest.Item, pytest.Collector):
-    def __init__(self, filename, test_type, parent):
+    def __init__(self, parent, filename, test_type):
         self.url = parent.session.config.server.url(filename)
         self.type = test_type
         self.variants = []
@@ -114,7 +118,11 @@ class HTMLItem(pytest.Item, pytest.Collector):
                 continue
             if element.tag == 'script':
                 if element.attrib.get('id') == 'expected':
-                    self.expected = json.loads(text_type(element.text))
+                    try:
+                        self.expected = json.loads(text_type(element.text))
+                    except ValueError:
+                        print("Failed parsing JSON in %s" % filename)
+                        raise
 
                 src = element.attrib.get('src', '')
 
@@ -192,6 +200,8 @@ class HTMLItem(pytest.Item, pytest.Collector):
         test_url = self.url + variant
         actual = driver.execute_async_script('runTest("%s", "foo", arguments[0])' % test_url)
 
+        print(json.dumps(actual, indent=2))
+
         summarized = self._summarize(copy.deepcopy(actual))
 
         print(json.dumps(summarized, indent=2))
@@ -203,6 +213,17 @@ class HTMLItem(pytest.Item, pytest.Collector):
 
         self.expected[u'summarized_tests'].sort(key=lambda test_obj: test_obj.get('name'))
 
+        # Make asserts opt-in for now
+        if "summarized_asserts" not in self.expected:
+            del summarized["summarized_asserts"]
+        else:
+            # We can't be sure of the order of asserts even within the same test
+            # although we could also check for the failing assert being the final
+            # one
+            for obj in [summarized, self.expected]:
+                obj["summarized_asserts"].sort(
+                    key=lambda x: (x["test"], x["status"], x["assert_name"], tuple(x["args"])))
+
         assert summarized == self.expected
 
     def _summarize(self, actual):
@@ -212,6 +233,11 @@ class HTMLItem(pytest.Item, pytest.Collector):
         summarized[u'summarized_tests'] = [
             self._summarize_test(test) for test in actual['tests']]
         summarized[u'summarized_tests'].sort(key=lambda test_obj: test_obj.get('name'))
+        summarized[u'summarized_asserts'] = [
+            {"assert_name": assert_item["assert_name"],
+            "test": assert_item["test"]["name"] if assert_item["test"] else None,
+            "args": assert_item["args"],
+            "status": assert_item["status"]} for assert_item in actual["asserts"]]
         summarized[u'type'] = actual['type']
 
         return summarized
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
index 237b4ea876e..41a765f5574 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
@@ -562,6 +562,431 @@
       "properties": {}
     }
   ],
+  "summarized_asserts": [
+    {
+      "assert_name": "assert_true",
+      "test": "Setup function ran",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "on_event does not use event capture",
+      "args": [
+        "[\"inner\", \"outer\"]",
+        "[\"inner\", \"outer\"]"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "document.body should be the first body element in the document",
+      "args": [
+        "Element node <body onload=\"load_test_attr.done()\"> <h1>Sample HTML5 AP...",
+        "Element node <body onload=\"load_test_attr.done()\"> <h1>Sample HTML5 AP..."
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "assert_equals tests",
+      "args": [
+        "1",
+        "1"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "assert_equals tests",
+      "args": [
+        "NaN",
+        "NaN",
+        "\"NaN case\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "assert_equals tests",
+      "args": [
+        "0",
+        "0",
+        "\"Zero case\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "assert_equals tests expected to fail",
+      "args": [
+        "-0",
+        "0",
+        "\"Zero case\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_not_equals",
+      "test": "assert_not_equals tests",
+      "args": [
+        "object \"[object Object]\"",
+        "object \"[object Object]\"",
+        "\"object case\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_not_equals",
+      "test": "assert_not_equals tests",
+      "args": [
+        "-0",
+        "0",
+        "\"Zero case\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "assert_true expected to pass",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "assert_true expected to fail",
+      "args": [
+        "false",
+        "\"false should not be true\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "basic assert_array_equals test",
+      "args": [
+        "[1, NaN]",
+        "[1, NaN]",
+        "\"[1, NaN] is equal to [1, NaN]\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "assert_array_equals with first param undefined",
+      "args": [
+        "undefined",
+        "[1]",
+        "\"undefined equals [1]?\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "assert_array_equals with first param true",
+      "args": [
+        "true",
+        "[1]",
+        "\"true equals [1]?\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "assert_array_equals with first param false",
+      "args": [
+        "false",
+        "[1]",
+        "\"false equals [1]?\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "assert_array_equals with first param null",
+      "args": [
+        "null",
+        "[1]",
+        "\"null equals [1]?\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_equals",
+      "test": "assert_array_equals with first param 1",
+      "args": [
+        "1",
+        "[1]",
+        "\"1 equals [1]?\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_array_approx_equals",
+      "test": "basic assert_array_approx_equals test",
+      "args": [
+        "[10, 11]",
+        "[11, 10]",
+        "1",
+        "\"[10, 11] is approximately (+/- 1) [11, 10]\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_approx_equals",
+      "test": "basic assert_approx_equals test",
+      "args": [
+        "10",
+        "11",
+        "1",
+        "\"10 is approximately (+/- 1) 11\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_approx_equals",
+      "test": "basic assert_less_than test",
+      "args": [
+        "10",
+        "11",
+        "1",
+        "\"10 is approximately (+/- 1) 11\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_greater_than",
+      "test": "assert_greater_than expected to fail",
+      "args": [
+        "10",
+        "11",
+        "\"10 is not greater than 11\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_greater_than_equal",
+      "test": "basic assert_greater_than_equal test",
+      "args": [
+        "10",
+        "10",
+        "\"10 is greater than or equal to 10\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_greater_than_equal",
+      "test": "assert_less_than_equal expected to fail",
+      "args": [
+        "\"10\"",
+        "10",
+        "\"'10' is not a number\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_own_property",
+      "test": "test for assert[_not]_own_property and insert_inherits",
+      "args": [
+        "object \"[object Object]\"",
+        "\"a\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_not_own_property",
+      "test": "test for assert[_not]_own_property and insert_inherits",
+      "args": [
+        "object \"[object Object]\"",
+        "\"b\"",
+        "\"unexpected property found: \\\"b\\\"\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_inherits",
+      "test": "test for assert[_not]_own_property and insert_inherits",
+      "args": [
+        "object \"[object Object]\"",
+        "\"b\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM exception",
+      "args": [
+        "\"NOT_FOUND_ERR\"",
+        "function \"function () {a.removeChild(b)}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_js",
+      "test": "Test throw DOMException as JS exception expected to fail",
+      "args": [
+        "function \"function DOMException() {     [native code] }\"",
+        "function \"function () {a.removeChild(b)}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_js",
+      "test": "Test throw SyntaxError DOMException where JS SyntaxError expected; expected to fail",
+      "args": [
+        "function \"function SyntaxError() {     [native code] }\"",
+        "function \"function () {document.querySelector(\"\")}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_js",
+      "test": "Test throw JS SyntaxError",
+      "args": [
+        "function \"function SyntaxError() {     [native code] }\"",
+        "function \"function () {JSON.parse(\"{\")}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM SyntaxError",
+      "args": [
+        "\"SyntaxError\"",
+        "function \"function () {document.querySelector(\"\")}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM SyntaxError from subframe",
+      "args": [
+        "\"SyntaxError\"",
+        "function \"function DOMException() {     [native code] }\"",
+        "function \"function () {ifr.contentDocument.querySelector(\"\")}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM SyntaxError from subframe with incorrect global expectation; expected to fail",
+      "args": [
+        "\"SyntaxError\"",
+        "function \"function () {ifr.contentDocument.querySelector(\"\")}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM SyntaxError with incorrect expectation; expected to fail",
+      "args": [
+        "\"SyntaxError\"",
+        "function \"function DOMException() {     [native code] }\"",
+        "function \"function () {document.querySelector(\"\")}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw JS SyntaxError where SyntaxError DOMException expected; expected to fail",
+      "args": [
+        "\"SyntaxError\"",
+        "function \"function () {JSON.parse(\"{\")}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test throw DOM exception expected to fail",
+      "args": [
+        "\"NOT_FOUND_ERR\"",
+        "function \"function () {a.appendChild(b)}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test assert_throws_dom with ambiguous DOM-exception expected to Fail",
+      "args": [
+        "0",
+        "function \"function() {throw e}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test assert_throws_dom with non-DOM-exception expected to Fail",
+      "args": [
+        "\"TEST_ERR\"",
+        "function \"function() {throw e}\""
+      ],
+      "status": 1
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test assert_throws_dom with number code value expected to Pass",
+      "args": [
+        "12",
+        "function \"function() {throw e}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_throws_dom",
+      "test": "Test assert_throws_dom with number code value and real DOMException expected to Pass",
+      "args": [
+        "12",
+        "function \"function() {throw e}\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "Test that defines a global and cleans it up",
+      "args": [
+        "1",
+        "1"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_equals",
+      "test": "Test that cleanup handlers from previous test ran",
+      "args": [
+        "undefined",
+        "undefined"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "Test step_func",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "Test async test with callback",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "Test async test with callback and `this` obj.",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    }
+  ],
   "type": "complete"
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html
index 08a2b893c24..ba7a08f48fd 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html
@@ -40,6 +40,24 @@ done();
       "message": null
     }
   ],
+  "summarized_asserts": [
+    {
+      "assert_name": "assert_true",
+      "test": "Test defined before onload",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_true",
+      "test": "Test defined after onload",
+      "args": [
+        "true"
+      ],
+      "status": 0
+    }
+  ],
   "type": "complete"
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/resources/test/tox.ini b/tests/wpt/web-platform-tests/resources/test/tox.ini
index 266a6e8952e..fc26aa6cc0e 100644
--- a/tests/wpt/web-platform-tests/resources/test/tox.ini
+++ b/tests/wpt/web-platform-tests/resources/test/tox.ini
@@ -5,9 +5,10 @@ skipsdist=True
 [testenv]
 passenv=DISPLAY # Necessary for the spawned GeckoDriver process to connect to
                 # the appropriate display.
+
 deps =
   html5lib
-  pytest>=2.9,<6 # pinned to <6 due to https://github.com/web-platform-tests/wpt/issues/26132
+  pytest>=2.9
   pyvirtualdisplay
   six
   requests
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index f7fe7531710..e2e364102e4 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -87,14 +87,15 @@ policies and contribution forms [3].
                                              test: test.structured_clone()});
                      }],
             completion: [add_completion_callback, remove_completion_callback,
-                         function (tests, harness_status) {
+                         function (tests, harness_status, asserts) {
                              var cloned_tests = map(tests, function(test) {
                                  return test.structured_clone();
                              });
                              this_obj._dispatch("completion_callback", [tests, harness_status],
                                                 {type: "complete",
                                                  tests: cloned_tests,
-                                                 status: harness_status.structured_clone()});
+                                                 status: harness_status.structured_clone(),
+                                                 asserts: asserts.map(assert => assert.structured_clone())});
                          }]
         }
 
@@ -192,8 +193,8 @@ policies and contribution forms [3].
             this_obj.output_handler.show_status();
         });
 
-        add_completion_callback(function (tests, harness_status) {
-            this_obj.output_handler.show_results(tests, harness_status);
+        add_completion_callback(function (tests, harness_status, asserts_run) {
+            this_obj.output_handler.show_results(tests, harness_status, asserts_run);
         });
         this.setup_messages(settings.message_events);
     };
@@ -314,14 +315,15 @@ policies and contribution forms [3].
                     });
                 });
         add_completion_callback(
-                function(tests, harness_status) {
+                function(tests, harness_status, asserts) {
                     this_obj._dispatch({
                         type: "complete",
                         tests: map(tests,
                             function(test) {
                                 return test.structured_clone();
                             }),
-                        status: harness_status.structured_clone()
+                        status: harness_status.structured_clone(),
+                        asserts: asserts.map(assert => assert.structured_clone()),
                     });
                 });
     };
@@ -500,11 +502,7 @@ policies and contribution forms [3].
             return new DedicatedWorkerTestEnvironment();
         }
 
-        if (!('location' in global_scope)) {
-            return new ShellTestEnvironment();
-        }
-
-        throw new Error("Unsupported test environment");
+        return new ShellTestEnvironment();
     }
 
     var test_environment = create_test_environment();
@@ -1187,19 +1185,50 @@ policies and contribution forms [3].
      * Assertions
      */
 
+    function expose_assert(f, name) {
+        function assert_wrapper(...args) {
+            let status = Test.statuses.TIMEOUT;
+            let stack = null;
+            try {
+                if (settings.output) {
+                    tests.set_assert(name, ...args);
+                }
+                rv = f(...args);
+                status = Test.statuses.PASS;
+                return rv;
+            } catch(e) {
+                if (e instanceof AssertionError) {
+                    status = Test.statuses.FAIL;
+                    stack = e.stack;
+                 } else {
+                    status = Test.statuses.ERROR;
+                 }
+                throw e;
+            } finally {
+                if (settings.output && !stack) {
+                    stack = get_stack();
+                }
+                if (settings.output) {
+                    tests.set_assert_status(status, stack);
+                }
+            }
+        }
+        expose(assert_wrapper, name);
+    }
+
     function assert_true(actual, description)
     {
         assert(actual === true, "assert_true", description,
                                 "expected true got ${actual}", {actual:actual});
     }
-    expose(assert_true, "assert_true");
+    expose_assert(assert_true, "assert_true");
 
     function assert_false(actual, description)
     {
         assert(actual === false, "assert_false", description,
                                  "expected false got ${actual}", {actual:actual});
     }
-    expose(assert_false, "assert_false");
+    expose_assert(assert_false, "assert_false");
 
     function same_value(x, y) {
         if (y !== y) {
@@ -1229,7 +1258,7 @@ policies and contribution forms [3].
                                              "expected ${expected} but got ${actual}",
                                              {expected:expected, actual:actual});
     }
-    expose(assert_equals, "assert_equals");
+    expose_assert(assert_equals, "assert_equals");
 
     function assert_not_equals(actual, expected, description)
     {
@@ -1241,7 +1270,7 @@ policies and contribution forms [3].
                                               "got disallowed value ${actual}",
                                               {actual:actual});
     }
-    expose(assert_not_equals, "assert_not_equals");
+    expose_assert(assert_not_equals, "assert_not_equals");
 
     function assert_in_array(actual, expected, description)
     {
@@ -1249,7 +1278,7 @@ policies and contribution forms [3].
                                                "value ${actual} not in array ${expected}",
                                                {actual:actual, expected:expected});
     }
-    expose(assert_in_array, "assert_in_array");
+    expose_assert(assert_in_array, "assert_in_array");
 
     // This function was deprecated in July of 2015.
     // See https://github.com/web-platform-tests/wpt/issues/2033
@@ -1287,7 +1316,7 @@ policies and contribution forms [3].
          }
          check_equal(actual, expected, []);
     }
-    expose(assert_object_equals, "assert_object_equals");
+    expose_assert(assert_object_equals, "assert_object_equals");
 
     function assert_array_equals(actual, expected, description)
     {
@@ -1344,7 +1373,7 @@ policies and contribution forms [3].
                     arrayExpected:shorten_array(expected, i), arrayActual:shorten_array(actual, i)});
         }
     }
-    expose(assert_array_equals, "assert_array_equals");
+    expose_assert(assert_array_equals, "assert_array_equals");
 
     function assert_array_approx_equals(actual, expected, epsilon, description)
     {
@@ -1372,7 +1401,7 @@ policies and contribution forms [3].
                    {i:i, expected:expected[i], actual:actual[i], epsilon:epsilon});
         }
     }
-    expose(assert_array_approx_equals, "assert_array_approx_equals");
+    expose_assert(assert_array_approx_equals, "assert_array_approx_equals");
 
     function assert_approx_equals(actual, expected, epsilon, description)
     {
@@ -1395,7 +1424,7 @@ policies and contribution forms [3].
             assert_equals(actual, expected);
         }
     }
-    expose(assert_approx_equals, "assert_approx_equals");
+    expose_assert(assert_approx_equals, "assert_approx_equals");
 
     function assert_less_than(actual, expected, description)
     {
@@ -1412,7 +1441,7 @@ policies and contribution forms [3].
                "expected a number less than ${expected} but got ${actual}",
                {expected:expected, actual:actual});
     }
-    expose(assert_less_than, "assert_less_than");
+    expose_assert(assert_less_than, "assert_less_than");
 
     function assert_greater_than(actual, expected, description)
     {
@@ -1429,7 +1458,7 @@ policies and contribution forms [3].
                "expected a number greater than ${expected} but got ${actual}",
                {expected:expected, actual:actual});
     }
-    expose(assert_greater_than, "assert_greater_than");
+    expose_assert(assert_greater_than, "assert_greater_than");
 
     function assert_between_exclusive(actual, lower, upper, description)
     {
@@ -1447,7 +1476,7 @@ policies and contribution forms [3].
                "and less than ${upper} but got ${actual}",
                {lower:lower, upper:upper, actual:actual});
     }
-    expose(assert_between_exclusive, "assert_between_exclusive");
+    expose_assert(assert_between_exclusive, "assert_between_exclusive");
 
     function assert_less_than_equal(actual, expected, description)
     {
@@ -1464,7 +1493,7 @@ policies and contribution forms [3].
                "expected a number less than or equal to ${expected} but got ${actual}",
                {expected:expected, actual:actual});
     }
-    expose(assert_less_than_equal, "assert_less_than_equal");
+    expose_assert(assert_less_than_equal, "assert_less_than_equal");
 
     function assert_greater_than_equal(actual, expected, description)
     {
@@ -1481,7 +1510,7 @@ policies and contribution forms [3].
                "expected a number greater than or equal to ${expected} but got ${actual}",
                {expected:expected, actual:actual});
     }
-    expose(assert_greater_than_equal, "assert_greater_than_equal");
+    expose_assert(assert_greater_than_equal, "assert_greater_than_equal");
 
     function assert_between_inclusive(actual, lower, upper, description)
     {
@@ -1499,7 +1528,7 @@ policies and contribution forms [3].
                "and less than or equal to ${upper} but got ${actual}",
                {lower:lower, upper:upper, actual:actual});
     }
-    expose(assert_between_inclusive, "assert_between_inclusive");
+    expose_assert(assert_between_inclusive, "assert_between_inclusive");
 
     function assert_regexp_match(actual, expected, description) {
         /*
@@ -1510,7 +1539,7 @@ policies and contribution forms [3].
                "expected ${expected} but got ${actual}",
                {expected:expected, actual:actual});
     }
-    expose(assert_regexp_match, "assert_regexp_match");
+    expose_assert(assert_regexp_match, "assert_regexp_match");
 
     function assert_class_string(object, class_string, description) {
         var actual = {}.toString.call(object);
@@ -1519,22 +1548,21 @@ policies and contribution forms [3].
                                              "expected ${expected} but got ${actual}",
                                              {expected:expected, actual:actual});
     }
-    expose(assert_class_string, "assert_class_string");
-
+    expose_assert(assert_class_string, "assert_class_string");
 
     function assert_own_property(object, property_name, description) {
         assert(object.hasOwnProperty(property_name),
                "assert_own_property", description,
                "expected property ${p} missing", {p:property_name});
     }
-    expose(assert_own_property, "assert_own_property");
+    expose_assert(assert_own_property, "assert_own_property");
 
     function assert_not_own_property(object, property_name, description) {
         assert(!object.hasOwnProperty(property_name),
                "assert_not_own_property", description,
                "unexpected property ${p} is found on object", {p:property_name});
     }
-    expose(assert_not_own_property, "assert_not_own_property");
+    expose_assert(assert_not_own_property, "assert_not_own_property");
 
     function _assert_inherits(name) {
         return function (object, property_name, description)
@@ -1560,8 +1588,8 @@ policies and contribution forms [3].
                    {p:property_name});
         };
     }
-    expose(_assert_inherits("assert_inherits"), "assert_inherits");
-    expose(_assert_inherits("assert_idl_attribute"), "assert_idl_attribute");
+    expose_assert(_assert_inherits("assert_inherits"), "assert_inherits");
+    expose_assert(_assert_inherits("assert_idl_attribute"), "assert_idl_attribute");
 
     function assert_readonly(object, property_name, description)
     {
@@ -1578,7 +1606,7 @@ policies and contribution forms [3].
              object[property_name] = initial_value;
          }
     }
-    expose(assert_readonly, "assert_readonly");
+    expose_assert(assert_readonly, "assert_readonly");
 
     /**
      * Assert a JS Error with the expected constructor is thrown.
@@ -1592,7 +1620,7 @@ policies and contribution forms [3].
         assert_throws_js_impl(constructor, func, description,
                               "assert_throws_js");
     }
-    expose(assert_throws_js, "assert_throws_js");
+    expose_assert(assert_throws_js, "assert_throws_js");
 
     /**
      * Like assert_throws_js but allows specifying the assertion type
@@ -1690,7 +1718,7 @@ policies and contribution forms [3].
         }
         assert_throws_dom_impl(type, func, description, "assert_throws_dom", constructor)
     }
-    expose(assert_throws_dom, "assert_throws_dom");
+    expose_assert(assert_throws_dom, "assert_throws_dom");
 
     /**
      * Similar to assert_throws_dom but allows specifying the assertion type
@@ -1853,7 +1881,7 @@ policies and contribution forms [3].
         assert_throws_exactly_impl(exception, func, description,
                                    "assert_throws_exactly");
     }
-    expose(assert_throws_exactly, "assert_throws_exactly");
+    expose_assert(assert_throws_exactly, "assert_throws_exactly");
 
     /**
      * Like assert_throws_exactly but allows specifying the assertion type
@@ -1881,7 +1909,7 @@ policies and contribution forms [3].
          assert(false, "assert_unreached", description,
                 "Reached unreachable code");
     }
-    expose(assert_unreached, "assert_unreached");
+    expose_assert(assert_unreached, "assert_unreached");
 
     function assert_any(assert_func, actual, expected_array)
     {
@@ -1902,7 +1930,7 @@ policies and contribution forms [3].
             throw new AssertionError(errors.join("\n\n"));
         }
     }
-    expose(assert_any, "assert_any");
+    expose_assert(assert_any, "assert_any");
 
     /**
      * Assert that a feature is implemented, based on a 'truthy' condition.
@@ -1919,7 +1947,7 @@ policies and contribution forms [3].
     function assert_implements(condition, description) {
         assert(!!condition, "assert_implements", description);
     }
-    expose(assert_implements, "assert_implements")
+    expose_assert(assert_implements, "assert_implements")
 
     /**
      * Assert that an optional feature is implemented, based on a 'truthy' condition.
@@ -1939,7 +1967,7 @@ policies and contribution forms [3].
             throw new OptionalFeatureUnsupportedError(description);
         }
     }
-    expose(assert_implements_optional, "assert_implements_optional")
+    expose_assert(assert_implements_optional, "assert_implements_optional")
 
     function Test(name, properties)
     {
@@ -1999,6 +2027,18 @@ policies and contribution forms [3].
         COMPLETE:4
     };
 
+    Test.prototype.status_formats = {
+        0: "Pass",
+        1: "Fail",
+        2: "Timeout",
+        3: "Not Run",
+        4: "Optional Feature Unsupported",
+    }
+
+    Test.prototype.format_status = function() {
+        return this.status_formats[this.status];
+    }
+
     Test.prototype.structured_clone = function()
     {
         if (!this._structured_clone) {
@@ -2023,11 +2063,13 @@ policies and contribution forms [3].
         if (this.phase > this.phases.STARTED) {
             return;
         }
+
         this.phase = this.phases.STARTED;
         //If we don't get a result before the harness times out that will be a test timeout
         this.set_status(this.TIMEOUT, "Test timed out");
 
         tests.started = true;
+        tests.current_test = this;
         tests.notify_test_state(this);
 
         if (this.timeout_id === null) {
@@ -2053,6 +2095,8 @@ policies and contribution forms [3].
             this.set_status(status, message, stack);
             this.phase = this.phases.HAS_RESULT;
             this.done();
+        } finally {
+            this.current_test = null;
         }
     };
 
@@ -2469,6 +2513,10 @@ policies and contribution forms [3].
                 });
     }
 
+    RemoteTest.prototype.format_status = function() {
+        return Test.prototype.status_formats[this.status];
+    }
+
     /*
      * A RemoteContext listens for test events from a remote test context, such
      * as another window or a worker. These events are then used to construct
@@ -2577,6 +2625,16 @@ policies and contribution forms [3].
             tests.set_status(data.status.status, data.status.message, data.status.sack);
         }
 
+        for (let assert of data.asserts) {
+            var record = new AssertRecord();
+            record.assert_name = assert.assert_name;
+            record.args = assert.args;
+            record.test = this.tests[assert.test.index];
+            record.status = assert.status;
+            record.stack = assert.stack;
+            tests.asserts_run.push(record);
+        }
+
         this.message_target.removeEventListener("message", this.message_handler);
         this.running = false;
 
@@ -2626,6 +2684,14 @@ policies and contribution forms [3].
 
     TestsStatus.prototype = merge({}, TestsStatus.statuses);
 
+    TestsStatus.prototype.formats = {
+        0: "OK",
+        1: "Error",
+        2: "Timeout",
+        3: "Optional Feature Unsupported"
+    }
+
+
     TestsStatus.prototype.structured_clone = function()
     {
         if (!this._structured_clone) {
@@ -2640,6 +2706,27 @@ policies and contribution forms [3].
         return this._structured_clone;
     };
 
+    TestsStatus.prototype.format_status = function() {
+        return this.formats[this.status];
+    }
+
+    function AssertRecord(test, assert_name, ...args) {
+        this.assert_name = assert_name;
+        this.test = test;
+        // Avoid keeping complex objects alive
+        this.args = args.map(x => format_value(x).replace(/\n/g, " "));
+        this.status = null;
+    }
+
+    AssertRecord.prototype.structured_clone = function() {
+        return {
+            assert_name: this.assert_name,
+            test: this.test ? this.test.structured_clone() : null,
+            args: this.args,
+            status: this.status,
+        }
+    }
+
     function Tests()
     {
         this.tests = [];
@@ -2679,6 +2766,9 @@ policies and contribution forms [3].
         this.hide_test_state = false;
         this.pending_remotes = [];
 
+        this.current_test = null;
+        this.asserts_run = [];
+
         this.status = new TestsStatus();
 
         var this_obj = this;
@@ -2914,6 +3004,16 @@ policies and contribution forms [3].
                   all_complete);
     };
 
+    Tests.prototype.set_assert = function(assert_name, ...args) {
+        this.asserts_run.push(new AssertRecord(this.current_test, assert_name, ...args))
+    }
+
+    Tests.prototype.set_assert_status = function(status, stack) {
+        let assert_record = this.asserts_run[this.asserts_run.length - 1];
+        assert_record.status = status;
+        assert_record.stack = stack;
+    }
+
     /**
      * Update the harness status to reflect an unrecoverable harness error that
      * should cancel all further testing. Update all previously-defined tests
@@ -3011,7 +3111,7 @@ policies and contribution forms [3].
         forEach (this.all_done_callbacks,
                  function(callback)
                  {
-                     callback(this_obj.tests, this_obj.status);
+                     callback(this_obj.tests, this_obj.status, this_obj.asserts_run);
                  });
     };
 
@@ -3237,7 +3337,7 @@ policies and contribution forms [3].
         }
     };
 
-    Output.prototype.show_results = function (tests, harness_status) {
+    Output.prototype.show_results = function (tests, harness_status, asserts_run) {
         if (this.phase >= this.COMPLETE) {
             return;
         }
@@ -3266,23 +3366,10 @@ policies and contribution forms [3].
             heads[0].appendChild(stylesheet);
         }
 
-        var status_text_harness = {};
-        status_text_harness[harness_status.OK] = "OK";
-        status_text_harness[harness_status.ERROR] = "Error";
-        status_text_harness[harness_status.TIMEOUT] = "Timeout";
-        status_text_harness[harness_status.PRECONDITION_FAILED] = "Optional Feature Unsupported";
-
-        var status_text = {};
-        status_text[Test.prototype.PASS] = "Pass";
-        status_text[Test.prototype.FAIL] = "Fail";
-        status_text[Test.prototype.TIMEOUT] = "Timeout";
-        status_text[Test.prototype.NOTRUN] = "Not Run";
-        status_text[Test.prototype.PRECONDITION_FAILED] = "Optional Feature Unsupported";
-
         var status_number = {};
         forEach(tests,
                 function(test) {
-                    var status = status_text[test.status];
+                    var status = test.format_status();
                     if (status_number.hasOwnProperty(status)) {
                         status_number[status] += 1;
                     } else {
@@ -3299,8 +3386,7 @@ policies and contribution forms [3].
                                 ["h2", {}, "Summary"],
                                 function()
                                 {
-
-                                    var status = status_text_harness[harness_status.status];
+                                    var status = harness_status.format_status();
                                     var rv = [["section", {},
                                                ["p", {},
                                                 "Harness status: ",
@@ -3322,13 +3408,14 @@ policies and contribution forms [3].
                                 function() {
                                     var rv = [["div", {}]];
                                     var i = 0;
-                                    while (status_text.hasOwnProperty(i)) {
-                                        if (status_number.hasOwnProperty(status_text[i])) {
-                                            var status = status_text[i];
-                                            rv[0].push(["div", {"class":status_class(status)},
+                                    while (Test.prototype.status_formats.hasOwnProperty(i)) {
+                                        if (status_number.hasOwnProperty(Test.prototype.status_formats[i])) {
+                                            var status = Test.prototype.status_formats[i];
+                                            rv[0].push(["div", {},
                                                         ["label", {},
                                                          ["input", {type:"checkbox", checked:"checked"}],
-                                                         status_number[status] + " " + status]]);
+                                                         status_number[status] + " ",
+                                                         ["span", {"class":status_class(status)}, status]]]);
                                         }
                                         i++;
                                     }
@@ -3395,6 +3482,51 @@ policies and contribution forms [3].
             return '';
         }
 
+        var asserts_run_by_test = new Map();
+        asserts_run.forEach(assert => {
+            if (!asserts_run_by_test.has(assert.test)) {
+                asserts_run_by_test.set(assert.test, []);
+            }
+            asserts_run_by_test.get(assert.test).push(assert);
+        });
+
+        function get_asserts_output(test) {
+            var asserts = asserts_run_by_test.get(test);
+            if (!asserts) {
+                return "No asserts ran";
+            }
+            rv = "<table>";
+            rv += asserts.map(assert => {
+                var output_fn = "<strong>" + escape_html(assert.assert_name) + "</strong>(";
+                var prefix_len = output_fn.length;
+                var output_args = assert.args;
+                var output_len = output_args.reduce((prev, current) => prev+current, prefix_len);
+                if (output_len[output_len.length - 1] > 50) {
+                    output_args = output_args.map((x, i) =>
+                    (i > 0 ? "  ".repeat(prefix_len) : "" )+ x + (i < output_args.length - 1 ? ",\n" : ""));
+                } else {
+                    output_args = output_args.map((x, i) => x + (i < output_args.length - 1 ? ", " : ""));
+                }
+                output_fn += escape_html(output_args.join(""));
+                output_fn += ')';
+                var output_location;
+                if (assert.stack) {
+                    output_location = assert.stack.split("\n", 1)[0].replace(/@?\w+:\/\/[^ "\/]+(?::\d+)?/g, " ");
+                }
+                return "<tr><td class=" +
+                    status_class(Test.prototype.status_formats[assert.status]) + ">" +
+                    Test.prototype.status_formats[assert.status] + "</td>" +
+                    "</td>" +
+                    "<td><pre>" +
+                    output_fn +
+                    (output_location ? "\n" + escape_html(output_location) : "") +
+                    "</pre></td></tr>";
+            }
+            ).join("\n");
+            rv += "</table>";
+            return rv;
+        }
+
         log.appendChild(document.createElementNS(xhtml_ns, "section"));
         var assertions = has_assertions();
         var html = "<h2>Details</h2><table id='results' " + (assertions ? "class='assertions'" : "" ) + ">" +
@@ -3403,18 +3535,20 @@ policies and contribution forms [3].
             "<th>Message</th></tr></thead>" +
             "<tbody>";
         for (var i = 0; i < tests.length; i++) {
-            html += '<tr class="' +
-                escape_html(status_class(status_text[tests[i].status])) +
-                '"><td>' +
-                escape_html(status_text[tests[i].status]) +
+            var test = tests[i];
+            html += '<tr><td class="' +
+                status_class(test.format_status()) +
+                '">' +
+                test.format_status() +
                 "</td><td>" +
-                escape_html(tests[i].name) +
+                escape_html(test.name) +
                 "</td><td>" +
-                (assertions ? escape_html(get_assertion(tests[i])) + "</td><td>" : "") +
-                escape_html(tests[i].message ? tests[i].message : " ") +
+                (assertions ? escape_html(get_assertion(test)) + "</td><td>" : "") +
+                escape_html(test.message ? tests[i].message : " ") +
                 (tests[i].stack ? "<pre>" +
                  escape_html(tests[i].stack) +
                  "</pre>": "") +
+                 "<details><summary>Asserts run</summary>" + get_asserts_output(test) + "</details>"
                 "</td></tr>";
         }
         html += "</tbody></table>";
@@ -3610,13 +3744,13 @@ policies and contribution forms [3].
             message = sanitize_unpaired_surrogates(message);
         }
         this.message = message;
-        this.stack = this.get_stack();
+        this.stack = get_stack();
     }
     expose(AssertionError, "AssertionError");
 
     AssertionError.prototype = Object.create(Error.prototype);
 
-    AssertionError.prototype.get_stack = function() {
+    get_stack = function() {
         var stack = new Error().stack;
         // IE11 does not initialize 'Error.stack' until the object is thrown.
         if (!stack) {
@@ -3980,54 +4114,62 @@ table#results {\
     width:100%;\
 }\
 \
-table#results th:first-child,\
-table#results td:first-child {\
+table#results > thead > tr > th:first-child,\
+table#results > tbody > tr > td:first-child {\
     width:8em;\
 }\
 \
-table#results th:last-child,\
-table#results td:last-child {\
+table#results > thead > tr > th:last-child,\
+table#results > thead > tr > td:last-child {\
     width:50%;\
 }\
 \
-table#results.assertions th:last-child,\
-table#results.assertions td:last-child {\
+table#results.assertions > thead > tr > th:last-child,\
+table#results.assertions > tbody > tr > td:last-child {\
     width:35%;\
 }\
 \
-table#results th {\
+table#results > thead > > tr > th {\
     padding:0;\
     padding-bottom:0.5em;\
     border-bottom:medium solid black;\
 }\
 \
-table#results td {\
+table#results > tbody > tr> td {\
     padding:1em;\
     padding-bottom:0.5em;\
     border-bottom:thin solid black;\
 }\
 \
-tr.pass > td:first-child {\
+.pass {\
     color:green;\
 }\
 \
-tr.fail > td:first-child {\
+.fail {\
     color:red;\
 }\
 \
-tr.timeout > td:first-child {\
+tr.timeout {\
     color:red;\
 }\
 \
-tr.notrun > td:first-child {\
+tr.notrun {\
     color:blue;\
 }\
 \
-tr.optionalunsupported > td:first-child {\
+tr.optionalunsupported {\
     color:blue;\
 }\
 \
-.pass > td:first-child, .fail > td:first-child, .timeout > td:first-child, .notrun > td:first-child, .optionalunsupported > td:first-child {\
+.ok {\
+    color:green;\
+}\
+\
+.error {\
+    color:red;\
+}\
+\
+.pass, .fail, .timeout, .notrun, .optionalunsupported .ok, .timeout, .error {\
     font-variant:small-caps;\
 }\
 \
@@ -4044,22 +4186,6 @@ table#results span.actual {\
     font-family:DejaVu Sans Mono, Bitstream Vera Sans Mono, Monospace;\
     white-space:pre;\
 }\
-\
-span.ok {\
-    color:green;\
-}\
-\
-tr.error {\
-    color:red;\
-}\
-\
-span.timeout {\
-    color:red;\
-}\
-\
-span.ok, span.timeout, span.error {\
-    font-variant:small-caps;\
-}\
 ";
 
 })(self);
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html
new file mode 100644
index 00000000000..684de0cf0cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<div style="width: 100px; height: 100px; background: green"></div>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html
new file mode 100644
index 00000000000..b6f50cfa75d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>A foreignObject element containing will-change content is painted in correct order</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement"/>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="match" href="will-change-in-foreign-object-paint-order-ref.html">
+<svg style="width: 100px; height: 100px;">
+  <foreignObject width="100" height="100">
+    <div style="will-change: transform; width: 100px; height: 100px; background: red"></div>
+  </foreignObject>
+  <rect width="100" height="100" fill="green"></rect>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg b/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg
new file mode 100644
index 00000000000..b80f81095ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml"
+     class="reftest-wait">
+  <title>SVG Pattern: Inherited pattern removed after style change</title>
+  <h:link rel="help" href="https://svgwg.org/svg2-draft/pservers.html"/>
+  <h:link rel="match" href="reference/green-100x100.svg"/>
+  <h:script src="/common/rendering-utils.js"/>
+  <h:script src="/common/reftest-wait.js"/>
+  <pattern id="pattern" width="1" height="1">
+    <rect width="100" height="100" fill="orange"/>
+  </pattern>
+  <pattern id="inheritedPattern" href="#pattern"/>
+  <rect width="100" height="100" fill="url(#inheritedPattern) green"/>
+  <script>
+    waitForAtLeastOneFrame().then(() => {
+      let svg = document.querySelector('svg');
+      let pattern = document.getElementById("pattern");
+      svg.style.imageRendering = 'pixelated';
+      getComputedStyle(svg).imageRendering;
+      pattern.remove();
+      takeScreenshot();
+    });
+  </script>
+</svg>
diff --git a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
index d5e04b94d53..5df717758aa 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
@@ -1,3 +1,3 @@
-mypy==0.790
+mypy==0.800
 mypy-extensions==0.4.3
 typed-ast==1.4.2
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 0a5f16ef57e..f09fe242237 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -849,7 +849,7 @@ class ConfigBuilder(config.ConfigBuilder):
             "wss": ["auto"],
         },
         "check_subdomains": True,
-        "log_level": "debug",
+        "log_level": "info",
         "bind_address": True,
         "ssl": {
             "type": "pregenerated",
@@ -931,6 +931,9 @@ def build_config(override_path=None, config_cls=ConfigBuilder, **kwargs):
         else:
             raise ValueError("Config path %s does not exist" % other_path)
 
+    if kwargs.get("verbose"):
+        rv.log_level = "debug"
+
     overriding_path_args = [("doc_root", "Document root"),
                             ("ws_doc_root", "WebSockets document root")]
     for key, title in overriding_path_args:
@@ -963,6 +966,7 @@ def get_parser():
                         help="Disable the HTTP/2.0 server")
     parser.add_argument("--quic-transport", action="store_true", help="Enable QUIC server for WebTransport")
     parser.add_argument("--exit-after-start", action="store_true", help="Exit after starting servers")
+    parser.add_argument("--verbose", action="store_true", help="Enable verbose logging")
     parser.set_defaults(report=False)
     parser.set_defaults(is_wave=False)
     return parser
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index b8f1c7d8286..e4841bb5793 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -53,11 +53,11 @@ def get_timeout_multiplier(test_type, run_info_data, **kwargs):
     if kwargs["timeout_multiplier"] is not None:
         return kwargs["timeout_multiplier"]
     if test_type == "reftest":
-        if run_info_data["debug"] or run_info_data.get("asan"):
+        if run_info_data["debug"] or run_info_data.get("asan") or run_info_data.get("tsan"):
             return 4
         else:
             return 2
-    elif run_info_data["debug"] or run_info_data.get("asan"):
+    elif run_info_data["debug"] or run_info_data.get("asan") or run_info_data.get("tsan"):
         if run_info_data.get("ccov"):
             return 4
         else:
diff --git a/tests/wpt/web-platform-tests/touch-events/historical.html b/tests/wpt/web-platform-tests/touch-events/historical.html
index a6bd80e2bf5..16ddf519037 100644
--- a/tests/wpt/web-platform-tests/touch-events/historical.html
+++ b/tests/wpt/web-platform-tests/touch-events/historical.html
@@ -36,7 +36,7 @@ test(function() {
   assert_false("initTouchEvent" in TouchEvent.prototype,
                "Should not be supported on the prototype");
 
-  var touchEvent = document.createEvent("touchevent");
+  var touchEvent = new TouchEvent("touchstart");
   assert_false("initTouchEvent" in touchEvent,
                "Should not be supported on the instance");
 }, "TouchEvent::initTouchEvent");
diff --git a/tests/wpt/web-platform-tests/user-timing/mark.any.js b/tests/wpt/web-platform-tests/user-timing/mark.any.js
index 781bbcbfca6..7e814d2074c 100644
--- a/tests/wpt/web-platform-tests/user-timing/mark.any.js
+++ b/tests/wpt/web-platform-tests/user-timing/mark.any.js
@@ -35,7 +35,7 @@ test(function () {
 
   expectedTimes[0] = self.performance.now();
 
-  entries = self.performance.getEntriesByName("mark");
+  const entries = self.performance.getEntriesByName("mark");
   assert_equals(entries.length, 1);
 }, "Entry 0 is properly created");
 
@@ -45,67 +45,67 @@ test(function () {
 
     expectedTimes[1] = self.performance.now();
 
-    entries = self.performance.getEntriesByName("mark");
+    const entries = self.performance.getEntriesByName("mark");
     assert_equals(entries.length, 2);
 
 }, "Entry 1 is properly created");
 
 function test_mark(index) {
    test(function () {
-       entries = self.performance.getEntriesByName("mark");
+       const entries = self.performance.getEntriesByName("mark");
        assert_equals(entries[index].name, "mark", "Entry has the proper name");
    }, "Entry " + index + " has the proper name");
 
    test(function () {
-       entries = self.performance.getEntriesByName("mark");
+       const entries = self.performance.getEntriesByName("mark");
        assert_approx_equals(entries[index].startTime, expectedTimes[index], testThreshold);
    }, "Entry " + index + " startTime is approximately correct (up to " + testThreshold +
               "ms difference allowed)");
 
    test(function () {
-       entries = self.performance.getEntriesByName("mark");
+       const entries = self.performance.getEntriesByName("mark");
        assert_equals(entries[index].entryType, "mark");
    }, "Entry " + index + " has the proper entryType");
 
    test(function () {
-       entries = self.performance.getEntriesByName("mark");
+       const entries = self.performance.getEntriesByName("mark");
        assert_equals(entries[index].duration, 0);
    }, "Entry " + index +  " duration == 0");
 
    test(function () {
-    entries = self.performance.getEntriesByName("mark", "mark");
+    const entries = self.performance.getEntriesByName("mark", "mark");
     assert_equals(entries[index].name, "mark");
    }, "getEntriesByName(\"mark\", \"mark\")[" + index + "] returns an " +
                 "object containing a \"mark\" mark");
 
    test(function () {
-    entries = self.performance.getEntriesByName("mark", "mark");
+    const entries = self.performance.getEntriesByName("mark", "mark");
     match_entries(entries, index);
    }, "The mark returned by getEntriesByName(\"mark\", \"mark\")[" + index
       + "] matches the mark returned by " +
               "getEntriesByName(\"mark\")[" + index + "]");
 
    test(function () {
-    entries = filter_entries_by_type(self.performance.getEntries(), "mark");
+    const entries = filter_entries_by_type(self.performance.getEntries(), "mark");
     assert_equals(entries[index].name, "mark");
    }, "getEntries()[" + index + "] returns an " +
                 "object containing a \"mark\" mark");
 
    test(function () {
-    entries = filter_entries_by_type(self.performance.getEntries(), "mark");
+    const entries = filter_entries_by_type(self.performance.getEntries(), "mark");
     match_entries(entries, index);
    }, "The mark returned by getEntries()[" + index
       + "] matches the mark returned by " +
               "getEntriesByName(\"mark\")[" + index + "]");
 
    test(function () {
-    entries = self.performance.getEntriesByType("mark");
+    const entries = self.performance.getEntriesByType("mark");
     assert_equals(entries[index].name, "mark");
    }, "getEntriesByType(\"mark\")[" + index + "] returns an " +
                 "object containing a \"mark\" mark");
 
    test(function () {
-    entries = self.performance.getEntriesByType("mark");
+    const entries = self.performance.getEntriesByType("mark");
     match_entries(entries, index);
    }, "The mark returned by getEntriesByType(\"mark\")[" + index
       + "] matches the mark returned by " +
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js
index 35db2c73599..9bac1409f5a 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js
@@ -1,6 +1,5 @@
 // META: global=window,dedicatedworker,jsshell
 // META: script=assertions.js
-// META: script=/wasm/jsapi/wasm-constants.js
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 // Test cases for changes to the WebAssembly.Table constructor API that
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js
index 83b36a32415..e9488d0d4fa 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js
@@ -1,6 +1,5 @@
 // META: global=window,dedicatedworker,jsshell
 // META: script=assertions.js
-// META: script=/wasm/jsapi/wasm-constants.js
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 // Test cases for changes to the WebAssembly.Table.prototype.set() API that
diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js b/tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js
index ca20f425389..7fadbdbc2b4 100644
--- a/tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js
@@ -7,10 +7,14 @@
 
 idl_test(
   ['dom-overlays'],
-  ['webxr', 'html', 'dom'],
+  ['webxr', 'html', 'dom', 'SVG'],
   async idl_array => {
+    self.svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
     idl_array.add_objects({
-      // TODO: Add object instances
+      Document: ['document'],
+      HTMLElement: ['document.body'],
+      SVGElement: ['svgElement'],
+      Window: ['window']
     });
   }
 );