diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-003.html.ini
new file mode 100644
index 00000000000..ac08ad7579e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-003.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-round-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini
new file mode 100644
index 00000000000..25e90a4ae16
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-round-stretch-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini
new file mode 100644
index 00000000000..badbb71202c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-stretch-round-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-width-001.htm.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-width-001.htm.ini
new file mode 100644
index 00000000000..ae8039ca9f3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/border-image-width-001.htm.ini
@@ -0,0 +1,2 @@
+[border-image-width-001.htm]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/font-synthesis-position-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/font-synthesis-position-001.html.ini
new file mode 100644
index 00000000000..fdb738219b4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/font-synthesis-position-001.html.ini
@@ -0,0 +1,2 @@
+[font-synthesis-position-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-04.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-04.html.ini
new file mode 100644
index 00000000000..d061b5a841c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-04.html.ini
@@ -0,0 +1,2 @@
+[font-variant-position-04.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-05.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-05.html.ini
new file mode 100644
index 00000000000..a56252b51fa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/font-variant-position-05.html.ini
@@ -0,0 +1,2 @@
+[font-variant-position-05.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/inheritance.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/inheritance.html.ini
index b2eab0a3a88..9e4c85353fa 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/inheritance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/inheritance.html.ini
@@ -85,3 +85,6 @@
 
   [Property font-variant-emoji inherits]
     expected: FAIL
+
+  [Property font-synthesis has initial value weight style small-caps position]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-computed.html.ini
index d0f53384afe..b33156374a7 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-computed.html.ini
@@ -34,3 +34,21 @@
 
   [Property font-synthesis value 'weight style small-caps']
     expected: FAIL
+
+  [Property font-synthesis value 'position']
+    expected: FAIL
+
+  [Property font-synthesis value 'small-caps position']
+    expected: FAIL
+
+  [Property font-synthesis value 'style position']
+    expected: FAIL
+
+  [Property font-synthesis value 'style small-caps position']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight position']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight style small-caps position']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-position-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-position-valid.html.ini
new file mode 100644
index 00000000000..c0b4960afd4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-position-valid.html.ini
@@ -0,0 +1,6 @@
+[font-synthesis-position-valid.html]
+  [e.style['font-synthesis-position'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis-position'\] = "none" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-valid.html.ini
index dcb6a2c433e..79c01b21482 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/parsing/font-synthesis-valid.html.ini
@@ -28,3 +28,15 @@
 
   [e.style['font-synthesis'\] = "small-caps style weight " should set the property value]
     expected: FAIL
+
+  [e.style['font-synthesis'\] = "position" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position style" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position weight style" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position weight small-caps style" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
index c8501a56905..5d6fc3e8ed5 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
@@ -23,9 +23,6 @@
   [Test @font-face matching for weight 99]
     expected: FAIL
 
-  [Test @font-face matching for weight 100]
-    expected: FAIL
-
   [Test @font-face matching for weight 249]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
index 10e6dc50956..c53beb59870 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
@@ -1,3 +1,3 @@
 [background-image-tiled.https.html]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/backdrop-tree-abiding-slotted.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/backdrop-tree-abiding-slotted.html.ini
new file mode 100644
index 00000000000..eacab71a749
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/backdrop-tree-abiding-slotted.html.ini
@@ -0,0 +1,2 @@
+[backdrop-tree-abiding-slotted.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini
deleted file mode 100644
index 1893673d802..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-decoration-line-grammar-error-color-001.optional.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini
deleted file mode 100644
index 100e6c98bf2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-decoration-line-spelling-error-color-001.optional.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-005.html.ini
deleted file mode 100644
index 404fded9f9a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-breaking-atomic-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-006.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-006.html.ini
new file mode 100644
index 00000000000..6045172ba6a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-006.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-010.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-010.html.ini
new file mode 100644
index 00000000000..cf5b8690fa8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-010.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-011.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-011.html.ini
new file mode 100644
index 00000000000..239a3ccdfcf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-011.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-013.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-013.html.ini
new file mode 100644
index 00000000000..9aa5d9e2b4d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-013.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-014.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-014.html.ini
new file mode 100644
index 00000000000..2f3b3cc709f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-014.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-016.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-016.html.ini
new file mode 100644
index 00000000000..2cbf8d2756d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-016.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-018.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-018.html.ini
new file mode 100644
index 00000000000..52d31a10770
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-018.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-019.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-019.html.ini
new file mode 100644
index 00000000000..57df6098dd1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-019.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-020.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-020.html.ini
new file mode 100644
index 00000000000..482939ebb91
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-020.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-021.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-021.html.ini
new file mode 100644
index 00000000000..bcc066820d3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-021.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-021.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-022.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-022.html.ini
new file mode 100644
index 00000000000..504c2fccfa5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-022.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-024.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-024.html.ini
new file mode 100644
index 00000000000..920fd580010
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-024.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-024.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-026.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-026.html.ini
new file mode 100644
index 00000000000..a44892a287e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-atomic-026.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-026.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-replaced-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-replaced-003.html.ini
new file mode 100644
index 00000000000..a414a0f9440
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/line-breaking/line-breaking-replaced-003.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-replaced-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/is-where-parsing.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/is-where-parsing.html.ini
index 67581647c9b..dae62bf6253 100644
--- a/tests/wpt/meta-legacy-layout/css/selectors/is-where-parsing.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/selectors/is-where-parsing.html.ini
@@ -37,3 +37,6 @@
 
   [Nested inside :host, with trailing whitespace]
     expected: FAIL
+
+  [Pseudo-elements inside]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/events/remove-all-listeners.html.ini b/tests/wpt/meta-legacy-layout/dom/events/remove-all-listeners.html.ini
new file mode 100644
index 00000000000..c5607b3918d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/events/remove-all-listeners.html.ini
@@ -0,0 +1,6 @@
+[remove-all-listeners.html]
+  [Removing all listeners and then adding a new one should work.]
+    expected: FAIL
+
+  [Nested usage of once listeners should work.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-keepalive.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-keepalive.any.js.ini
index f61eb5b8e17..73c79c76452 100644
--- a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-keepalive.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-keepalive.any.js.ini
@@ -1,5 +1,4 @@
 [redirect-keepalive.any.html]
-  expected: TIMEOUT
   [[keepalive\][new window\][unload\] same-origin redirect]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
new file mode 100644
index 00000000000..33db434fab3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[sendondiscard.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini
deleted file mode 100644
index 9b4906adfc8..00000000000
--- a/tests/wpt/meta-legacy-layout/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[resources-with-0x00-in-header.window.html]
-  [Expect network error for frame navigation to resource with 0x00 in a header]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 741af78eff8..2fa561150d5 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -152,3 +152,6 @@
 
   [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: FAIL
+
+  [background-image sec-fetch-dest - Not sent to non-trustworthy same-site destination]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index 51fd557bd7f..d19311abec9 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -7,3 +7,9 @@
 
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
+
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
+    expected: FAIL
+
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
index 5a245d61359..bcda478adb1 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
@@ -1,6 +1,10 @@
 [javascript-url-referrer.window.html]
+  expected: TIMEOUT
   [unsafe-url referrer policy used to create the starting page]
     expected: FAIL
 
   [origin referrer policy used to create the starting page]
     expected: FAIL
+
+  [no-referrer referrer policy used to create the starting page]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..b169452e04a 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -10,12 +10,3 @@
 
   [0080 00FF set in href="" targeting a frame and clicked]
     expected: FAIL
-
-  [0080 00FF 0100 set in href="" targeting a frame and clicked]
-    expected: FAIL
-
-  [D83D DE0D set in href="" targeting a frame and clicked]
-    expected: FAIL
-
-  [DE0D 0041 set in href="" targeting a frame and clicked]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
similarity index 100%
rename from tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
rename to tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index 7a5fcb79165..00000000000
--- a/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
index 24c9e5d3926..90eb9ed743b 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
@@ -1,5 +1,4 @@
 [cross-origin-objects.html]
-  expected: TIMEOUT
   [Basic sanity-checking (cross-origin)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 4b4820d1729..00000000000
--- a/tests/wpt/meta-legacy-layout/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-font-size-math.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-font-size-math.html.ini
new file mode 100644
index 00000000000..addd810a23d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-font-size-math.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.disconnected-font-size-math.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
index 746b8f60fff..085f9a074cb 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
@@ -1,4 +1,4 @@
 [size.attributes.parse.minus.worker.html]
+  expected: CRASH
   [Parsing of non-negative integers]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
deleted file mode 100644
index 1404529e360..00000000000
--- a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[skip-another-top-level-browsing-context.html]
-  expected: TIMEOUT
-  [Autofocus elements queued in another top-level browsing context's documents should be skipped.]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/tables/table-column-width.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
index b0c28c2b4e3..83c8f68a2e7 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
@@ -1,2 +1,2 @@
 [table-column-width.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini
new file mode 100644
index 00000000000..a17d6e8fd93
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini
@@ -0,0 +1,2 @@
+[details-pseudo-elements-001.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index fe55ddae3f1..eacbe5794ea 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [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/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index f9138fb999a..6f7461b9472 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 76e34322dca..6bec7a732b8 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 071b4378add..cc18f512574 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -11,3 +11,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
similarity index 100%
rename from tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
rename to tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index e55f8f2ce3c..8845054116d 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   expected: TIMEOUT
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     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
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 7237f5792de..dbe1def99e3 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,4 +12,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
new file mode 100644
index 00000000000..964697e81e9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
@@ -0,0 +1,2 @@
+[strategy-worker-terminate.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7537329068..eed03df37f3 100644
--- a/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 88418a19c86..ab0bf490298 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -224,6 +224,13 @@
        {}
       ]
      ],
+     "missing-parent.html": [
+      "42ebb8814f55210438c4d6029dcf56d21bf8107c",
+      [
+       null,
+       {}
+      ]
+     ],
      "move-owned-inside-another-owned.html": [
       "babe8dcd1dc77cd8da462d029db7f2d270d4b00a",
       [
@@ -246,7 +253,7 @@
       ]
      ],
      "removed-from-flat-tree.html": [
-      "2deaf6ab390608a49d2ec93fe7082ed85605712b",
+      "bc5726fed367a22b551fd3e8e00329a35e822fe8",
       [
        null,
        {}
@@ -2898,6 +2905,13 @@
         {}
        ]
       ],
+      "table-caption-in-clipped-overflow.html": [
+       "116010565cf4d17dbf7528c6432861268af04991",
+       [
+        null,
+        {}
+       ]
+      ],
       "table-caption-inline-block-remove-child.html": [
        "721f1e888903759ba5fd38281cf26e1674df48f5",
        [
@@ -4239,6 +4253,13 @@
        null,
        {}
       ]
+     ],
+     "stylesheet-dom-mutation-event-crash.html": [
+      "942660c7a53e194455aa04ad6e2b1e902f322449",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "cssom-view": {
@@ -9247,7 +9268,14 @@
      ]
     ],
     "aria-describedby-manual.html": [
-     "4cffe6fcb057320fa3f0164ebd56a478ea356387",
+     "696c30a6b46633eaa36b39e0ef059008d79d15c2",
+     [
+      null,
+      {}
+     ]
+    ],
+    "aria-description-manual.html": [
+     "75746781ead55da633d5304c5ee91e079f5e3582",
      [
       null,
       {}
@@ -9331,14 +9359,14 @@
      ]
     ],
     "aria-errormessage_aria-invalid_false-manual.html": [
-     "985a8213ecfdb24850d12fd0b1230a7104dc819a",
+     "c000b3ddb3e4f5aa7d76deada62decb3c33c4a94",
      [
       null,
       {}
      ]
     ],
     "aria-errormessage_aria-invalid_true-manual.html": [
-     "590a234c6237638630da834cb31ff44e767c35d8",
+     "201565f7107d0eec096b6934801818ed97c5aca0",
      [
       null,
       {}
@@ -9751,7 +9779,7 @@
      ]
     ],
     "aria-readonly_false-manual.html": [
-     "7be1a70e4733ee682fc5e642fbd42a077ef138ae",
+     "2c93587ced8045477df4183107a1f3256d5a8230",
      [
       null,
       {}
@@ -10058,6 +10086,13 @@
       {}
      ]
     ],
+    "comment-manual.html": [
+     "6c7d7a1b169c3f2ec151ba5dc0976f7de7b5f3bd",
+     [
+      null,
+      {}
+     ]
+    ],
     "complementary-manual.html": [
      "abecfd4ad83731014b43f42918841db21a7def77",
      [
@@ -10150,7 +10185,7 @@
      ]
     ],
     "form-manual.html": [
-     "b533412093f0d0356d0065b4ae9cb6861f7babb5",
+     "dcb6566b1bd9fe7afc1af9c4e16a31d9c490ba60",
      [
       null,
       {}
@@ -10696,7 +10731,7 @@
      ]
     ],
     "tab-manual.html": [
-     "89b8b48c56ef791c16dc4f03c2c1432cd7a09a89",
+     "98a1c4374a7ec4ab5f14b1d802f77b8e159e11d2",
      [
       null,
       {}
@@ -29194,6 +29229,19 @@
        {}
       ]
      ],
+     "abspos-overflow-hidden-001-print.html": [
+      "12d8a679ad7351090d743ebd0d59e9cbd39e9122",
+      [
+       null,
+       [
+        [
+         "/css/css-break/abspos-overflow-hidden-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "block-001-wm-vlr-print.html": [
       "6cd5ea07c7b2a132cef7d26abd4204cb157b5eae",
       [
@@ -29510,6 +29558,30 @@
        ],
        {}
       ]
+     ],
+     "zero-height-page-break-001-print.html": [
+      "3e3fb82628a1ab4bab53de8f1874ee5c605883e5",
+      [
+       null,
+       [
+        [
+         "/css/css-break/zero-height-page-break-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "page_ranges": {
+         "/css/css-break/zero-height-page-break-001-print.html": [
+          [
+           1
+          ],
+          [
+           2
+          ]
+         ]
+        }
+       }
+      ]
      ]
     },
     "css-flexbox": {
@@ -30929,6 +31001,19 @@
        {}
       ]
      ],
+     "monolithic-overflow-023-print.html": [
+      "c047d4865751892503c5b8341b5c3a79eb7ad5f5",
+      [
+       null,
+       [
+        [
+         "/css/printing/monolithic-overflow-023-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "no-resize-event-print.html": [
       "85a44b556cd263d1026f3e6a83b6bfa97263400e",
       [
@@ -31176,6 +31261,48 @@
        {}
       ]
      ],
+     "subpixel-page-size-001-print.html": [
+      "9054cd4513f73edd4a8674a106ba7e6358b2e91b",
+      [
+       null,
+       [
+        [
+         "/css/printing/subpixel-page-size-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "page_ranges": {
+         "/css/printing/subpixel-page-size-001-print.html": [
+          [
+           2
+          ]
+         ]
+        }
+       }
+      ]
+     ],
+     "subpixel-page-size-002-print.html": [
+      "463cb21f25d7c2acf500d31729508375fa7e4cdf",
+      [
+       null,
+       [
+        [
+         "/css/printing/subpixel-page-size-002-print-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "page_ranges": {
+         "/css/printing/subpixel-page-size-002-print.html": [
+          [
+           2
+          ]
+         ]
+        }
+       }
+      ]
+     ],
      "transform-001-print.html": [
       "f19b889d07ba01219b14b4a3c11c8ab545d10e20",
       [
@@ -136718,6 +136845,19 @@
        {}
       ]
      ],
+     "border-image-013.html": [
+      "c7cc7d54a39e5aeb9fbf3e0eca77e94786abfbc6",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-013-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-017.xht": [
       "33492ca78b31e3078c9c63616340672aed356478",
       [
@@ -136877,6 +137017,19 @@
        {}
       ]
      ],
+     "border-image-repeat-round-003.html": [
+      "c2cb2372bc71acfc65946d10384a957653216162",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-repeat-round-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-repeat-round-1.html": [
       "c4dc17cf7df08fde88cc19114a7792dc9a7b5674",
       [
@@ -136935,6 +137088,19 @@
        }
       ]
      ],
+     "border-image-repeat-round-stretch-001.html": [
+      "2a23e789f905a2bd07496d805f94426ce51de682",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-repeat-round-stretch-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-repeat-round.html": [
       "cf87e8d16306ed34a11b7e89f7d88fe1f1212c12",
       [
@@ -137213,6 +137379,19 @@
        {}
       ]
      ],
+     "border-image-repeat-stretch-round-001.html": [
+      "2ac51fecf23c32eba35779bb8ba9f18d43030559",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-repeat-stretch-round-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-round-and-stretch.html": [
       "a9b4da706d39ab85617f8a952987d3035e0fc400",
       [
@@ -137349,6 +137528,19 @@
        }
       ]
      ],
+     "border-image-slice-006.htm": [
+      "45feaf60ad7ba15066e5ec4de6273f2a48c4ed0f",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-slice-006-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-slice-007.htm": [
       "e9c1827fc76c00f0bb81a23f27335a2f2074ace2",
       [
@@ -137523,6 +137715,19 @@
        }
       ]
      ],
+     "border-image-width-001.htm": [
+      "2a5d02e8acc53f8e6525c95a07132482e27842d7",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-image-width-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-width-005.xht": [
       "eeceedef90e9a74a20e151b346e9030fe05d84ea",
       [
@@ -140126,6 +140331,32 @@
        {}
       ]
      ],
+     "block-in-inline-008.html": [
+      "013cb8447e4e824874e439a1e7b213eeb78d54f7",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "block-in-inline-009.html": [
+      "0acb317464f847405df6f8061f5c23fd66eebb2f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "block-max-height-001.html": [
       "acb4316d13eee6d791e8c27e5e1b8ab2be03e0ac",
       [
@@ -144613,6 +144844,45 @@
        {}
       ]
      ],
+     "float-013.html": [
+      "5f8c595c042a5bbad8f6687862a0675e95afed17",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "float-014.tentative.html": [
+      "95c9d6f89f2aa28cdac9b1b03f6a1978b97ff93b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "float-015.tentative.html": [
+      "885edbc84c6368c1b3287104597de6b071debd7f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "float-in-self-collapsing-block-000.html": [
       "e42d941e78ab45e9107ac49ee8c8c2b4c6d43c9d",
       [
@@ -150918,6 +151188,19 @@
        {}
       ]
      ],
+     "scope-visited.html": [
+      "afccb41a4f2f21fb0f81b4f7d7e1c311b5613348",
+      [
+       null,
+       [
+        [
+         "/css/css-cascade/scope-visited-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "unset-val-001.html": [
       "857cb5d40dc40bfe800290fd6d4aa1c39c33ffd9",
       [
@@ -160906,7 +161189,7 @@
        ]
       ],
       "content-visibility-085.html": [
-       "2148d89317f581e28cf7cbc5669ac6d0f3c5ce8f",
+       "b451746bbba7729bc59bf355fa20c680c203547d",
        [
         null,
         [
@@ -166204,7 +166487,7 @@
       ]
      ],
      "display-contents-shadow-dom-1.html": [
-      "1f391163da043cb664558beb686a2b195c067899",
+      "45dd6d9b775327890a32ba537bed45a122753479",
       [
        null,
        [
@@ -168305,7 +168588,7 @@
     },
     "css-fill-stroke": {
      "paint-order-001.tentative.html": [
-      "c8c2b4239a8e65ff168cc9c6c8f87bb1f420e1a7",
+      "9d1604116ba4a432740f09285e7bb9e348585796",
       [
        null,
        [
@@ -168314,7 +168597,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            5
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ]
     },
@@ -182178,6 +182477,19 @@
        {}
       ]
      ],
+     "font-synthesis-position-001.html": [
+      "1ed13f67c1950f3abf4b599c2b58ad1b0db3d169",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-synthesis-position-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-synthesis-small-caps-first-letter.html": [
       "9e31777c73af5763c8c093fd6820becab033fe2a",
       [
@@ -183244,6 +183556,32 @@
        {}
       ]
      ],
+     "font-variant-position-04.html": [
+      "de1cbd8779509a602be2032adbd27ce478ee0077",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-variant-position-04-notref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "font-variant-position-05.html": [
+      "f93cb9861732768b5c2ebaacb43be00992d931c2",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-variant-position-05-notref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-variant-position.html": [
       "857062407dbdac2fe8ad803a14f48f647461f323",
       [
@@ -188157,7 +188495,7 @@
        ]
       ],
       "grid-repeat-max-width-001.html": [
-       "8e693437a21ee203b22988c890a9b576369fc629",
+       "15a9f8a14c3a418cbb33b1ffd97b0f51f40548b0",
        [
         null,
         [
@@ -194411,6 +194749,19 @@
         }
        ]
       ],
+      "gradient-none-interpolation.html": [
+       "a3905b07cee45153b2a2cdd0c73f22a673c9d5cb",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-none-interpolation-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "legacy-color-gradient.html": [
        "e6af42103b9407221bfeae6e74b5379dc7379441",
        [
@@ -204107,7 +204458,7 @@
        ]
       ],
       "clip-path-borderBox-1c.html": [
-       "f050159385db68a1b940d8125836bdbdc09c45b2",
+       "91f3c9da6b78cb731e18e4f1e364273eef9d65b1",
        [
         null,
         [
@@ -204123,11 +204474,11 @@
            [
             [
              0,
-             52
+             64
             ],
             [
              0,
-             355
+             368
             ]
            ]
           ]
@@ -204832,6 +205183,35 @@
         }
        ]
       ],
+      "clip-path-fillBox-1b.html": [
+       "d77fd716fd5ae18188518d08996dfff5f5650ce4",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             52
+            ],
+            [
+             0,
+             355
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "clip-path-filter-order.html": [
        "5806e75d536cc34a4610630782e5cdfd4b5e552d",
        [
@@ -204952,6 +205332,45 @@
         {}
        ]
       ],
+      "clip-path-inline-004.html": [
+       "8061a91988c0a1ec17c7182c83977a2471728f62",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-inline-005.html": [
+       "39dac759e2a34a154eaaba06bfa8d35af27187d9",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-inline-006.html": [
+       "7a37c04f441a5bc642f450db4e622dc1927be6f9",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-inset-round-percent.html": [
        "cb0e5ec73575c83954253bdcf394290b4f4d200e",
        [
@@ -205595,7 +206014,7 @@
        ]
       ],
       "clip-path-strokeBox-1a.html": [
-       "31fec7516ca95ed541643936dbd831e52b9be83c",
+       "de6d907a78fe1c4cb2f8c9028bfc857e74eef06f",
        [
         null,
         [
@@ -205611,11 +206030,11 @@
            [
             [
              0,
-             52
+             64
             ],
             [
              0,
-             355
+             368
             ]
            ]
           ]
@@ -205847,7 +206266,7 @@
        ]
       ],
       "clip-path-viewBox-1c.html": [
-       "26f2750e3244e1fc943317196f846b455ef1577f",
+       "adc00493c5e170dc3936215e9804953d13d57fe2",
        [
         null,
         [
@@ -205863,11 +206282,40 @@
            [
             [
              0,
-             52
+             64
             ],
             [
              0,
-             355
+             368
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-viewBox-1d.html": [
+       "3d5f355825b7f4601dd52ef17eb867c88b83d90d",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             64
+            ],
+            [
+             0,
+             368
             ]
            ]
           ]
@@ -206487,6 +206935,32 @@
         {}
        ]
       ],
+      "clip-path-inset-stroke-001.svg": [
+       "06c810cd1119d76b9a6c903249d6d4015c25cd1f",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-inset-stroke-002.svg": [
+       "bfc60355bac88acc48c1a5b87115a5fced653a55",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-invalid.svg": [
        "85aa3a825b92d928bd32c197bfc9bdbfa074e0be",
        [
@@ -206881,7 +207355,7 @@
        ]
       ],
       "clip-path-shape-circle-004.svg": [
-       "044b2ecc9e16e5c617ede8915db6169cc4ab65d9",
+       "be5ad144e5161093be56ded6609397bd8dd52dff",
        [
         null,
         [
@@ -206901,7 +207375,7 @@
             ],
             [
              0,
-             76
+             78
             ]
            ]
           ]
@@ -212973,7 +213447,7 @@
       ]
      ],
      "multicol-width-ch-001.xht": [
-      "5774d353e6e78e0672b2edc2726225f2207c451a",
+      "077693d129ba37d4c41566883af34d8cdedbeac4",
       [
        null,
        [
@@ -214240,7 +214714,7 @@
       ]
      ],
      "nest-containing-forgiving.html": [
-      "d399142f7efb998db7ff8dffae0770c5bcea0cc2",
+      "561b5a3af5e73063acd58203be6dd476346137bc",
       [
        null,
        [
@@ -225363,6 +225837,97 @@
        {}
       ]
      ],
+     "scrollbar-color-011.html": [
+      "90b6c45cdecb5dcdccc6e1f32adba39e31d2e9b3",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-1.html": [
+      "0b4820c7b7ef2cb72df4e46de18c7b0c0f9c6bbb",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-2.html": [
+      "4adce84f246a8e48168cc330baed775b49bb8dcf",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-2-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-3.html": [
+      "0bb72a68e4ac57210311e0c3fa2d8ac91aac8862",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-4.html": [
+      "e8cd6e1e7c60a73a2ddc4ba94c35be9fde9e3376",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-4-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-5.html": [
+      "2faa28caac0785e2b39e649d3b9e4baf666ac57e",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-5-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scrollbar-color-dynamic-6.html": [
+      "85791297529ac2166ad52afcddb05d3e84618f6b",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-6-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scrollbar-color-scheme-dynamic-1.html": [
       "71fd97f27419316f5d923dce5673a3f0e0d87633",
       [
@@ -240218,7 +240783,7 @@
        ]
       ],
       "line-breaking-atomic-003.html": [
-       "dea68b0f876da924d06cdb48e1ce28850bd84550",
+       "39c50250f58124a59612ed8318a981ed61e48633",
        [
         null,
         [
@@ -240231,12 +240796,12 @@
        ]
       ],
       "line-breaking-atomic-004.html": [
-       "c10492f5c6c722bd81e75b5c9214fc78cd9faf8a",
+       "fc27424026dc6ae7b60b7c67f0ee94831881af54",
        [
         null,
         [
          [
-          "/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html",
+          "/css/reference/ref-filled-green-100px-square.xht",
           "=="
          ]
         ],
@@ -240244,12 +240809,12 @@
        ]
       ],
       "line-breaking-atomic-005.html": [
-       "9901b013bb6885d0ef59fac0504a4eb1ea7fe73c",
+       "900487118c11288c5624db7964e542f95110fb3b",
        [
         null,
         [
          [
-          "/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html",
+          "/css/reference/ref-filled-green-100px-square.xht",
           "=="
          ]
         ],
@@ -240257,7 +240822,7 @@
        ]
       ],
       "line-breaking-atomic-006.html": [
-       "bd3573bb7e8a1ce81886a2d86b3fb731bd09d0da",
+       "5552ec022744107804426ff75d7e308be6afa863",
        [
         null,
         [
@@ -240308,6 +240873,240 @@
         {}
        ]
       ],
+      "line-breaking-atomic-010.html": [
+       "318da447f96515d63248f21d3d8d59e9003b4d8b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-011.html": [
+       "06fc493a666233640fad3beb0d92951300383429",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-012.html": [
+       "5bd3423f6ed2fcb736ad114c55e6482d7a6eb485",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-013.html": [
+       "04a0ef7bc0ca5d31f0392c47963550691f3ee620",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-014.html": [
+       "70bc118c6f6d7536b318668c888a45444827e50c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-015.html": [
+       "f696ce0a14f594500587a663b6d818cc306ae8cd",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-016.html": [
+       "a3bbe40118b2a61cef99774d0ea64f659d4c1175",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-017.html": [
+       "ac62af6ce0d4a318ea8f4f7bb6bb71b899865f6c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-018.html": [
+       "3517dcebce79d3f4ce55e6632eeb86130ed5dc74",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-019.html": [
+       "2c173063154bbf73e7ccca1eacceb02b9f5bac44",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-020.html": [
+       "02bd61f83d64c62ea3a0fb876bdf4f4d69a77b96",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-021.html": [
+       "14c3dfbf037e659efbc5f0cf0c2bd41846dacdeb",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-022.html": [
+       "b3541e9a21a6253081f4b26af442f98416229947",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-023.html": [
+       "8616ca60aadc50e7c2951a9cfe06e601d9c15621",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-024.html": [
+       "b823dace2bdfdde92b56f4a5d0ba325a0b30c073",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-025.html": [
+       "541a82de9668c74fed61d65623a81b695b52c422",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-026.html": [
+       "2b52e730415aa8d3ff7e2c91742ef0186965216c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-breaking-atomic-027.html": [
+       "acbe4edf07516c775b42c29b4d26d9b689f98a96",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "line-breaking-ic-001.html": [
        "5d34a05692ae4ea2f3e1d0ecb2c2f7f644e9593f",
        [
@@ -240361,7 +241160,7 @@
        ]
       ],
       "line-breaking-replaced-002.html": [
-       "8f3d229dd2596efde6f726b163d840cb2041b7b5",
+       "d50c104ed0bc2f3568697f1f86dc9238152bc59b",
        [
         null,
         [
@@ -240374,7 +241173,7 @@
        ]
       ],
       "line-breaking-replaced-003.html": [
-       "aae116c0f9d8dd12020921f7c8f240773b3051e6",
+       "81b15d9d4cb8567715e498d9fb9f0768198e876d",
        [
         null,
         [
@@ -252929,39 +253728,13 @@
        {}
       ]
      ],
-     "text-decoration-line-grammar-error-color-001.optional.html": [
-      "6309d73a0e700a66731ea5270b10eba56e2ab708",
+     "text-decoration-line-grammar-error-color-001.html": [
+      "e9560bb47cfa11aa1b6b2a58b0f5f6c956f1e2b3",
       [
        null,
        [
         [
          "/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html",
-         "!="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "text-decoration-line-grammar-error-color-002.optional.html": [
-      "1758933a50ca866efa538a0aa15ff367f26667d3",
-      [
-       null,
-       [
-        [
-         "/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "text-decoration-line-grammar-error-color-dynamic-001.optional.html": [
-      "58ff6aeb5cdf06ec1deae1b91c15348778e3a877",
-      [
-       null,
-       [
-        [
-         "/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html",
          "=="
         ]
        ],
@@ -252981,39 +253754,13 @@
        {}
       ]
      ],
-     "text-decoration-line-spelling-error-color-001.optional.html": [
-      "5e5475fe2dd50a76086552b98b2a457013bd6c64",
+     "text-decoration-line-spelling-error-color-001.html": [
+      "e2855f04aa67419f785382787764aa982216ad5b",
       [
        null,
        [
         [
          "/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html",
-         "!="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "text-decoration-line-spelling-error-color-002.optional.html": [
-      "3a87976f2923171fa5e4f2ea7b0945843c13fa7f",
-      [
-       null,
-       [
-        [
-         "/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "text-decoration-line-spelling-error-color-dynamic-001.optional.html": [
-      "d712e354bb94361691be6134cffd5fb7c917891f",
-      [
-       null,
-       [
-        [
-         "/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html",
          "=="
         ]
        ],
@@ -310865,6 +311612,58 @@
         ],
         {}
        ]
+      ],
+      "lang-016.html": [
+       "4923890fe649618095275d2f3c46bc87d928ee56",
+       [
+        null,
+        [
+         [
+          "/css/selectors/selectors-4/lang-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "lang-017.html": [
+       "d5c86e5b779d095702aea1d45fc039e7cf1553f5",
+       [
+        null,
+        [
+         [
+          "/css/selectors/selectors-4/lang-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "lang-018.html": [
+       "2f777a2ab4f4beb968df03ebf8fd2feb481c246b",
+       [
+        null,
+        [
+         [
+          "/css/selectors/selectors-4/lang-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "lang-019.html": [
+       "a1e793cdacfeb5674cc49744ab2afb5da7fffbe3",
+       [
+        null,
+        [
+         [
+          "/css/selectors/selectors-4/lang-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "selectors-attr-many.html": [
@@ -319018,6 +319817,19 @@
         {}
        ]
       ],
+      "details-pseudo-elements-001.tentative.html": [
+       "08321977c6b4abe71b88d6fa448b088688dccb45",
+       [
+        null,
+        [
+         [
+          "/html/rendering/the-details-element/details-pseudo-elements-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "details-revert.html": [
        "760cc8281e820d2ef256eb22d88d7aa8f090b821",
        [
@@ -328673,6 +329485,19 @@
         ],
         {}
        ]
+      ],
+      "view-viewbox-override.html": [
+       "83976f4d1363177a789eb6d80a86a18c015914d3",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      }
     },
@@ -334511,7 +335336,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "3f31846aa59e3bc7b8f0235098febedeed97d317",
+    "75a87df90f082ba787fbf1d5c00f4148867d03db",
     []
    ],
    ".gitattributes": [
@@ -359562,7 +360387,7 @@
      ],
      "fedcm": {
       "accounts.py": [
-       "1ec7f7dc1242449d7bc38a52fa2ac906a9d9a27d",
+       "dabc2c6f9f923ac23543787733951cec99a96e55",
        []
       ],
       "client_metadata.py": [
@@ -359638,7 +360463,7 @@
        []
       ],
       "two_accounts.py": [
-       "c355d21f1f2062516edd383a6ba953d4dc408eb5",
+       "75ebf51056ca02b05185a8564ab9b128b08a9c0e",
        []
       ],
       "userinfo-iframe.html": [
@@ -359647,7 +360472,7 @@
       ]
      },
      "fedcm-helper.sub.js": [
-      "2e8f8066817834b884f4cffb0fb18c4dba929c3a",
+      "c422c6594ce7a4d8e9dabb435127dcfca8317ab7",
       []
      ],
      "fedcm-iframe-level2.html": [
@@ -379665,6 +380490,10 @@
        "c11db014019ff4616f7a1c259773194d71630f74",
        []
       ],
+      "border-image-013-ref.html": [
+       "789afe1a7a2f784244dec64796b3f4ee04121390",
+       []
+      ],
       "border-image-image-type-003-ref.html": [
        "690f9ad11ad0e63d57c8c7ee10737690b7c8a061",
        []
@@ -379677,14 +380506,26 @@
        "0086544c0f75ac9466264dba8fd40aba6edc959b",
        []
       ],
+      "border-image-repeat-round-003-ref.html": [
+       "4b63a4c032e02f08fb9d436e536fe9839dd24c6c",
+       []
+      ],
       "border-image-repeat-round-ref.html": [
        "327013a93369af6cf023fef0668a4c5060e04f24",
        []
       ],
+      "border-image-repeat-round-stretch-001-ref.html": [
+       "32253750f0b845fbb8218dc286232674a81b6590",
+       []
+      ],
       "border-image-repeat-space-011-ref.html": [
        "226140d15235f68b6966fe3ed832e3d36337fd0b",
        []
       ],
+      "border-image-repeat-stretch-round-001-ref.html": [
+       "931dd3be5e870a85cdf16823b7a723cf7c1eb06f",
+       []
+      ],
       "border-image-round-and-stretch-ref.html": [
        "4f0ffdbc526a4c3f899cc72277f9d46688538c6b",
        []
@@ -379705,6 +380546,10 @@
        "d4a4040a7854d7578e94b372650318792925f662",
        []
       ],
+      "border-image-slice-006-ref.html": [
+       "d4312675731e10f5f461d5a1c37891e6c1005455",
+       []
+      ],
       "border-image-slice-007-ref.html": [
        "2581d8dabfc7927c6ce8c1a5bedd9ccb2af82e52",
        []
@@ -379721,6 +380566,10 @@
        "22c5f4dfb8b40fddeb3eeb0af52056dfebf623e1",
        []
       ],
+      "border-image-width-001-ref.html": [
+       "a3e1a91eef02acf577a36f23aeef0a7f9d687c9f",
+       []
+      ],
       "border-image-width-009-ref.html": [
        "cc922984355c263bcf2caf8a45520c478790c99b",
        []
@@ -380009,6 +380858,10 @@
        "c372de1dbd264ede31344915236b9420147586e4",
        []
       ],
+      "4bicolor-squares.png": [
+       "252710dc44d8b3965d3109840f29550f0e46fbca",
+       []
+      ],
       "500x500-red-with-green-center.png": [
        "263102bf8aade13ccfb5e7b1c8f375e3f7a61a7b",
        []
@@ -380145,6 +380998,10 @@
        "97a94592dd597b75d164592f54d5db2d2023011c",
        []
       ],
+      "green-dot.png": [
+       "034353e234e50a2fc858736e0fa619ca17e4ec53",
+       []
+      ],
       "green.png": [
        "5c5217b1e7b27ef88f06cf3ced87f5e115eadbe6",
        []
@@ -380496,6 +381353,10 @@
       "b7013a90ab3834935522850a8cf5e02bf04fe7ef",
       []
      ],
+     "abspos-overflow-hidden-001-print-ref.html": [
+      "08f69ef6a1e8e464193a905e57153d7e3392d28d",
+      []
+     ],
      "background-attachment-fixed-ref.html": [
       "344c9d31643350f6e816804a3ad9cf30aad27a65",
       []
@@ -380995,6 +381856,10 @@
      "underflow-from-next-page-print-ref.html": [
       "5c444b7220436690b42c6b22ff8be424df36680a",
       []
+     ],
+     "zero-height-page-break-001-print-ref.html": [
+      "d56687c9e525ee062bfa74a751ca2ada717a0add",
+      []
      ]
     },
     "css-cascade": {
@@ -381054,6 +381919,10 @@
       "661016619c0c46c113dedc57aa890f62b35e137c",
       []
      ],
+     "scope-visited-ref.html": [
+      "91efd659216ab1de4efdfe2cac961bc6200ae62b",
+      []
+     ],
      "support": {
       "test-green.css": [
        "da8e1014d2a95eb3300124b8d6b7c2baa04b8fcd",
@@ -383981,7 +384850,7 @@
       []
      ],
      "display-contents-shadow-dom-1-ref.html": [
-      "df3aaf3374000bc08032374bc1f6d171b94d3778",
+      "324cfc3cecf4f8a1a53fcdc34b53d98339ad68c8",
       []
      ],
      "display-contents-sharing-001-ref.html": [
@@ -386888,6 +387757,10 @@
       "428c8c401856627c81bc7d03663317fd76bbf08b",
       []
      ],
+     "font-synthesis-position-001-ref.html": [
+      "228dc652f29d0cd1d73f0d88b8d970699070191e",
+      []
+     ],
      "font-synthesis-small-caps-first-letter-ref.html": [
       "8f66b7b298a7c247b6848527ac0fec1ee0de8286",
       []
@@ -387220,6 +388093,14 @@
       "2b85be140e45d1513e45d807b20976c8f7c4478f",
       []
      ],
+     "font-variant-position-04-notref.html": [
+      "5bfe6db4331e861c0dbb090161105ea149d3831e",
+      []
+     ],
+     "font-variant-position-05-notref.html": [
+      "a79c7b83a77f67e098721e7194a26dd297b6c246",
+      []
+     ],
      "font-variant-position-ref.html": [
       "8e71f7e153b6d9c7e9049c81f18b06d0d089746e",
       []
@@ -395605,6 +396486,10 @@
        "b4a36ff6d0e43b38d670472dd56a0eb44b31ea2c",
        []
       ],
+      "gradient-none-interpolation-ref.html": [
+       "e1503d3f122217dc383c4dd77e899153d138378a",
+       []
+      ],
       "oklab-gradient-ref.html": [
        "ca2232e38096157847a2430e721f9eb73cf68185",
        []
@@ -397521,6 +398406,18 @@
        "b9ee9ab63b09a118630724d8033df543ec739476",
        []
       ],
+      "clip-path-inline-004-ref.html": [
+       "9dfce3f7fae6e3c9c49661eb432d8df4363afc4c",
+       []
+      ],
+      "clip-path-inline-005-ref.html": [
+       "9dfce3f7fae6e3c9c49661eb432d8df4363afc4c",
+       []
+      ],
+      "clip-path-inline-006-ref.html": [
+       "9dfce3f7fae6e3c9c49661eb432d8df4363afc4c",
+       []
+      ],
       "clip-path-inset-round-percent-ref.html": [
        "597481d7dbe99afb764ad5f1e5603c5dd0240bee",
        []
@@ -398855,7 +399752,7 @@
       []
      ],
      "multicol-width-ch-ref.xht": [
-      "8adefc11e76800c076e8e888e3a21129ef17b10d",
+      "75002b419d206f6d5d5bc710d8640e3baf1bfc58",
       []
      ],
      "multicol-width-invalid-001-ref.xht": [
@@ -399185,7 +400082,7 @@
       []
      ],
      "nest-containing-forgiving-ref.html": [
-      "36b07c92b6fdcbb9bca66a4292bd871af7e7d696",
+      "8fb7c8674a534aa6e68501916616304064696145",
       []
      ],
      "nesting-basic-ref.html": [
@@ -401880,6 +402777,34 @@
       "890179a21c68bc7051c1db252fb7550468bb952e",
       []
      ],
+     "scrollbar-color-011-ref.html": [
+      "a4db731eb0ddc19c9b51e8b365def94e156f2db1",
+      []
+     ],
+     "scrollbar-color-dynamic-1-ref.html": [
+      "b431edf4240257aee7df076805baf93a7d19d1ae",
+      []
+     ],
+     "scrollbar-color-dynamic-2-ref.html": [
+      "94e5841ef296680dc58ed6eead85db956972fe12",
+      []
+     ],
+     "scrollbar-color-dynamic-3-ref.html": [
+      "3551f3bbaa6114a9def8449b760e69a14f2355d3",
+      []
+     ],
+     "scrollbar-color-dynamic-4-ref.html": [
+      "b10df541489aa0b19372ca8a60dfb136365c57d7",
+      []
+     ],
+     "scrollbar-color-dynamic-5-ref.html": [
+      "667d5b3be36f0b4e634c124a65c05a9666d544ae",
+      []
+     ],
+     "scrollbar-color-dynamic-6-ref.html": [
+      "d4c6a169817e916b758e818121bcdc7628a9a9ce",
+      []
+     ],
      "scrollbar-color-scheme-dynamic-1-ref.html": [
       "ec54bc08a721f2b6d4eff3a6422fdc816a4cbeae",
       []
@@ -405250,14 +406175,6 @@
         "fad3f46f1a872bf44477263c72cafb0fa0c8aa12",
         []
        ],
-       "line-breaking-atomic-004-ref.html": [
-        "022004bfc70268dbe22d6731f323ba3bfe8246b8",
-        []
-       ],
-       "line-breaking-atomic-005-ref.html": [
-        "bd88329ad0eac9866ea4b195ebad6327ec83007c",
-        []
-       ],
        "line-breaking-atomic-007-ref.html": [
         "86bee401970cca02b14cca850899103a77c4e12d",
         []
@@ -405279,11 +406196,11 @@
         []
        ],
        "line-breaking-replaced-002-ref.html": [
-        "ae6f20488e2abc063cc656d2ae52cb460e08bec3",
+        "8ab22c33e3076838e7c3d2f8659faa0380f91778",
         []
        ],
        "line-breaking-replaced-003-ref.html": [
-        "570f005418b228f0378a676607964f6fbb062ac7",
+        "a1721545b7624356558f6ede5349cced0536e60d",
         []
        ],
        "line-breaking-replaced-004-ref.html": [
@@ -407999,27 +408916,11 @@
       []
      ],
      "text-decoration-line-grammar-error-color-001-ref.html": [
-      "2592110a1199515b6376d21a963132bfe90400bc",
-      []
-     ],
-     "text-decoration-line-grammar-error-color-002-ref.html": [
-      "2416ba8dd6b759338df37bbd63fa4dcc0f1e1336",
-      []
-     ],
-     "text-decoration-line-grammar-error-color-dynamic-001-ref.html": [
-      "e54b6814ec15857c98086e681cdbbdcd01b6095c",
+      "50adea0c27b5d72a4b24238c9a9cf5b34acba2b1",
       []
      ],
      "text-decoration-line-spelling-error-color-001-ref.html": [
-      "9cd5199eb85d40e1ebe9d1ca6fd1778deea2d5da",
-      []
-     ],
-     "text-decoration-line-spelling-error-color-002-ref.html": [
-      "b8bd681184366917e66ea8f43f37399a09718a4d",
-      []
-     ],
-     "text-decoration-line-spelling-error-color-dynamic-001-ref.html": [
-      "e96898a81ef34410b775d73819deb78eb1665c4f",
+      "d20e4e49b3854e22d3dc4822bc16ffa920799911",
       []
      ],
      "text-emphasis-color-property-001-ref.html": [
@@ -416604,6 +417505,10 @@
       "64572dd6392d79e6bda89e64f8e8f58e08898dc0",
       []
      ],
+     "monolithic-overflow-023-print-ref.html": [
+      "bdc4eb1ab0e14cfe65cce3eaf080d0b46029bd9d",
+      []
+     ],
      "no-resize-event-ref.html": [
       "1fc00e7e39cd7ed8766df397429c5fef675e244e",
       []
@@ -416682,6 +417587,14 @@
        []
       ]
      },
+     "subpixel-page-size-001-print-ref.html": [
+      "cf59f2be374bd6f41913a107b70d41a18cc0e225",
+      []
+     ],
+     "subpixel-page-size-002-print-ref.html": [
+      "4ed4bdb5ff3920e230c083538d062cbd47a24c8a",
+      []
+     ],
      "transform-001-print-ref.html": [
       "45c3abf1810a55dc760058bf5fcc3064f3bac188",
       []
@@ -422520,7 +423433,7 @@
        []
       ],
       "document-with-0x00-in-header.py": [
-       "223b3c4027826f2bba1394db465c93ec7cbbe001",
+       "d91998b998dde35ed3d08a0177443bea7291b7be",
        []
       ],
       "message.py": [
@@ -424457,7 +425370,7 @@
       []
      ],
      "message-target.js": [
-      "7c29afb799c47795e40b129876f28dce2782fdfd",
+      "ac5fa63e1372a1422439f072c8a5fe170c18d548",
       []
      ],
      "messaging-blob-helpers.js": [
@@ -428853,7 +429766,7 @@
         []
        ],
        "fill-and-stroke-styles.yaml": [
-        "e30eb010088699f6b15347c1722f3490035ae369",
+        "19157d962b4cc0e38b3025225c0b491593ac4dc9",
         []
        ],
        "filters.yaml": [
@@ -434613,6 +435526,10 @@
        "4349df38d6aabc9bcc98a5a2666139a6d52a8881",
        []
       ],
+      "details-pseudo-elements-001-ref.html": [
+       "43f2216bec7894f5ffd060bd52375697dbb3faec",
+       []
+      ],
       "details-revert-ref.html": [
        "dc46b159012fd80c39b66e94935c210a11826487",
        []
@@ -439977,7 +440894,7 @@
       []
      ],
      "html5lib_tests_revision": [
-      "4af32678e53777b483da7b3397f516e1fa3ee1a9",
+      "3ea6d572fd8aa06f8b85d1b9a4098a78565020df",
       []
      ],
      "update_html5lib_tests.py": [
@@ -453758,6 +454675,10 @@
    },
    "shared-storage": {
     "resources": {
+     "delete-key.https.html": [
+      "41595f3ee3868a1e7fa1f866bcc8936de16f5cbd",
+      []
+     ],
      "embedder-context-inner.https.html": [
       "e4b59f7f7a028f55a9511654234200959e18a5e1",
       []
@@ -453822,6 +454743,14 @@
       "d87092aad1d2efedf5d4245884e28e159880b2df",
       []
      ],
+     "shared-storage-writable-pixel.png": [
+      "818c71d03f435db011069584cda25c1f66af1a85",
+      []
+     ],
+     "shared-storage-writable-pixel.png.sub.headers": [
+      "8b541e7b13b458932c02f5c1f2bb708a903ef020",
+      []
+     ],
      "shared-storage-write.py": [
       "8770b11f09d75eeeaa00b8f2cd4f315cb8eba01c",
       []
@@ -453831,7 +454760,11 @@
       []
      ],
      "util.js": [
-      "b8997e080dda97789df627cf62dcd560267c874e",
+      "b829864c625c0449c5772e87873f43eb55450cf1",
+      []
+     ],
+     "util.sub.js": [
+      "d92dbf539c3872d3b729edc6980400b17e2bdc09",
       []
      ],
      "verify-get-undefined-module.js": [
@@ -453846,6 +454779,10 @@
       "20c469410492c8a3d600366a285eae9fdbde5ea0",
       []
      ],
+     "verify-shared-storage.https.html": [
+      "52c79e7e85afc66782d7d6c144c1a6b55bfccada",
+      []
+     ],
      "verify-storage-entries-module.js": [
       "ee0c636cd1366ee359e8079c02a0102fab7c78f7",
       []
@@ -456037,11 +456974,11 @@
       []
      ],
      "cacert.key": [
-      "39a1bf60a782457dad0a3580414fb56ff3de6534",
+      "2bfd999b64ae229d8b06ef374226d5dd0350c5cf",
       []
      ],
      "cacert.pem": [
-      "79bf67fe5123676358602f144e57c712a692afa5",
+      "f698a351d655dccb814f31128311e00ec9a6a9cb",
       []
      ],
      "config.json": [
@@ -456049,11 +456986,11 @@
       []
      ],
      "web-platform.test.key": [
-      "f1eb177cad2c0037b91edf85062bcf4256ab04c8",
+      "ae07ef896c10b9830568e3ae433b0ee5b16da337",
       []
      ],
      "web-platform.test.pem": [
-      "7063a254dd6b8c3856d989bf89e22bae1e5def5f",
+      "6f843553160de8cb2933bab2d1a7b3bcfd341423",
       []
      ]
     },
@@ -456201,7 +457138,7 @@
       []
      ],
      "requirements_tc.txt": [
-      "bb9b3f7232d5ed2cf772fef782728f0fb698f733",
+      "0506dbb0086e29e7e6d55e2d177cd36624c5f7a5",
       []
      ],
      "run_tc.py": [
@@ -456602,7 +457539,7 @@
      }
     },
     "localpaths.py": [
-     "5a2d0be00de90b66ffafdee6a284789dcae4e2d6",
+     "280f4bf2a3d24768b82252bf3df30f98a2774147",
      []
     ],
     "manifest": {
@@ -456704,7 +457641,7 @@
      ]
     },
     "mypy.ini": [
-     "5dc55c5b7470de4845f09bbc50b32a1d6686c1b1",
+     "1e58e9625e6749838331c9f85ed1d8a651fc40a4",
      []
     ],
     "pytest.ini": [
@@ -456724,7 +457661,7 @@
      []
     ],
     "requirements_tests.txt": [
-     "01b56839989e2d70b3c0fa2467510f2b6f1ab0f7",
+     "a0885683ef8558f702287f1e1995fddc5df4ba48",
      []
     ],
     "runner": {
@@ -463807,6 +464744,226 @@
       ]
      }
     },
+    "third_party_modified": {
+     "mozlog": {
+      "mozlog": {
+       "__init__.py": [
+        "82d40b5c55181d7e665505756cc60e6415cc05d0",
+        []
+       ],
+       "capture.py": [
+        "75717d62c8a90874e24cd26c888bd15951167348",
+        []
+       ],
+       "commandline.py": [
+        "d512eb739594f60811c1ed547ab64c6f44e9eda7",
+        []
+       ],
+       "formatters": {
+        "__init__.py": [
+         "962fb92ca49c1f2c658d4a25a28bf23c6cde3593",
+         []
+        ],
+        "base.py": [
+         "407514b741f452e3ba0ee9091dc7902b3cd5da5d",
+         []
+        ],
+        "errorsummary.py": [
+         "848f15fe155b8f705c783b5ffe3ae4f257e51387",
+         []
+        ],
+        "grouping.py": [
+         "d81f9344e9916d17c5d1d437b3272acf5d926c92",
+         []
+        ],
+        "html": {
+         "__init__.py": [
+          "01348f8dfc8c33df87ab3b4226d8e61fedb0e912",
+          []
+         ],
+         "html.py": [
+          "040de1ae5381b2f9151d84b0731804868dd87ee6",
+          []
+         ],
+         "main.js": [
+          "61403f611b124d9f68e6df1aa93f0491d2f50799",
+          []
+         ],
+         "style.css": [
+          "427742dd1f3776301047fbe0007420674aa9bb0f",
+          []
+         ],
+         "xmlgen.py": [
+          "e8cf8edb3e9e44b2cd0209ca8b92e15fd0ae0036",
+          []
+         ]
+        },
+        "machformatter.py": [
+         "2c425a2acc884917079dabdb1cf80ab67d6b38cc",
+         []
+        ],
+        "process.py": [
+         "582afbf93584942cfbd067a2fd79b2d0341bbfcb",
+         []
+        ],
+        "tbplformatter.py": [
+         "2fec3946feaacdfcfc997aa83c6ed7b8cd3f7b74",
+         []
+        ],
+        "unittest.py": [
+         "e644f80094a504dbdf659df9577c24b05b3da04b",
+         []
+        ],
+        "xunit.py": [
+         "7307f6fa86607ab368cc4591d382ea1a21cf73d3",
+         []
+        ]
+       },
+       "handlers": {
+        "__init__.py": [
+         "e14bdf675f017b244f81e16f6ab115d2cba5cd54",
+         []
+        ],
+        "base.py": [
+         "7cea14c7a44b04b1174949816a29bd7d30ef8b16",
+         []
+        ],
+        "bufferhandler.py": [
+         "4dca61548e60d0ac7ba8d4196b0be730c7ca65de",
+         []
+        ],
+        "messagehandler.py": [
+         "606dd8392648e387a0d63af8a2165cdfef36e42c",
+         []
+        ],
+        "statushandler.py": [
+         "500f2e1d8974860a4d45abb7f6f7cbf50f0f6d5e",
+         []
+        ],
+        "summaryhandler.py": [
+         "06b4a9633238cf22d75d1b5e3400e45ba858fb34",
+         []
+        ],
+        "valgrindhandler.py": [
+         "b4760b1ee83bec15da3caab58cd16935c3b37f09",
+         []
+        ]
+       },
+       "logtypes.py": [
+        "ba6c7b1d1802b89bd595c00a50e532cc49aa2ec3",
+        []
+       ],
+       "proxy.py": [
+        "1d5994406b5f20aa7dcef2c75b26b29a3f0f6cef",
+        []
+       ],
+       "pytest_mozlog": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ],
+        "plugin.py": [
+         "270f404993b98563edbb3f0603b375181f743c0e",
+         []
+        ]
+       },
+       "reader.py": [
+        "af5470f351cf6184acbad1f2e3de02dbe6408725",
+        []
+       ],
+       "scripts": {
+        "__init__.py": [
+         "07780ab2d07998221446e253e99db30de4b73431",
+         []
+        ],
+        "format.py": [
+         "27a643068f473e5589c8cb6d571e7e0185030518",
+         []
+        ],
+        "logmerge.py": [
+         "111479538779fddb42ecd674417953af75663a7a",
+         []
+        ],
+        "unstable.py": [
+         "8eb95019beab534c5557d943cb5a241df2e7cba0",
+         []
+        ]
+       },
+       "stdadapter.py": [
+        "0c13d61e4380d21499697446529a901de5fbe0c2",
+        []
+       ],
+       "structuredlog.py": [
+        "20924e8b16a61cbbe771547a2395b1a0c35b5a7a",
+        []
+       ],
+       "unstructured": {
+        "__init__.py": [
+         "24b8f5b40598eb0c7760512acdc83ec80040bec1",
+         []
+        ],
+        "logger.py": [
+         "db436c9d11138fbeda1e954c33a235ad1eb2c330",
+         []
+        ],
+        "loggingmixin.py": [
+         "727e8f1a7dbe0cd8152c554926e385d79e657315",
+         []
+        ],
+        "loglistener.py": [
+         "adaa0f3a13914c6f578c4aed861d26cfcc434d4d",
+         []
+        ]
+       }
+      },
+      "setup.cfg": [
+       "3c6e79cf31da1c0433d2fa666bf50b53f6359f26",
+       []
+      ],
+      "setup.py": [
+       "3aa21a4fad661301dd50fdbbc2e162dba0b7f532",
+       []
+      ],
+      "tests": {
+       "conftest.py": [
+        "9eb76e27a80683d87bf9ad27f85d57602e409bd1",
+        []
+       ],
+       "manifest.ini": [
+        "23737ca4697540b3e51c793f48c0ddb2c350197d",
+        []
+       ],
+       "test_capture.py": [
+        "f0cf990a00d20f0a8d7a03c21ccc32de9d2cc14d",
+        []
+       ],
+       "test_errorsummary.py": [
+        "a56e94bae441bb4e2fe758f54fb2ac288fe3814e",
+        []
+       ],
+       "test_formatters.py": [
+        "30e630322385d6cd203972bebaef7f0e7701e013",
+        []
+       ],
+       "test_logger.py": [
+        "af136b89aa6425205ecb244f85f821c58547e7a4",
+        []
+       ],
+       "test_logtypes.py": [
+        "a041489cfd663f88418d4bb79fd6529ba7857409",
+        []
+       ],
+       "test_structured.py": [
+        "ba991c5633142d06a8d285e0e88d7a9d90dbdad6",
+        []
+       ],
+       "test_terminal_colors.py": [
+        "8294c9e743d9d5b62860f54a6bfcbecd72d07c2c",
+        []
+       ]
+      }
+     }
+    },
     "tox.ini": [
      "a4b747ac4fa1ac03bf483b04363abe8fad8774eb",
      []
@@ -464545,16 +465702,16 @@
         []
        ],
        "client.py": [
-        "d8185d8e660a1ba8405bdcf0079d447467262fdc",
+        "a9637c9cfa4223ed18a673ef7b661b7be1a8d261",
         []
        ],
        "error.py": [
-        "4a9b4ba9db9155c4838cb6ea335d9111d051036f",
+        "d3e318d1705f07300ac6a557a411343740845904",
         []
        ],
        "modules": {
         "__init__.py": [
-         "da5c14c4bf3405759f8036df6e2d0fa79238f163",
+         "acbe117902e4647434e71d1de8da2d28f7675e1e",
          []
         ],
         "_module.py": [
@@ -464566,13 +465723,17 @@
          []
         ],
         "browsing_context.py": [
-         "8aca3e6f67ffcd71f41cbe0257a1408b6a7fdc0a",
+         "35ad93e191a1205415467e8654d41d806c25aacb",
          []
         ],
         "input.py": [
          "b2703843b18192b3e6234732b11c8066b4871589",
          []
         ],
+        "network.py": [
+         "940aa7cffdd2ef793f4a87a342a49a577418bfff",
+         []
+        ],
         "script.py": [
          "99b26927403515de31d822336ee4d5ed062f7cd6",
          []
@@ -464655,7 +465816,7 @@
       []
      ],
      "browser.py": [
-      "5e8bfdab160137cab305c8f124195724deddc069",
+      "a8c0d169587ea50a23494a564d9500e1c216b4e9",
       []
      ],
      "commands.json": [
@@ -464667,7 +465828,7 @@
       []
      ],
      "install.py": [
-      "5bcbb7a7c339e79dfe71579c5db1f88e5e0bfeb4",
+      "13b0ae81d8df777dc153a574bc8c77ad8ed2b884",
       []
      ],
      "markdown.py": [
@@ -464691,7 +465852,7 @@
       []
      ],
      "run.py": [
-      "15be2af2d3d7a969910deb3a83365c733354dd1e",
+      "c737c057966d5561bd8fcef3f57b7a968c29aa62",
       []
      ],
      "testfiles.py": [
@@ -464758,11 +465919,11 @@
        ]
       },
       "test_browser.py": [
-       "b317925ba001abcf7612f61d105b886c43dafb81",
+       "bbaaaae996e06aef763a1325965ce4e7d3e75549",
        []
       ],
       "test_install.py": [
-       "6726081746cd96140f3ea472b018ff30f76e8d11",
+       "a91658cdeeaa166ecf0c84d471b786e69b5b096b",
        []
       ],
       "test_markdown.py": [
@@ -464803,7 +465964,7 @@
       []
      ],
      "virtualenv.py": [
-      "c5e450331413b862c961d4fe4fcfca27020a66ab",
+      "742f572c34a59d031fa36b7d7155af5b44fcf19c",
       []
      ],
      "wpt.py": [
@@ -464859,7 +466020,7 @@
       []
      ],
      "requirements_firefox.txt": [
-      "abbfd9a40a3e5eb1a2ed3e66ca6344e99dbbcbba",
+      "0bb6812e6e4e6d2370af0bc0e664fb07af724cca",
       []
      ],
      "requirements_ie.txt": [
@@ -464905,7 +466066,7 @@
         []
        ],
        "base.py": [
-        "5b590adf2546f1e2c50a738fda5970c5de4bd202",
+        "adf665c19926f04ed6e864a4a3a9c082f4315d48",
         []
        ],
        "chrome.py": [
@@ -464921,7 +466082,7 @@
         []
        ],
        "chrome_spki_certs.py": [
-        "f3630f3abbc8fc730e7b36ae0a05e9deea1ee251",
+        "380f0848a73e352d2758263091dd176d7bb51e3f",
         []
        ],
        "chromium.py": [
@@ -464949,11 +466110,11 @@
         []
        ],
        "firefox.py": [
-        "13755932858772a1dbbdbff86e820947e8eb7d1a",
+        "096f851f9d068c883fc63251673653f403ad2313",
         []
        ],
        "firefox_android.py": [
-        "bf69e8f6083fe592c72d1a43665ec9ca0356bbb2",
+        "298b5f27407abdc1008d1a3de77730a6c60efa98",
         []
        ],
        "ie.py": [
@@ -465008,7 +466169,7 @@
        []
       ],
       "environment.py": [
-       "bea6808221a364f1761820c762838ea82777f2a9",
+       "9e217eda4825d670a2a53240f1d9da5acb8a0901",
        []
       ],
       "executors": {
@@ -465029,7 +466190,7 @@
         []
        ],
        "executorcontentshell.py": [
-        "8ca0a7a9a604bcc410a9efa01634c7a08c1ba697",
+        "8a183bafcbd0ba1afd919c1f5738613bb5034788",
         []
        ],
        "executormarionette.py": [
@@ -465212,7 +466373,7 @@
        []
       ],
       "testrunner.py": [
-       "7715289a62433895472a08f6886a1c57de07a785",
+       "f29aebac4b9a2e23080f8b9ee48d5d93fd24641d",
        []
       ],
       "tests": {
@@ -465229,8 +466390,12 @@
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
          []
         ],
+        "test_base.py": [
+         "a3d804336e12ebc214c452c3c449fb75836c6d45",
+         []
+        ],
         "test_sauce.py": [
-         "a9d11fc9d91591bb956244a5368d30a0881066a2",
+         "bfb8e53b745746646f1dd23730ebb76d20dcbd7e",
          []
         ],
         "test_webkitgtk.py": [
@@ -465314,7 +466479,7 @@
        []
       ],
       "wptcommandline.py": [
-       "6c7294e81e79a17356c4912699ad84a148ca0492",
+       "bc664b08ca020a51452fadd52690e8d6fbaf24a8",
        []
       ],
       "wptlogging.py": [
@@ -465384,7 +466549,7 @@
        }
       },
       "wptrunner.py": [
-       "1ea44041d93db03ad9345d5850ba24e5676aa31a",
+       "4bfb4158d1305c2814b67ab76f491ae61f7b8779",
        []
       ],
       "wpttest.py": [
@@ -466563,7 +467728,7 @@
       []
      ],
      "urltestdata.json": [
-      "ec189871d908147b62af3a1b1de46ada73792c21",
+      "287a84b467a48be9017223e6bddc466add7a9703",
       []
      ]
     },
@@ -466681,7 +467846,7 @@
       []
      ],
      "aria-utils.js": [
-      "4fbc96aab3b02ce9101137638d7342ba9e24c067",
+      "feb71b8398454fa2bf70141cd20a157e27b09287",
       []
      ],
      "manual.css": [
@@ -468422,6 +469587,12 @@
          []
         ]
        },
+       "handle_user_prompt": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "load": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -468528,6 +469699,12 @@
         "19a4a69b4c50c8cc613d118ca83edf790612b344",
         []
        ],
+       "add_intercept": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "before_request_sent": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -468544,6 +469721,12 @@
         "924d5a34c6d4899bea2d0c14efb013918f9ebbf1",
         []
        ],
+       "remove_intercept": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "response_completed": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -472646,7 +473829,7 @@
        []
       ],
       "AbstractWorker.onerror.js": [
-       "e0bc5076371ed98a5cf252b67cd7cd6bc9cb4f59",
+       "1594decd3709a1c6d5edd6200792ea1838a86621",
        []
       ],
       "null": [
@@ -508112,6 +509295,15 @@
      ]
     }
    },
+   "core-aam": {
+    "form-unnamed.html": [
+     "321be7fee08f655750f059be56adc1ed2d625c66",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "cors": {
     "304.htm": [
      "2aee01417a7cdfb5cb9a69cce2bcc59d7b8eded2",
@@ -508371,7 +509563,7 @@
      ]
     ],
     "fedcm-basic.https.html": [
-     "1c2b916103c514333c7e8e3a9c7b20bb3ca3df8e",
+     "d5804f796e90d5a3ef5163863cf6212df7cb0894",
      [
       null,
       {
@@ -508422,6 +509614,15 @@
       }
      ]
     ],
+    "fedcm-hosteddomain.https.html": [
+     "5e39542fdef72dac98d52968fbe10f6e95d38986",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fedcm-iframe.https.html": [
      "964ebf4c44df4e8c33474c0cde464be7a7eeee6f",
      [
@@ -508430,7 +509631,7 @@
      ]
     ],
     "fedcm-loginhint.https.html": [
-     "cb03116dc7aca244f41e681cb961b688c43d312f",
+     "11159b84d562e2d2660bca946ae8c73905922606",
      [
       null,
       {
@@ -508597,7 +509798,7 @@
      ]
     ],
     "fedcm-returning-account-auto-reauthn.https.html": [
-     "e5b399611242463e100014538ebd3ebe56a1dd44",
+     "bec836f25f02c4f324c95d92ffa34376b88b3a44",
      [
       null,
       {
@@ -513589,6 +514790,24 @@
        {}
       ]
      ],
+     "scope-focus.html": [
+      "578a7702c1dcedebe2933c6a5b25f100a1a58899",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scope-hover.html": [
+      "648fb361d67110ed287a5788c24a9826e8fdf90a",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scope-implicit-external.html": [
       "d1ac738b778da33fa0359646a0ef876b339d5a64",
       [
@@ -513604,7 +514823,7 @@
       ]
      ],
      "scope-invalidation.html": [
-      "d41df57851e189ed9312435487c3cd72519eebe6",
+      "d53257e8944603d7bfb8c7c4f4fa2f6819343768",
       [
        null,
        {}
@@ -513624,8 +514843,15 @@
        {}
       ]
      ],
+     "scope-name-defining-rules.html": [
+      "9f4b34288774fe9e3e7027e608cc552ac13e954d",
+      [
+       null,
+       {}
+      ]
+     ],
      "scope-nesting.html": [
-      "05cdac9fc9457cd1b8e6b8f3434cbbd118aa3d1a",
+      "44e5b7536aed6c3e33cbdf32640270f55cbcac83",
       [
        null,
        {}
@@ -513639,7 +514865,7 @@
       ]
      ],
      "scope-shadow.tentative.html": [
-      "7bcd2e63cf8800738e862853767f4da020ea9d79",
+      "28fed27cee8a2292a26722d1bc3613b86b7fe7f6",
       [
        null,
        {}
@@ -516439,21 +517665,21 @@
        ]
       ],
       "flex-align-baseline-table-001.html": [
-       "e804c33cb4c6abd7b50f7a82a1a22d8f9725b7de",
+       "7f9a9d5fca0b1c55c3492bb70a9ae365033bf4fd",
        [
         null,
         {}
        ]
       ],
       "flex-align-baseline-table-002.html": [
-       "c7d2c8af70400f65df3a36df4f4f3508e9041c48",
+       "80a3d22a031e3cab3c71441430832b57836ef7a2",
        [
         null,
         {}
        ]
       ],
       "flex-align-baseline-table-003.html": [
-       "15f35401756e4b189ee871c3f93e0e7549871b6d",
+       "07bc4d709c7ebf3afde35456d9651e647b5b535f",
        [
         null,
         {}
@@ -518441,7 +519667,7 @@
       ]
      ],
      "inheritance.html": [
-      "0646a7867862a9ea921f0652b88532f35255c24b",
+      "8f7d4b9d5add7b22beb9049eaebf2407ec1ec7b6",
       [
        null,
        {}
@@ -518752,14 +519978,28 @@
        ]
       ],
       "font-synthesis-computed.html": [
-       "eba354927a724745a99df17d33a8d94c70e68484",
+       "b7f121c067ef2b1af2b93467e23290b9bf7219e8",
        [
         null,
         {}
        ]
       ],
       "font-synthesis-invalid.html": [
-       "8d647997d7756feb9b340e012665eb3b40a755ac",
+       "e68c07bcbac255795f7d313523d8aae4456048d5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "font-synthesis-position-invalid.html": [
+       "57d6870b318557949c0fef7059fd1b3ec3a72a1e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "font-synthesis-position-valid.html": [
+       "e95b8ecdec7509cc2a47d167773487dfbd6654c2",
        [
         null,
         {}
@@ -518794,7 +520034,7 @@
        ]
       ],
       "font-synthesis-valid.html": [
-       "4c91fb9b443950ab24064585bacf198e2feeb91d",
+       "84663e8a3e909704efea440383699a853d15a3ad",
        [
         null,
         {}
@@ -519755,21 +520995,21 @@
        ]
       ],
       "grid-align-baseline-table-001.html": [
-       "0cafef6ecca8fa1ce98c3ad69b9c4feb7c0569c7",
+       "ad1d778c57f0801efd7bdea460b4fc039286353c",
        [
         null,
         {}
        ]
       ],
       "grid-align-baseline-table-002.html": [
-       "6fc444ff843b67f2ca193e2ffd4d4cbe190aecf0",
+       "cabb32c40a89ceaa51ddc07bc1d68e8a04685a12",
        [
         null,
         {}
        ]
       ],
       "grid-align-baseline-table-003.html": [
-       "43ba6ae86df4f1e26739a2513dd18324cfa8e978",
+       "5c2e56b64944c39f4ee643fa0c433be63c780fba",
        [
         null,
         {}
@@ -522524,7 +523764,7 @@
        ]
       ],
       "grid-shorthand-serialization.html": [
-       "3cd48cff4bcc626baea31b9febe9dc4c358dd877",
+       "20ba330c03e988b8060cbdaa4d72fd5c599b8964",
        [
         null,
         {}
@@ -523195,6 +524435,27 @@
         {}
        ]
       ],
+      "baseline-source-first-textarea-001.tentative.html": [
+       "02b2051c9ef112af326db248454d6378f1cd5e08",
+       [
+        null,
+        {}
+       ]
+      ],
+      "baseline-source-first-textarea-002.tentative.html": [
+       "633ba615e746401eb756d8e003046bec79274ff6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "baseline-source-first-textarea-003.tentative.html": [
+       "098b05bd1c6ea8d728b0c14a530c426eb418c16d",
+       [
+        null,
+        {}
+       ]
+      ],
       "baseline-source-invalid.html": [
        "9be4f5c3789731c3df35e8790f70fdd368ff856d",
        [
@@ -523223,6 +524484,27 @@
         {}
        ]
       ],
+      "baseline-source-last-textarea-001.tentative.html": [
+       "156c007233ccf90df3540c7750470719cc229771",
+       [
+        null,
+        {}
+       ]
+      ],
+      "baseline-source-last-textarea-002.tentative.html": [
+       "d8b20b35ebd82a4f04e62a04de8dce9e6b60b348",
+       [
+        null,
+        {}
+       ]
+      ],
+      "baseline-source-last-textarea-003.tentative.html": [
+       "c80d464a10104ad3d7cb458d8916b2ff3f556994",
+       [
+        null,
+        {}
+       ]
+      ],
       "baseline-source-no-interpolation.html": [
        "86fede739fcd6cda3ff8736c349cba5aa8ecd822",
        [
@@ -524434,7 +525716,7 @@
        ]
       ],
       "clip-path-valid.html": [
-       "aa40dc97da3316a849cb7fe330ae2f6e94a9efa0",
+       "2fb0c6248a227de445d3b55292dc28fd8dbf8539",
        [
         null,
         {}
@@ -525799,6 +527081,13 @@
        ]
       ]
      },
+     "backdrop-tree-abiding-slotted.html": [
+      "55db27a80e02f8305aea31ec5a45d7c45c3ceb38",
+      [
+       null,
+       {}
+      ]
+     ],
      "inheritance.html": [
       "ef037dc7329ff85ef6b459bbe09ba8836bb2eaa3",
       [
@@ -527500,7 +528789,7 @@
       ]
      ],
      "slotted-parsing.html": [
-      "25b003091fadb004b90f52ec1ba4179bf1a220c8",
+      "bed4dedd56072ad1937ec536f2e6bc04f1fb70fd",
       [
        null,
        {}
@@ -527983,7 +529272,7 @@
       ]
      ],
      "overscroll-snap.html": [
-      "b34caf87f123fa5e6d4b7523bf22bfa2887284c7",
+      "13437492ca1ce9c094a997b224e5cf3ba497c692",
       [
        null,
        {
@@ -541224,7 +542513,7 @@
       ]
      ],
      "cssimportrule.html": [
-      "2703b9a69b5787c0ccbaf746001401bcd940ea6a",
+      "84cd7292f3880c49ed1c917a80b9cd326e98f00b",
       [
        null,
        {}
@@ -545168,7 +546457,7 @@
       ]
      ],
      "is-where-error-recovery.html": [
-      "1d6e870ed23e5b65ea1bded940c6531b1da18a51",
+      "f7e6f6ff6ea0b6058b6f397386e44611ad2a6762",
       [
        null,
        {}
@@ -545182,7 +546471,7 @@
       ]
      ],
      "is-where-parsing.html": [
-      "c9cc2236a3281a03589257afd7d7b060919956b7",
+      "3159ecfe6a65b715912eeee10041b56defc89416",
       [
        null,
        {}
@@ -545329,14 +546618,14 @@
        ]
       ],
       "parse-has-disallow-nesting-has-inside-has.html": [
-       "9cf989fcbeb7409208199e5ad96211a353e847e7",
+       "c5fcb589a3ccf1af1b46f8c004c37e34e8946263",
        [
         null,
         {}
        ]
       ],
       "parse-has.html": [
-       "5d071010b42f9b726490b53cfeb8da75b20159ad",
+       "902fc98ff68350e3a6c8c64e3cc62bf17f2e6e47",
        [
         null,
         {}
@@ -548151,6 +549440,13 @@
        {}
       ]
      ],
+     "remove-all-listeners.html": [
+      "3a2a751a146bca0fc30144c997fda4cd16242294",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrolling": {
       "iframe-chains.html": [
        "fb7d674aae13eee0569987c2c8d635bded7c7018",
@@ -570074,7 +571370,7 @@
      ]
     ],
     "script-focus.https.html": [
-     "4b5fe758b48d12d2a16bb47ff0d50d3fc4c21b47",
+     "0bef98219bd192851b30a9f8dbd61fe17c724962",
      [
       null,
       {
@@ -578893,6 +580189,32 @@
         ]
        }
       ]
+     ],
+     "sendondiscard.tentative.https.window.js": [
+      "0613d18dffbfc98104b0ab7d605330d09ad997c0",
+      [
+       "fetch/fetch-later/sendondiscard.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testharness.js"
+         ],
+         [
+          "script",
+          "/resources/testharnessreport.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/pending-beacon/resources/pending_beacon-helper.js"
+         ]
+        ]
+       }
+      ]
      ]
     },
     "h1-parsing": {
@@ -578904,7 +580226,7 @@
       ]
      ],
      "resources-with-0x00-in-header.window.js": [
-      "f1afeeb740b1d77bd392e23afb1c5abdf5687302",
+      "37a61c12b561b260725f8da61b8478c5d9b713af",
       [
        "fetch/h1-parsing/resources-with-0x00-in-header.window.html",
        {}
@@ -584861,10 +586183,17 @@
       }
      ]
     ],
-    "FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js": [
-     "dbecc24c1da5de78da9640fe1f7d0a5a5bfdc6a0",
+    "FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js": [
+     "edb30186364c8bf08dd5dd08354fc577538838b3",
      [
-      "fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.html",
+      "fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.html",
+      {}
+     ]
+    ],
+    "FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js": [
+     "c5636e7e329e2801e1b2628f302b666240dbe95d",
+     [
+      "fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.html",
       {}
      ]
     ],
@@ -596798,84 +598127,84 @@
         ]
        ],
        "2d.gradient.radial.cone.behind.html": [
-        "758fbcf360db1620c12b11ec88400d7763972d94",
+        "d32e972cc5f3e7b6a25d6aab3711b8d3e4901528",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.beside.html": [
-        "111cb8033d5c9763dc16e2acfe24ea10733a2d89",
+        "b9774aeba6714060fc2243066e25be7817fe9a40",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.bottom.html": [
-        "a7ebc6ab48a30200efd0c2c7aba3464000c104fd",
+        "15808ee50e78205c40b76d0cd840a22b12a2b3ec",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.cylinder.html": [
-        "9f270f4aed8f8210fc96bbbb7f751668dcf89db7",
+        "067f1299839be5e16fe554ddbbe82bee32ffaa26",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.front.html": [
-        "23f4723cd3146594872d87567d66240c0b3f4d81",
+        "88ecdb98108f1b0f22e215256a6bbbea18bb95a1",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape1.html": [
-        "15ac2bf6d715298d289c580a7e3f4d06f8849fc8",
+        "046e4d97b130bbe401c6fadfbd460c9bd9242454",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape2.html": [
-        "d1f5be3d4b8bfaf2ef64aab37d4e90b9144c1232",
+        "1c7660ac9915c65dc52a74457f0d2e53316bfce6",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.top.html": [
-        "85c23d60be5a19a7aa8b4ae3398bc5404285131d",
+        "6760b18db744ca4c857a18d23e56e1b0ce852210",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.equal.html": [
-        "bcb47509207eb8536856f5984038365109a36e86",
+        "1ff7c44193e070ffd38a547103192af54c6e1590",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside1.html": [
-        "070a97e49b291bd38f8a116467fa03f0968e9fd8",
+        "00ece5750e37e8af3397193d3ccaf9a0bc20725d",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside2.html": [
-        "a7b06f16aeb6e5e4bd2176acf6d1f31331ce19d0",
+        "be9c1a810a7c4881cd006ca6bd0dd476d00e0ace",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside3.html": [
-        "d7abedc14e9d2b572ae350eb7239a0b5ca821990",
+        "5e9bd4c7214976ce808f6427ebebd174c6f53521",
         [
          null,
          {}
@@ -596896,42 +598225,42 @@
         ]
        ],
        "2d.gradient.radial.outside1.html": [
-        "c928e1878baefeec22c743fcba36b4f0f05e3108",
+        "ea9dfdb3bbeb09953c32e7cdf3152ed207fe43d3",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.outside2.html": [
-        "7bbe734468b197a813784992219192d98e86247c",
+        "b07fd02518a01b53cde74aa75969cc053361993c",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.outside3.html": [
-        "7705d0966f45d4f025ee381a900dc1f418ae6d00",
+        "7c19baf5c575979274313409878a75e04b49fd09",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch1.html": [
-        "25e1c019fdd3b184340a1a930f0f623545ad1a5a",
+        "6487fc440b8c9851f0f3dc51ed1d8abad8ee90f7",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch2.html": [
-        "75a077a610d99d8437f99081e85ed66c714b509b",
+        "908a0dbc193531dfa1f19da4cebf9e5934edc84e",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch3.html": [
-        "a93120c44bb70d67cb07a1b3daa81eb58de6d4bd",
+        "07f52d73631787e365d4dbfc82a526240d1f2f76",
         [
          null,
          {}
@@ -606151,168 +607480,168 @@
         ]
        ],
        "2d.gradient.radial.cone.behind.html": [
-        "4a639778ccdce406816f5133d7f017f9a0b3f282",
+        "c270a751752320415548a672bc2173b8e4a8888f",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.behind.worker.js": [
-        "114dab0a2197cf53de47ef124d5bbe1940a4efc3",
+        "07ea409ad832b262c4c57787944e8ec6fe35057e",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.beside.html": [
-        "94fe289b1a4795a02692b79589ac0a21d81fb50e",
+        "89d8757bde5364bbefc6a943ab329a355b3f2eab",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.beside.worker.js": [
-        "e6f53fb999276ab7766769ccd963f1a79164e45d",
+        "686721cbc693b7f89bd744503d0b5da5135eb363",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.bottom.html": [
-        "7cf9867dba8835ef95730d8c860faf35c6254603",
+        "cda6743f66efe5ceffdb80509a31de842fb96bba",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.bottom.worker.js": [
-        "132d131bcaef0a84dd25a35c79b97b81458d32fd",
+        "c96b9c59f221bb2db1d02e54b8756c8937b2f0b3",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.cylinder.html": [
-        "27f75a8a743ae373c125c47f08b368bd6be01a9a",
+        "a6f1d6761919ba60950c073aabd58800b850c86c",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.cylinder.worker.js": [
-        "9534174757b9fc6825ef11af957cde09f47b258a",
+        "22e6cb49cead4ecff8d7814ae848c7ab18c2d487",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.front.html": [
-        "b46155701c9ce8a3ab16f385731741da9445acba",
+        "5cda039e944b54119a67b75bb5135cd5ad0d9264",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.front.worker.js": [
-        "fffce0f9f2f572523df964e78c7d77230f0c4649",
+        "c4e70f53c9d4d32b1fa9b04f69feb206ae6dfb81",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape1.html": [
-        "5c4d8125265df8f994bcc4d8d240f95421104fe3",
+        "290923b5e5ca5b1cb94ea83cc8a3bb80e1d63db2",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape1.worker.js": [
-        "5bd3f5eafa94ef2b6c7c9b746b60b60a3c639975",
+        "d03c0db23c475898d87e1e65c3647ae1b09dc108",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape2.html": [
-        "1dec145e58ae062037cbe6a113a45044bd246abb",
+        "edf1909ac17806cafeb4afc93e764b2123b89354",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.shape2.worker.js": [
-        "31638cff3d5624a0b49196c88f825bc8030741df",
+        "8788954a3c0c98152cfb9593bf33e51651ba6399",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.cone.top.html": [
-        "6cffa28175ae44d0a6ae04b1dbe9b1c48aab9d46",
+        "9487c8c931c0aecbe8772110c6e1542ebba196ab",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.cone.top.worker.js": [
-        "85a9eae40542a79ce2dab05041dc0cf17f14acfa",
+        "6fc834373a4c2d2c4460479b11e2ec05a44c5ac0",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.equal.html": [
-        "52319ef6126b61ce125b819900d1184370becb09",
+        "b14b44fe30a397d1e2c4580a8639ff750f2645b9",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.equal.worker.js": [
-        "7f5ad50ff390b760cea8a477a7df4c7a7db98f38",
+        "c8e6095805a5a0849c14e068829fc3d4c2bbfe4b",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.inside1.html": [
-        "f0da2c2742ad96e131d9925435baf52e775df590",
+        "a55f0a11044ff2719eb864f583e1adcf22cb26ff",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside1.worker.js": [
-        "37ed851ab31dd33d47d13884cac09bd83c0c4e62",
+        "5da290a7ce6abd984a4d103330651479fd7da83a",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.inside2.html": [
-        "3f255027a160e76fae41f049a04a012e9da99662",
+        "3a7af0658be3dd2b6e334952447637afc56c6e4a",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside2.worker.js": [
-        "0f36051e6a190e1d12b0e452858752704e65f92f",
+        "dd49fa377140c1fc742ead9b59f549cfc468776e",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.inside3.html": [
-        "1ef80a568ee6aa85eb3761aceed9c3ae89d52d61",
+        "3a539e6b639c3b151300a1219d95bf6ce286ccd8",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.inside3.worker.js": [
-        "3c9131dbb3f3df0c35eed9a06e58fc1f56426a2c",
+        "0d05bf4d5b08ba71365147af8f9a10313936d532",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.html",
          {}
@@ -606347,84 +607676,84 @@
         ]
        ],
        "2d.gradient.radial.outside1.html": [
-        "61fed27df87677c2aa82e16e56644f3043231856",
+        "2643c67170acd2bc98459bb1eb253ca49ed7d9fa",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.outside1.worker.js": [
-        "b23eb81d148e96a4d38b68539952dd3f057115d0",
+        "52d45093ba86e150410352880e6e75ecb8948b9c",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.outside2.html": [
-        "814beccf510b580733ab8c4a09937fbad0a65d9c",
+        "423de4491d7cd24ec5013b49415a04b7b2b1bff6",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.outside2.worker.js": [
-        "44eb4f4b2ce46a46591d930ebc8a6bfaac102e24",
+        "861dcccbe343c7bad93a27d5b81bb2e209c5a148",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.outside3.html": [
-        "632ada6b9ceed5d2885b75dfb5291f36c6fa52c4",
+        "61df3dccfeaaae4018a1c744cb67dd987a877d5c",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.outside3.worker.js": [
-        "16d0c1a8ee0dbaee34d0bd9524e688710e2756cd",
+        "db65ea1b8b4932e28e19ff705f17ef6a7dc89a54",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.touch1.html": [
-        "38235188133209b1123dff491fc46c242c2b3e7f",
+        "86e2af142814f3a052cf4917f25457a929349609",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch1.worker.js": [
-        "853ad165a3f10f575511171cce3cedb7e4f0221c",
+        "dd8d72720980ad88097d7019d8f70cb4dcfa11b5",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.touch2.html": [
-        "af5bbd78971fa2b3bf0fa0e7f265a2e3cb0f1d96",
+        "b0ff86ad055cf1b156cdb2b6b029ac12ab3c3f8e",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch2.worker.js": [
-        "434c27b0b1f2a9eee41f21d88d7082bbb4994d62",
+        "ad6bc9d897bdb6986cea47c876d2d1c0fd64314a",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.html",
          {}
         ]
        ],
        "2d.gradient.radial.touch3.html": [
-        "1cf578bc80db5735de11929bbcc031619e5211b0",
+        "5e085fd998ebd222fffbe3fab805d9c0fdedd944",
         [
          null,
          {}
         ]
        ],
        "2d.gradient.radial.touch3.worker.js": [
-        "34fb0caa4489107c123049cfed706c38634962e5",
+        "540e9a7ed4803c1f53669161bfd96ebeaa13a98a",
         [
          "html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.html",
          {}
@@ -638050,7 +639379,7 @@
        ]
       ],
       "html5lib_innerHTML_tests4.html": [
-       "b519246aa5d43a9dd769d1e668c3918c8a844d01",
+       "3c54fff107515ac0b7bed9868fa1b3d20aaf671e",
        [
         null,
         {
@@ -638241,6 +639570,27 @@
         }
        ]
       ],
+      "html5lib_quirks01.html": [
+       "333292c9a20b162a0166dbf261e8fa1c97e5e88a",
+       [
+        "html/syntax/parsing/html5lib_quirks01.html?run_type=uri",
+        {
+         "timeout": "long"
+        }
+       ],
+       [
+        "html/syntax/parsing/html5lib_quirks01.html?run_type=write",
+        {
+         "timeout": "long"
+        }
+       ],
+       [
+        "html/syntax/parsing/html5lib_quirks01.html?run_type=write_single",
+        {
+         "timeout": "long"
+        }
+       ]
+      ],
       "html5lib_ruby.html": [
        "b5b66ba883159fb798fc8af60acc89861b705348",
        [
@@ -638368,7 +639718,7 @@
        ]
       ],
       "html5lib_tables01.html": [
-       "bcc8a949380734f5d1a0bf5a6fd0525cad51b691",
+       "fb922f8e68e4e99340afc04a68ccf8ef9191f53f",
        [
         "html/syntax/parsing/html5lib_tables01.html?run_type=uri",
         {
@@ -638620,7 +639970,7 @@
        ]
       ],
       "html5lib_tests2.html": [
-       "3f7b72a2b10a68853a116fd3573d662494d20d16",
+       "eddf34c2ff03766efa545fb0f68cde75c9f86bb0",
        [
         "html/syntax/parsing/html5lib_tests2.html?run_type=uri",
         {
@@ -638851,7 +640201,7 @@
        ]
       ],
       "html5lib_tests7.html": [
-       "47cff7d3fbbe19b18c903d80e04e63ee2b91e6d8",
+       "80101866f7ad85714394beeac0ec1187ad7b4e05",
        [
         "html/syntax/parsing/html5lib_tests7.html?run_type=uri",
         {
@@ -642886,8 +644236,26 @@
       ]
      ]
     },
+    "roles-contextual.html": [
+     "d2a09db453c04901acea4545f95348204aea871e",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "roles-generic.html": [
+     "e6ff46b0662529fbb778e9bd47e0ba8d11733103",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "roles.html": [
-     "ff4986370f474668484e24204fa5d8ab204bc81d",
+     "4b24743c8d520cf1cc83ece618dcd404df27d030",
      [
       null,
       {
@@ -650746,6 +652114,13 @@
       null,
       {}
      ]
+    ],
+    "MediaStreamTrack-getFrameStats.https.html": [
+     "bc378d71b253ec36402f8a1cf0e9c3f86e6b9a9c",
+     [
+      null,
+      {}
+     ]
     ]
    },
    "mediacapture-fromelement": {
@@ -661120,7 +662495,7 @@
      ]
     ],
     "pointerevent_auxclick_is_a_pointerevent.html": [
-     "5ec1bab1649effa65bd8c6dd579a003ea815085c",
+     "b32bee9e8fa4601db925c658f9c4692becbe37b4",
      [
       "pointerevents/pointerevent_auxclick_is_a_pointerevent.html?mouse",
       {
@@ -661228,7 +662603,7 @@
      ]
     ],
     "pointerevent_click_is_a_pointerevent.html": [
-     "36b80b66f57fef9dd7b007e3c20889eaf2ca224f",
+     "ceaae68db213b248afef4a80991721c2c12e30c3",
      [
       "pointerevents/pointerevent_click_is_a_pointerevent.html?mouse",
       {
@@ -661277,7 +662652,7 @@
      ]
     ],
     "pointerevent_contextmenu_is_a_pointerevent.html": [
-     "d951be542a367cd0e30a6b169bded298de365984",
+     "88ec1903ab8fdd8ae69b9be861834a26327bfd7a",
      [
       "pointerevents/pointerevent_contextmenu_is_a_pointerevent.html?mouse",
       {
@@ -663017,7 +664392,7 @@
      ]
     ],
     "reflected-as-value.html": [
-     "5aeb5b3b3cacbe2de6ecddf762926fe85315be13",
+     "93f411742de58ac27a802b63e5931d684317caed",
      [
       null,
       {}
@@ -675863,7 +677238,7 @@
      ]
     ],
     "deadline-max-rAF.html": [
-     "314f250254f953c03e73b787d14437adfe516b5e",
+     "ce5f504ed37540523da7fe7e4ed4b20c7536209a",
      [
       null,
       {
@@ -687231,6 +688606,13 @@
       {}
      ]
     ],
+    "shared-storage-in-sandboxed-iframe.tentative.https.html": [
+     "44512706bd633b33fb2e53a1f88d5031c923953b",
+     [
+      null,
+      {}
+     ]
+    ],
     "shared-storage-permissions-policy-default.tentative.https.sub.html": [
      "5439df2a0684331e63059e095396a9b2af89c17f",
      [
@@ -687266,6 +688648,34 @@
       {}
      ]
     ],
+    "shared-storage-writable-img-content-attribute.tentative.https.sub.html": [
+     "5bce34d91a97c34d1a57f21cc4e27aadc55a91c1",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-img-idl-attribute-included-bytes.tentative.https.sub.html": [
+     "b358e87e5cdbf9c81008d0151e66646a48a6b61e",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-img-idl-attribute-included.tentative.https.sub.html": [
+     "3e054146de82dee4d1d8046edfb55fc40f85b763",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-img-idl-attribute-not-included.tentative.https.sub.html": [
+     "56badca311b1b9e9f88a4d129ffc5760ed49a606",
+     [
+      null,
+      {}
+     ]
+    ],
     "shared-storage-writable-insecure-context.tentative.http.sub.html": [
      "debb6cf9c56fb4cda8e72293e0de4b533648c845",
      [
@@ -703806,6 +705216,15 @@
        }
       ]
      ],
+     "listbox-roles.html": [
+      "50208229278d4f49e0651d4e3e18a10d457d16a8",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "region-roles.html": [
       "d80570a97bcdddff7ba6669b792d76de72836913",
       [
@@ -715082,7 +716501,7 @@
      ]
     ],
     "video-decoder.https.any.js": [
-     "c68315261fbad85f8e204290d966ccc7f02ac95b",
+     "431ac4f34a95e510d6ade428cf9d555a046a7cf6",
      [
       "webcodecs/video-decoder.https.any.html",
       {
@@ -719768,7 +721187,7 @@
      ]
     ],
     "RTCDtlsTransport-state.html": [
-     "ca49fcc95f297e07889ecf32c21a35b9e311b68b",
+     "31c185b70bcd7d3ce23cd104b1fa69c6828c2376",
      [
       null,
       {}
@@ -739461,7 +740880,7 @@
       ]
      ],
      "dedicated-worker-import-csp.html": [
-      "20b03a72766042c4cfac16a548b3abd16d5943f5",
+      "6e0051aa14ed227acef2fd1e368410daed9249bd",
       [
        null,
        {}
@@ -762018,34 +763437,6 @@
        {}
       ]
      ],
-     "border-image-13.html": [
-      "52095cf289f8a46d348d08611e52c12e1731e676",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-14.html": [
-      "119d3309e97ed2912ba7317829c94395adcf72fa",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-15.html": [
-      "a3e748e6f56339482f7bbe929b82283150ab1129",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-16.html": [
-      "6829c04ffeb2a179e06087bb4745636ec90ec083",
-      [
-       null,
-       {}
-      ]
-     ],
      "border-image-image-type-001.htm": [
       "ebc152fe74bd165b68cda0953ce3ef5545aa998d",
       [
@@ -762109,41 +763500,6 @@
        {}
       ]
      ],
-     "border-image-slice-006.htm": [
-      "d6484b06db30b052f584c60f0dd3dbb20a61ae41",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-width-001.htm": [
-      "a07426a6282f446d1c7bb31a93b098bd2c102470",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-width-002.htm": [
-      "3503e8373fcf69dcbf121913c7df24e583afc1f2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-width-003.htm": [
-      "d85c6352885c6a51634eb49b3360fc4726cacb7c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "border-image-width-004.htm": [
-      "0d1fc02f141bb4abd3cb929f4bdd38f68209d720",
-      [
-       null,
-       {}
-      ]
-     ],
      "border-images.html": [
       "930a1df3b7fda4098f36cc9691a544f46e2311d5",
       [
@@ -763553,7 +764909,7 @@
      },
      "subgrid": {
       "repeat-auto-fill-009.html": [
-       "73b52a616b2237473d839960bbe933ed466b8ea2",
+       "086a4769d426a6aad48045672231615ec8e72657",
        [
         null,
         {}
@@ -765909,7 +767265,7 @@
        },
        "dom_content_loaded": {
         "dom_content_loaded.py": [
-         "c8e27ab31d1680ab95137895a9d3197683ddcf27",
+         "402c23f164dfeeaa19ed7ebef045d0775ec288af",
          [
           null,
           {}
@@ -765962,6 +767318,15 @@
          ]
         ]
        },
+       "handle_user_prompt": {
+        "invalid.py": [
+         "fd3c31a78647cfd9adc4c599f473d435703cec80",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "load": {
         "load.py": [
          "d15c23e8fdd4afba7e1a7bb09a20f0f5c01da3b5",
@@ -766330,6 +767695,15 @@
        }
       },
       "network": {
+       "add_intercept": {
+        "invalid.py": [
+         "dc15d5ea904e29c24aa23e1fd1a9d8ea68ddadf9",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "before_request_sent": {
         "before_request_sent.py": [
          "04e70bf0a7d8abc625c80649926d2d6ed2839348",
@@ -766348,6 +767722,15 @@
          ]
         ]
        },
+       "remove_intercept": {
+        "invalid.py": [
+         "d6063d22ec39bc7404eb6e752fbf1cbc6222c05a",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "response_completed": {
         "response_completed.py": [
          "fcd5c47d8e56583a2c05430059eb3b087d250e05",
diff --git a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini b/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
new file mode 100644
index 00000000000..5496474410b
--- /dev/null
+++ b/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
@@ -0,0 +1,2 @@
+[mix-blend-mode-animation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-013.html.ini b/tests/wpt/meta/css/css-backgrounds/border-image-013.html.ini
new file mode 100644
index 00000000000..0f3a2e2ed62
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-013.html.ini
@@ -0,0 +1,2 @@
+[border-image-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-003.html.ini b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-003.html.ini
new file mode 100644
index 00000000000..ac08ad7579e
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-003.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-round-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini
new file mode 100644
index 00000000000..25e90a4ae16
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-round-stretch-001.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-round-stretch-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini
new file mode 100644
index 00000000000..badbb71202c
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-repeat-stretch-round-001.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-stretch-round-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-slice-006.htm.ini b/tests/wpt/meta/css/css-backgrounds/border-image-slice-006.htm.ini
new file mode 100644
index 00000000000..03371a91323
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-slice-006.htm.ini
@@ -0,0 +1,2 @@
+[border-image-slice-006.htm]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/border-image-width-001.htm.ini b/tests/wpt/meta/css/css-backgrounds/border-image-width-001.htm.ini
new file mode 100644
index 00000000000..ae8039ca9f3
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/border-image-width-001.htm.ini
@@ -0,0 +1,2 @@
+[border-image-width-001.htm]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-synthesis-position-001.html.ini b/tests/wpt/meta/css/css-fonts/font-synthesis-position-001.html.ini
new file mode 100644
index 00000000000..fdb738219b4
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/font-synthesis-position-001.html.ini
@@ -0,0 +1,2 @@
+[font-synthesis-position-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-variant-position-04.html.ini b/tests/wpt/meta/css/css-fonts/font-variant-position-04.html.ini
new file mode 100644
index 00000000000..d061b5a841c
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/font-variant-position-04.html.ini
@@ -0,0 +1,2 @@
+[font-variant-position-04.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-variant-position-05.html.ini b/tests/wpt/meta/css/css-fonts/font-variant-position-05.html.ini
new file mode 100644
index 00000000000..a56252b51fa
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/font-variant-position-05.html.ini
@@ -0,0 +1,2 @@
+[font-variant-position-05.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/inheritance.html.ini b/tests/wpt/meta/css/css-fonts/inheritance.html.ini
index 0f6acf0e7fa..b607a39b79c 100644
--- a/tests/wpt/meta/css/css-fonts/inheritance.html.ini
+++ b/tests/wpt/meta/css/css-fonts/inheritance.html.ini
@@ -82,3 +82,6 @@
 
   [Property font-variant-emoji inherits]
     expected: FAIL
+
+  [Property font-synthesis has initial value weight style small-caps position]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-computed.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-computed.html.ini
index 036ae05ed11..1a8fefbc9f4 100644
--- a/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-computed.html.ini
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-computed.html.ini
@@ -22,3 +22,21 @@
 
   [Property font-synthesis value 'weight style small-caps']
     expected: FAIL
+
+  [Property font-synthesis value 'position']
+    expected: FAIL
+
+  [Property font-synthesis value 'small-caps position']
+    expected: FAIL
+
+  [Property font-synthesis value 'style position']
+    expected: FAIL
+
+  [Property font-synthesis value 'style small-caps position']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight position']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight style small-caps position']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-position-valid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-position-valid.html.ini
new file mode 100644
index 00000000000..c0b4960afd4
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-position-valid.html.ini
@@ -0,0 +1,6 @@
+[font-synthesis-position-valid.html]
+  [e.style['font-synthesis-position'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis-position'\] = "none" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-valid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-valid.html.ini
index aae6330bcba..29597455d1b 100644
--- a/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-valid.html.ini
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-synthesis-valid.html.ini
@@ -28,3 +28,15 @@
 
   [e.style['font-synthesis'\] = "small-caps style weight " should set the property value]
     expected: FAIL
+
+  [e.style['font-synthesis'\] = "position" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position style" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position weight style" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "position weight small-caps style" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
index cbb94dcb515..4a5a9bad41f 100644
--- a/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -38,12 +38,6 @@
   [Matching font-weight: '500' should prefer '501 550' over '502 560']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '501' over '502 510']
-    expected: FAIL
-
-  [Matching font-weight: '501' should prefer '450 460' over '390 410']
-    expected: FAIL
-
   [Matching font-weight: '501' should prefer '390 410' over '300 350']
     expected: FAIL
 
@@ -122,9 +116,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 40deg 50deg' over 'oblique 20deg']
     expected: FAIL
 
-  [Matching font-style: 'normal' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
 
@@ -206,9 +197,6 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
     expected: FAIL
 
-  [Matching font-weight: '500' should prefer '500' over '450 460']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '400' over '450 460']
     expected: FAIL
 
@@ -221,9 +209,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
-    expected: FAIL
-
   [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
@@ -236,9 +221,6 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 10deg' over 'oblique 5deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -269,21 +251,12 @@
   [Matching font-weight: '400' should prefer '351 398' over '501 550']
     expected: FAIL
 
-  [Matching font-weight: '430' should prefer '400 425' over '350 399']
-    expected: FAIL
-
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 20deg' over 'oblique 10deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -21deg' should prefer 'oblique -21deg' over 'oblique -60deg -40deg']
     expected: FAIL
 
   [Matching font-weight: '399' should prefer '200 300' over '400']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '350 399' over '340 360']
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-position/backdrop-tree-abiding-slotted.html.ini b/tests/wpt/meta/css/css-position/backdrop-tree-abiding-slotted.html.ini
new file mode 100644
index 00000000000..eacab71a749
--- /dev/null
+++ b/tests/wpt/meta/css/css-position/backdrop-tree-abiding-slotted.html.ini
@@ -0,0 +1,2 @@
+[backdrop-tree-abiding-slotted.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini
deleted file mode 100644
index 1893673d802..00000000000
--- a/tests/wpt/meta/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-decoration-line-grammar-error-color-001.optional.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini
deleted file mode 100644
index 100e6c98bf2..00000000000
--- a/tests/wpt/meta/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-decoration-line-spelling-error-color-001.optional.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-003.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-003.html.ini
new file mode 100644
index 00000000000..8aef227b352
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-003.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-004.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-004.html.ini
deleted file mode 100644
index 295c687d088..00000000000
--- a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-breaking-atomic-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-005.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-005.html.ini
deleted file mode 100644
index 404fded9f9a..00000000000
--- a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-breaking-atomic-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-006.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-006.html.ini
new file mode 100644
index 00000000000..6045172ba6a
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-006.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-010.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-010.html.ini
new file mode 100644
index 00000000000..cf5b8690fa8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-010.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-011.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-011.html.ini
new file mode 100644
index 00000000000..239a3ccdfcf
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-011.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-013.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-013.html.ini
new file mode 100644
index 00000000000..9aa5d9e2b4d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-013.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-014.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-014.html.ini
new file mode 100644
index 00000000000..2f3b3cc709f
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-014.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-016.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-016.html.ini
new file mode 100644
index 00000000000..2cbf8d2756d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-016.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-018.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-018.html.ini
new file mode 100644
index 00000000000..52d31a10770
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-018.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-020.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-020.html.ini
new file mode 100644
index 00000000000..482939ebb91
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-020.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-022.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-022.html.ini
new file mode 100644
index 00000000000..504c2fccfa5
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-022.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-024.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-024.html.ini
new file mode 100644
index 00000000000..920fd580010
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-024.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-024.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-026.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-026.html.ini
new file mode 100644
index 00000000000..a44892a287e
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-atomic-026.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-atomic-026.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/line-breaking/line-breaking-replaced-003.html.ini b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-replaced-003.html.ini
new file mode 100644
index 00000000000..a414a0f9440
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/line-breaking/line-breaking-replaced-003.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-replaced-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini b/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini
new file mode 100644
index 00000000000..f78e6b94672
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini
@@ -0,0 +1,6 @@
+[trailing-space-position-001.html]
+  [CSS Test: Positions of trailing collapsible spaces 1]
+    expected: FAIL
+
+  [CSS Test: Positions of trailing collapsible spaces 3]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index d52a3e77a70..314dca9c1f5 100644
--- a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -1,6 +1,3 @@
 [MediaQueryList-addListener-removeListener.html]
   [listeners are called when <iframe> is resized]
     expected: FAIL
-
-  [listeners are called correct number of times]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/is-where-parsing.html.ini b/tests/wpt/meta/css/selectors/is-where-parsing.html.ini
index 67581647c9b..dae62bf6253 100644
--- a/tests/wpt/meta/css/selectors/is-where-parsing.html.ini
+++ b/tests/wpt/meta/css/selectors/is-where-parsing.html.ini
@@ -37,3 +37,6 @@
 
   [Nested inside :host, with trailing whitespace]
     expected: FAIL
+
+  [Pseudo-elements inside]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/remove-all-listeners.html.ini b/tests/wpt/meta/dom/events/remove-all-listeners.html.ini
new file mode 100644
index 00000000000..c5607b3918d
--- /dev/null
+++ b/tests/wpt/meta/dom/events/remove-all-listeners.html.ini
@@ -0,0 +1,6 @@
+[remove-all-listeners.html]
+  [Removing all listeners and then adding a new one should work.]
+    expected: FAIL
+
+  [Nested usage of once listeners should work.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/redirect/redirect-keepalive.any.js.ini b/tests/wpt/meta/fetch/api/redirect/redirect-keepalive.any.js.ini
index 73c79c76452..f61eb5b8e17 100644
--- a/tests/wpt/meta/fetch/api/redirect/redirect-keepalive.any.js.ini
+++ b/tests/wpt/meta/fetch/api/redirect/redirect-keepalive.any.js.ini
@@ -1,4 +1,5 @@
 [redirect-keepalive.any.html]
+  expected: TIMEOUT
   [[keepalive\][new window\][unload\] same-origin redirect]
     expected: FAIL
 
diff --git a/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
new file mode 100644
index 00000000000..33db434fab3
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[sendondiscard.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini b/tests/wpt/meta/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini
deleted file mode 100644
index c1102de5c4d..00000000000
--- a/tests/wpt/meta/fetch/h1-parsing/resources-with-0x00-in-header.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[resources-with-0x00-in-header.window.html]
-  [Expect network error for frame navigation to resource with 0x00 in a header]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 7b4cf2c5ae7..4b5c3e26586 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -185,6 +185,3 @@
 
   [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: FAIL
-
-  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
index 410ec4c1d39..4648085f98d 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
@@ -41,3 +41,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: NOTRUN
+
+  [sec-fetch-site - Not sent to non-trustworthy same-origin destination, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini b/tests/wpt/meta/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
index 09c80ca5c46..693520bc4e1 100644
--- a/tests/wpt/meta/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
+++ b/tests/wpt/meta/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
@@ -34,3 +34,6 @@
 
   [public https to local https: failure.]
     expected: FAIL
+
+  [treat-as-public to public: success.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index dc1144214ef..856bb1c9901 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,9 +1,10 @@
 [iframe-src-aboutblank-navigate-immediately.html]
+  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Navigating to a different document with link click]
     expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index b6aa0bab7b8..d19311abec9 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -10,3 +10,6 @@
 
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
     expected: FAIL
+
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini
deleted file mode 100644
index 3956f08d5bb..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[javascript-url-load-as-html.xhtml]
-  expected: TIMEOUT
-  [javascript: URL navigation to a string must create a HTML document using the correct properties]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index f27acdd3b9d..4b89cb499f8 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -4,3 +4,12 @@
 
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 9]
     expected: FAIL
+
+  [0041 set in href="" targeting a frame and clicked]
+    expected: FAIL
+
+  [0080 00FF set in href="" targeting a frame and clicked]
+    expected: FAIL
+
+  [0080 00FF 0100 set in href="" targeting a frame and clicked]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
index f18f914e4a4..69c6893f467 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
@@ -1,3 +1,6 @@
 [form-submit.html]
   [Replace before load, triggered by formElement.submit()]
     expected: FAIL
+
+  [Replace before load, triggered by same-document formElement.submit()]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini b/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
index 90eb9ed743b..24c9e5d3926 100644
--- a/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
+++ b/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
@@ -1,4 +1,5 @@
 [cross-origin-objects.html]
+  expected: TIMEOUT
   [Basic sanity-checking (cross-origin)]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 3527e8589cf..00000000000
--- a/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini
index 72b8407061c..d6f07012774 100644
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini
@@ -1,3 +1,4 @@
 [2d.imageData.get.large.crash.html]
+  expected: TIMEOUT
   [Test that canvas crash when image data cannot be allocated.]
     expected: FAIL
diff --git a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
index 6f0fc648f04..ab1003579be 100644
--- a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
+++ b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
@@ -1,6 +1,7 @@
 [document-with-fragment-top.html]
+  expected: TIMEOUT
   [Autofocus elements in iframed documents with "top" fragments should work.]
     expected: FAIL
 
   [Autofocus elements in top-level browsing context's documents with "top" fragments should work.]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini
new file mode 100644
index 00000000000..a17d6e8fd93
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html.ini
@@ -0,0 +1,2 @@
+[details-pseudo-elements-001.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html.ini
deleted file mode 100644
index 7ccb1ce92bf..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[autoplay-with-broken-track.html]
-  expected: TIMEOUT
-  [<video autoplay> with <track src="invalid://url" default=""> child]
-    expected: TIMEOUT
-
-  [<video autoplay> with <track src="404" default=""> child]
-    expected: TIMEOUT
-
-  [<video autoplay> with <track src="" default=""> child]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
deleted file mode 100644
index 7fdd1803c93..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[event_timeupdate_noautoplay.html]
-  expected: TIMEOUT
-  [calling play() on a sufficiently long audio should trigger timeupdate event]
-    expected: NOTRUN
-
-  [calling play() on a sufficiently long video should trigger timeupdate event]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
deleted file mode 100644
index 09c049e4b58..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[media_fragment_seek.html]
-  [Video should seek to time specified in media fragment syntax]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 24903b5f66f..7d28d586f51 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index b83d68ddd33..26704422bbe 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 7da2bc5ac80..6a420504feb 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,3 @@
 [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: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index e8872b3585b..bbc1f35d8d9 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
new file mode 100644
index 00000000000..c14dc644276
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
@@ -0,0 +1,24 @@
+[parse-a-sizes-attribute-standards-mode.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e45 50w, /images/green-16x16.png?e45 51w" sizes="(min-width:-1px) 1px, 100vw"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
similarity index 78%
rename from tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
rename to tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
index 4eb09510021..d412cd99763 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
@@ -1,24 +1,24 @@
-[parse-a-sizes-attribute-quirks-mode.html]
-  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (quirks mode)]
+[parse-a-sizes-attribute-width-1000px.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e45 50w, /images/green-16x16.png?e45 51w" sizes="(min-width:-1px) 1px, 100vw"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e45 50w, /images/green-16x16.png?e45 51w" sizes="(min-width:-1px) 1px, 100vw"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (quirks mode)]
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini b/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini
new file mode 100644
index 00000000000..d44f3ccff52
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini
@@ -0,0 +1,3 @@
+[form-submit-iframe-then-location-navigate.html]
+  [Verifies that location navigations take precedence when following form submissions.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 0c580836e24..7f099cec1b0 100644
--- a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -7,6 +7,3 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
-
-  [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/meta/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/meta/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index fc0233f5241..00000000000
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
deleted file mode 100644
index f9a4f08cd70..00000000000
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-tla-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index f9b8118a722..31bfd644df0 100644
--- a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,5 +1,4 @@
 [promise-job-entry.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
diff --git a/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini b/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
new file mode 100644
index 00000000000..964697e81e9
--- /dev/null
+++ b/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
@@ -0,0 +1,2 @@
+[strategy-worker-terminate.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 20a8f9a4320..1f70062991c 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webmessaging/with-ports/017.html.ini b/tests/wpt/meta/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/meta/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/webmessaging/with-ports/018.html.ini b/tests/wpt/meta/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index b7b36c1d3a4..00000000000
--- a/tests/wpt/meta/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/webmessaging/without-ports/018.html.ini b/tests/wpt/meta/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index b7b36c1d3a4..00000000000
--- a/tests/wpt/meta/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini b/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini
deleted file mode 100644
index 77ca6b0688d..00000000000
--- a/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[stylesheet_media_queries.html]
-  [Media queries within stylesheets]
-    expected: FAIL
diff --git a/tests/wpt/tests/.azure-pipelines.yml b/tests/wpt/tests/.azure-pipelines.yml
index 3f31846aa59..75a87df90f0 100644
--- a/tests/wpt/tests/.azure-pipelines.yml
+++ b/tests/wpt/tests/.azure-pipelines.yml
@@ -501,7 +501,7 @@ jobs:
   - script: |
       set -eux -o pipefail
       export SYSTEM_VERSION_COMPAT=0
-      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel stable --kill-safari safari
+      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel stable --kill-safari --max-restarts 100 safari
     displayName: 'Run tests'
     retryCountOnTaskFailure: 2
   - task: PublishBuildArtifacts@1
@@ -542,7 +542,7 @@ jobs:
   - script: |
       set -eux -o pipefail
       export SYSTEM_VERSION_COMPAT=0
-      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel preview --kill-safari safari
+      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel preview --kill-safari --max-restarts 100 safari
     displayName: 'Run tests'
     retryCountOnTaskFailure: 2
   - task: PublishBuildArtifacts@1
diff --git a/tests/wpt/tests/accessibility/crashtests/missing-parent.html b/tests/wpt/tests/accessibility/crashtests/missing-parent.html
new file mode 100644
index 00000000000..42ebb8814f5
--- /dev/null
+++ b/tests/wpt/tests/accessibility/crashtests/missing-parent.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<style>
+.c0 { visibility: collapse; }
+.c4 { content: "x"; }
+</style>
+
+<div class="c0"><img usemap="#map2"></div>
+
+<table>
+  <thead class="c4">x</thead>
+</table>
+
+<map name="map2">x</map>
+
+<script>
+const img = document.createElement('img');
+img.setAttribute('src', 'xyz.png');
+img.setAttribute('usemap', '#map2');
+const div = document.querySelector('div');
+document.documentElement.appendChild(div);
+
+requestAnimationFrame(() => {
+  requestAnimationFrame(() => {
+    const thead = document.querySelector('thead');
+    thead.appendChild(img);
+    div.className = '';
+    document.documentElement.className = '';
+  });
+});
+</script>
+</html>
diff --git a/tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html b/tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html
index 2deaf6ab390..bc5726fed36 100644
--- a/tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html
+++ b/tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html>
 <audio src="foo"></audio>
-<template shadowroot="closed"></template>
+<template shadowrootmode="closed"></template>
diff --git a/tests/wpt/tests/core-aam/aria-describedby-manual.html b/tests/wpt/tests/core-aam/aria-describedby-manual.html
index 4cffe6fcb05..696c30a6b46 100644
--- a/tests/wpt/tests/core-aam/aria-describedby-manual.html
+++ b/tests/wpt/tests/core-aam/aria-describedby-manual.html
@@ -32,10 +32,10 @@
             ],
             "AXAPI" : [
                [
-                  "property",
-                  "AXHelp",
+                  "api",
+                  "accessibilityCustomContent",
                   "is",
-                  "hello world"
+                  "['label': 'hello world']"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-description-manual.html b/tests/wpt/tests/core-aam/aria-description-manual.html
new file mode 100644
index 00000000000..75746781ead
--- /dev/null
+++ b/tests/wpt/tests/core-aam/aria-description-manual.html
@@ -0,0 +1,70 @@
+<!doctype html>
+<html>
+  <head>
+    <title>aria-description</title>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/wai-aria/scripts/ATTAcomm.js"></script>
+    <script>
+    setup({explicit_timeout: true, explicit_done: true });
+
+    var theTest = new ATTAcomm(
+    {
+   "steps" : [
+      {
+         "element" : "test",
+         "test" : {
+            "ATK" : [
+               [
+                  "property",
+                  "Description",
+                  "is",
+                  "hello world"
+               ]
+            ],
+            "AXAPI" : [
+               [
+                  "api",
+                  "accessibilityCustomContent",
+                  "is",
+                  "['label': 'hello world']"
+               ]
+            ],
+            "IAccessible2" : [
+               [
+                  "property",
+                  "accDescriptio",
+                  "is",
+                  "hello world"
+               ]
+            ],
+            "UIA" : [
+               [
+                  "property",
+                  "FullDescription",
+                  "is",
+                  "hello world"
+               ]
+            ]
+         },
+         "title" : "step 1",
+         "type" : "test"
+      }
+   ],
+   "title" : "aria-description"
+}
+
+    ) ;
+    </script>
+  </head>
+  <body>
+  <p>This test examines the ARIA properties for aria-description.</p>
+    <div role='group' id='test' aria-description='hello world'>content</div>
+
+  <div id="manualMode"></div>
+  <div id="log"></div>
+  <div id="ATTAmessages"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html
index 985a8213ecf..c000b3ddb3e 100644
--- a/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html
+++ b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html
@@ -27,9 +27,9 @@
             "AXAPI" : [
                [
                   "property",
-                  "AXValidationError",
+                  "AXErrorMessageElements",
                   "isNot",
-                  "hello world"
+                  "[error]"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html
index 590a234c623..201565f7107 100644
--- a/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html
+++ b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html
@@ -27,9 +27,9 @@
             "AXAPI" : [
                [
                   "property",
-                  "AXValidationError",
+                  "AXErrorMessageElements",
                   "is",
-                  "hello world"
+                  "[error]"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-readonly_false-manual.html b/tests/wpt/tests/core-aam/aria-readonly_false-manual.html
index 7be1a70e473..2c93587ced8 100644
--- a/tests/wpt/tests/core-aam/aria-readonly_false-manual.html
+++ b/tests/wpt/tests/core-aam/aria-readonly_false-manual.html
@@ -69,7 +69,7 @@
   </head>
   <body>
   <p>This test examines the ARIA properties for aria-readonly=false.</p>
-    <div role='checkbox' id='test' aria-readonly='false'>content</div>
+    <div role='searchbox' id='test' aria-readonly='false'>content</div>
 
   <div id="manualMode"></div>
   <div id="log"></div>
diff --git a/tests/wpt/tests/core-aam/comment-manual.html b/tests/wpt/tests/core-aam/comment-manual.html
new file mode 100644
index 00000000000..6c7d7a1b169
--- /dev/null
+++ b/tests/wpt/tests/core-aam/comment-manual.html
@@ -0,0 +1,88 @@
+<!doctype html>
+<html>
+  <head>
+    <title>comment</title>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/wai-aria/scripts/ATTAcomm.js"></script>
+    <script>
+    setup({explicit_timeout: true, explicit_done: true });
+
+    var theTest = new ATTAcomm(
+    {
+   "steps" : [
+      {
+         "element" : "test",
+         "test" : {
+            "ATK" : [
+               [
+                  "property",
+                  "role",
+                  "is",
+                  "ROLE_COMMENT"
+               ],
+               [
+                  "property",
+                  "objectAttributes",
+                  "contains",
+                  "xml-roles:comment"
+               ]
+            ],
+            "AXAPI" : [
+               [
+                  "property",
+                  "AXRole",
+                  "is",
+                  "AXGroup"
+               ]
+            ],
+            "IAccessible2" : [
+               [
+                  "property",
+                  "role",
+                  "is",
+                  "IA2_ROLE_COMMENT"
+               ],
+               [
+                  "property",
+                  "objectAttributes",
+                  "contains",
+                  "xml-roles:comment"
+               ]
+            ],
+            "UIA" : [
+               [
+                  "property",
+                  "ControlType",
+                  "is",
+                  "Group"
+               ],
+               [
+                  "property",
+                  "LocalizedControlType",
+                  "is",
+                  "comment"
+               ]
+            ]
+         },
+         "title" : "step 1",
+         "type" : "test"
+      }
+   ],
+   "title" : "comment"
+}
+
+    ) ;
+    </script>
+  </head>
+  <body>
+  <p>This test examines the ARIA properties for comment.</p>
+    <div role='comment' id='test'>content</div>
+
+  <div id="manualMode"></div>
+  <div id="log"></div>
+  <div id="ATTAmessages"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/core-aam/form-manual.html b/tests/wpt/tests/core-aam/form-manual.html
index b533412093f..dcb6566b1bd 100644
--- a/tests/wpt/tests/core-aam/form-manual.html
+++ b/tests/wpt/tests/core-aam/form-manual.html
@@ -91,7 +91,7 @@
   </head>
   <body>
   <p>This test examines the ARIA properties for form.</p>
-    <div role='form' id='test'>content</div>
+    <div role='form' id='test' aria-labelled='the name of the form'>content</div>
 
   <div id="manualMode"></div>
   <div id="log"></div>
diff --git a/tests/wpt/tests/core-aam/form-unnamed.html b/tests/wpt/tests/core-aam/form-unnamed.html
new file mode 100644
index 00000000000..321be7fee08
--- /dev/null
+++ b/tests/wpt/tests/core-aam/form-unnamed.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<html>
+  <head>
+    <title>form</title>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/wai-aria/scripts/ATTAcomm.js"></script>
+    <script>
+    setup({explicit_timeout: true, explicit_done: true });
+    var theTest = new ATTAcomm(
+    {
+   "steps" : [
+      {
+         "element" : "test",
+         "test" : {
+            "ATK" : [
+               [
+                  "property",
+                  "role",
+                  "is",
+                  "ROLE_SECTION"
+               ]
+            ],
+            "AXAPI" : [
+               [
+                  "property",
+                  "AXRole",
+                  "is",
+                  "AXGroup"
+               ],
+               [
+                  "property",
+                  "AXSubrole",
+                  "is",
+                  "<nil>"
+               ]
+            ],
+            "IAccessible2" : [
+               [
+                  "property",
+                  "role",
+                  "is",
+                  "IA2_ROLE_SECTION"
+               ]
+            ],
+            "MSAA" : [
+               [
+                  "property",
+                  "role",
+                  "is",
+                  "ROLE_SYSTEM_GROUPING"
+               ]
+            ],
+            "UIA" : [
+               [
+                  "property",
+                  "ControlType",
+                  "is",
+                  "Group"
+               ]
+            ]
+         },
+         "title" : "step 1",
+         "type" : "test"
+      }
+   ],
+   "title" : "unnamed form"
+}
+
+    ) ;
+    </script>
+  </head>
+  <body>
+  <p>This test examines the ARIA properties for an unnamed form.</p>
+    <div role='form' id='test'>content</div>
+
+  <div id="manualMode"></div>
+  <div id="log"></div>
+  <div id="ATTAmessages"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/core-aam/tab-manual.html b/tests/wpt/tests/core-aam/tab-manual.html
index 89b8b48c56e..98a1c4374a7 100644
--- a/tests/wpt/tests/core-aam/tab-manual.html
+++ b/tests/wpt/tests/core-aam/tab-manual.html
@@ -35,7 +35,7 @@
                   "property",
                   "AXSubrole",
                   "is",
-                  "<nil>"
+                  "AXTabButton"
                ]
             ],
             "MSAA" : [
diff --git a/tests/wpt/tests/credential-management/fedcm-basic.https.html b/tests/wpt/tests/credential-management/fedcm-basic.https.html
index 1c2b916103c..d5804f796e9 100644
--- a/tests/wpt/tests/credential-management/fedcm-basic.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-basic.https.html
@@ -16,6 +16,7 @@ import {fedcm_test,
 fedcm_test(async t => {
   const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
   assert_equals(cred.token, "token");
+  assert_equals(cred.isAutoReauthn, false);
 }, "Successfully obtaining token should resolve the promise.");
 
 </script>
diff --git a/tests/wpt/tests/credential-management/fedcm-hosteddomain.https.html b/tests/wpt/tests/credential-management/fedcm-hosteddomain.https.html
new file mode 100644
index 00000000000..5e39542fdef
--- /dev/null
+++ b/tests/wpt/tests/credential-management/fedcm-hosteddomain.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API hosted domain tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<body>
+
+<script type="module">
+import {
+  fedcm_test,
+  request_options_with_hosted_domain,
+  select_manifest,
+  fedcm_get_and_select_first_account
+} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let options = request_options_with_hosted_domain('manifest.py',
+    'nomatch');
+  const cred = fedcm_get_and_select_first_account(t, options);
+  return promise_rejects_dom(t, "NetworkError", cred);
+}, "No hosted domain matches an account.");
+
+fedcm_test(async t => {
+  const options = request_options_with_hosted_domain('manifest.py',
+    'idp.example');
+  const cred = await fedcm_get_and_select_first_account(t, options);
+  assert_equals(cred.token, 'token');
+}, "Hosted domain matches an account.");
+
+fedcm_test(async t => {
+  let options = request_options_with_hosted_domain(
+    'manifest_with_two_accounts.json', 'example');
+  await select_manifest(t, options);
+
+  const cred = await fedcm_get_and_select_first_account(t, options);
+  assert_equals(cred.token, 'account_id=john_doe');
+}, "Hosted domain matches an account from two accounts.");
+
+fedcm_test(async t => {
+  let options = request_options_with_hosted_domain(
+    'manifest_with_two_accounts.json', '*');
+  await select_manifest(t, options);
+
+  const cred = await fedcm_get_and_select_first_account(t, options);
+  assert_equals(cred.token, 'account_id=john_doe');
+}, "Hosted domain '*' matches an account with any hosted domain.");
+  </script>
diff --git a/tests/wpt/tests/credential-management/fedcm-loginhint.https.html b/tests/wpt/tests/credential-management/fedcm-loginhint.https.html
index cb03116dc7a..11159b84d56 100644
--- a/tests/wpt/tests/credential-management/fedcm-loginhint.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-loginhint.https.html
@@ -5,7 +5,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <body>
 
 <script type="module">
diff --git a/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html b/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
index e5b39961124..bec836f25f0 100644
--- a/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
@@ -29,5 +29,6 @@ fedcm_test(async t => {
   // "Jane" is a new user, the second account "John" will be selected.
   cred = await navigator.credentials.get(test_options);
   assert_equals(cred.token, "account_id=john_doe");
+  assert_equals(cred.isAutoReauthn, true);
 }, "Test that the returning account from the two accounts will be auto re-authenticated.");
 </script>
diff --git a/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js b/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
index 2e8f8066817..c422c6594ce 100644
--- a/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
+++ b/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
@@ -150,6 +150,13 @@ export function request_options_with_login_hint(manifest_filename, login_hint) {
   return options;
 }
 
+export function request_options_with_hosted_domain(manifest_filename, hosted_domain) {
+  let options = request_options_with_mediation_required(manifest_filename);
+  options.identity.providers[0].hostedDomain = hosted_domain;
+
+  return options;
+}
+
 export function fedcm_get_dialog_type_promise(t) {
   return new Promise(resolve => {
     async function helper() {
diff --git a/tests/wpt/tests/credential-management/support/fedcm/accounts.py b/tests/wpt/tests/credential-management/support/fedcm/accounts.py
index 1ec7f7dc124..dabc2c6f9f9 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/accounts.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/accounts.py
@@ -25,7 +25,8 @@ def main(request, response):
    "email": "john_doe@idp.example",
    "picture": "https://idp.example/profile/123",
    "approved_clients": ["123", "456", "789"],
-   "login_hints": ["john_doe"]
+   "login_hints": ["john_doe"],
+   "hosted_domains": ["idp.example", "example"]
   }]
 }
 """
diff --git a/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py b/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
index c355d21f1f2..75ebf51056c 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
@@ -34,9 +34,9 @@ def main(request, response):
    "email": "john_doe@idp.example",
    "picture": "https://idp.example/profile/123",
    "approved_clients": ["123", "456", "789"],
-   "login_hints": ["john_doe"]
+   "login_hints": ["john_doe"],
+   "hosted_domains": ["idp.example", "example"]
   }
   ]
 }
 """
-
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-13.html b/tests/wpt/tests/css/css-backgrounds/border-image-013.html
similarity index 67%
rename from tests/wpt/tests/css/css-backgrounds/border-image-13.html
rename to tests/wpt/tests/css/css-backgrounds/border-image-013.html
index 52095cf289f..c7cc7d54a39 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-13.html
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-013.html
@@ -3,13 +3,13 @@
 <head>
     <meta charset="utf-8">
     <title>
-        CSS Border and Background: border-image #13 border-image-repeat
+        CSS Backgrounds and Borders Test: border-image-repeat: repeat (basic)
     </title>
-    <meta name="assert" content="Test for the border-image-repeat property with the value repeat" />
 
-    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
 
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
+    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net">
+    <link rel="match" href="reference/border-image-013-ref.html">
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-repeat">
 
     <style type="text/css">
 
@@ -29,7 +29,7 @@
 <body>
 
     <p>
-        Pass if the square has borders made of green dots.
+        Pass if the square has borders made of green dots and <strong>no red</strong>.
     </p>
 
     <div id="test"></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-14.html b/tests/wpt/tests/css/css-backgrounds/border-image-14.html
deleted file mode 100644
index 119d3309e97..00000000000
--- a/tests/wpt/tests/css/css-backgrounds/border-image-14.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>
-        CSS Border and Background: border-image #14 border-image-repeat
-    </title>
-    <meta name="assert" content="Test for the border-image-repeat property with the value round" />
-
-    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
-
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
-
-    <style type="text/css">
-
-        #test {
-            border : 10px solid red;
-            width  : 39px;
-            height : 39px;
-
-            border-image-source: url(support/img-ref-2.png);
-            border-image-slice : 10;
-            border-image-repeat: round;
-        }
-
-    </style>
-
-</head>
-<body>
-
-    <p>
-        Pass if the square has borders made of plain green dots.
-    </p>
-
-    <div id="test"></div>
-
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-15.html b/tests/wpt/tests/css/css-backgrounds/border-image-15.html
deleted file mode 100644
index a3e748e6f56..00000000000
--- a/tests/wpt/tests/css/css-backgrounds/border-image-15.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>
-        CSS Border and Background: border-image #15 border-image-repeat
-    </title>
-    <meta name="assert" content="Test for the border-image-repeat property with the value space" />
-
-    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
-
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
-
-    <style type="text/css">
-
-        #test {
-            border : 10px solid red;
-            width  : 39px;
-            height : 39px;
-
-            border-image-source: url(support/img-ref-2.png);
-            border-image-slice : 10;
-            border-image-repeat: space;
-        }
-
-    </style>
-
-</head>
-<body>
-
-    <p>
-        Pass if the square has borders made of plain regular green dots.
-    </p>
-
-    <div id="test"></div>
-
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-16.html b/tests/wpt/tests/css/css-backgrounds/border-image-16.html
deleted file mode 100644
index 6829c04ffeb..00000000000
--- a/tests/wpt/tests/css/css-backgrounds/border-image-16.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>
-        CSS Border and Background: border-image #16 border-image-repeat
-    </title>
-    <meta name="assert" content="Test for the border-image-repeat property with the value stretch" />
-
-    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
-
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
-
-    <style type="text/css">
-
-        #test {
-            border : 10px solid red;
-            width  : 39px;
-            height : 39px;
-
-            border-image-source: url(support/img-ref-2.png);
-            border-image-slice : 10;
-            border-image-repeat: stretch;
-        }
-
-    </style>
-
-</head>
-<body>
-
-    <p>
-        Pass if the the corners are regular green dots and borders are single stretch dots.
-    </p>
-
-    <div id="test"></div>
-
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html
new file mode 100644
index 00000000000..c2cb2372bc7
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Backgrounds Test: border-image-repeat: round</title>
+
+  <!--
+
+  Created: June 21st 2023
+
+  Last modified: June 25th 2023
+
+  -->
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-process">
+  <link rel="match" href="reference/border-image-repeat-round-003-ref.html">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that the process of repeating the tile when 'border-image-repeat' is 'round'. In this test, we check with a specially crafted rectangular border-image how the sliced border-image is, in the first-subtest, rescaled down in the 4 sides, is, in the second-subtest, rescaled up in the 4 sides and, finally, is, in the third-subtest, rescaled up in the left and right sides while being rescaled down in the top and bottom sides." name="assert">
+
+  <!--
+
+  'round'
+  The image is tiled (repeated) to fill the area. If it does not
+  fill the area with a whole number of tiles, the image is rescaled
+  so that it does.
+
+  https://www.w3.org/TR/css-backgrounds-3/#valdef-border-image-repeat-round
+
+  -->
+
+  <style>
+  div
+    {
+      border: red solid 64px;
+      border-image-repeat: round; /* this is the same as 'round round' since
+      "
+      If the second keyword is absent, it is assumed to be the same as the first.
+      https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat
+      "
+      */
+      border-image-slice: 64 fill; /* the center will be black */
+      border-image-source: url("support/4bicolor-squares.png");
+      display: inline-block;
+      margin-right: 1em;
+      vertical-align: bottom;
+   }
+
+  div#first-subtest
+    {
+      height: 96px;
+      width: 96px;
+      /*
+      96px divided by 64px == 1.5 which is rounded up to 2.
+      So, each image should be 96px divided by 2 == 48px
+      wide or tall. That means that the top and bottom
+      bicolor (yellow and purple) images should be 48px wide
+      and the left and right bicolor (orange and blue)
+      images should be 48px tall.
+      So, in this first-subtest, the 4 side border-image is
+      rescaled down, from sliced 64px to 48px.
+      */
+    }
+
+  div#second-subtest
+    {
+      height: 80px;
+      width: 80px;
+      /*
+      80px divided by 64px == 1.25 which is rounded down to 1.
+      So, each image should be 80px divided by 1 == 80px
+      wide or tall. That means that the top and bottom
+      bicolor (yellow and purple) images should be 80px wide
+      and the left and right bicolor (orange and blue)
+      images should be 80px tall.
+      So, in this second-subtest, the 4 side border-image are
+      rescaled up, from sliced 64px to 80px.
+      */
+    }
+
+  div#third-subtest
+    {
+      margin-top: 1em;
+
+      height: 144px;
+      width: 168px;
+      /*
+      168px divided by 64px == 2.625 which is rounded up to 3.
+      So, each image should be 168px divided by 3 == 56px
+      wide. That means that the top and bottom
+      bicolor (yellow and purple) images should be 56px wide.
+      144px divided by 64px == 2.25 which is rounded down to 2.
+      So, each image should be 144px divided by 2 == 72px
+      tall. That means that the left and right
+      bicolor (orange and blue) images should be 72px tall.
+      So, in this third-subtest, the 2 top and bottom sides
+      border-image are rescaled down, from sliced 64px to
+      56px while the 2 left and right sides border-image are
+      rescaled up, from sliced 64px to 72px.
+      */
+    }
+  </style>
+
+  <div id="first-subtest"></div>
+
+  <div id="second-subtest"></div><br>
+
+  <div id="third-subtest"></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html
new file mode 100644
index 00000000000..2a23e789f90
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Backgrounds Test: border-image-repeat: round stretch</title>
+
+  <!--
+
+  Created: June 23rd 2023
+
+  Last modified: June 23rd 2023
+
+  -->
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-process">
+  <link rel="match" href="reference/border-image-repeat-round-stretch-001-ref.html">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that the process of repeating the tile when 'border-image-repeat' is 'round stretch'. Thanks to a specially crafted rectangular border-image, we check how the sliced border-image is, in the first-subtest, rescaled down horizontally (top and bottom sides), and is, in the second-subtest, rescaled up horizontally (top and bottom sides). In both subtests, the border-image in the vertical axis (left and right sides) are stretched." name="assert">
+
+  <!--
+
+  'round'
+  The image is tiled (repeated) to fill the area. If it does not
+  fill the area with a whole number of tiles, the image is rescaled
+  so that it does.
+
+  https://www.w3.org/TR/css-backgrounds-3/#valdef-border-image-repeat-round
+
+
+  'stretch'
+  The image is stretched to fill the area.
+
+  https://www.w3.org/TR/css-backgrounds-3/#valdef-border-image-repeat-stretch
+
+  -->
+
+  <style>
+  div
+    {
+      border: red solid 64px;
+      border-image-repeat: round stretch;
+      /*
+      "
+      The first keyword applies to the horizontal scaling and
+      tiling of the top, middle and bottom parts, the second to
+      the vertical scaling and tiling of the left, middle and right parts
+      "
+      https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat
+      */
+      border-image-slice: 64 fill; /* the center will be black */
+      border-image-source: url("support/4bicolor-squares.png");
+      display: inline-block;
+      margin-right: 1em;
+   }
+
+  div#first-subtest
+    {
+      height: 192px;
+      width: 96px;
+      /*
+      96px divided by 64px == 1.5 which is rounded up to 2.
+      So, the image should be 96px divided by 2 == 48px
+      wide. That means that the top and bottom bicolor
+      (yellow and purple) images should be 48px wide,
+      therefore rescaled down, from sliced 64px to 48px.
+
+      The left and right sides should be stretched from
+      sliced 64px to 192px (3 times).
+      */
+    }
+
+  div#second-subtest
+    {
+      height: 128px;
+      width: 80px;
+      /*
+      80px divided by 64px == 1.25 which is rounded down to 1.
+      So, each image should be 80px divided by 1 == 80px
+      wide. That means that the top and bottom bicolor
+      (yellow and purple) images should be 80px wide
+      therefore rescaled up, from sliced 64px to 80px.
+
+      The left and right sides should be stretched from
+      sliced 64px to 128px (2 times).
+      */
+    }
+  </style>
+
+  <div id="first-subtest"></div>
+
+  <div id="second-subtest"></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html
new file mode 100644
index 00000000000..2ac51fecf23
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Backgrounds Test: border-image-repeat: stretch round</title>
+
+  <!--
+
+  Created: June 23rd 2023
+
+  Last modified: June 23rd 2023
+
+  -->
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat">
+  <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-process">
+  <link rel="match" href="reference/border-image-repeat-stretch-round-001-ref.html">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that the process of repeating the tile when 'border-image-repeat' is 'stretch round'. Thanks to a specially crafted rectangular border-image, we check how the sliced border-image is, in the first-subtest, rescaled down vertically (left and right sides), and is, in the second-subtest, rescaled up vertically (left and right sides). In both subtests, the border-image in the horizontal axis (top and bottom sides) are stretched." name="assert">
+
+  <!--
+
+  'stretch'
+  The image is stretched to fill the area.
+
+  https://www.w3.org/TR/css-backgrounds-3/#valdef-border-image-repeat-stretch
+
+
+  'round'
+  The image is tiled (repeated) to fill the area. If it does not
+  fill the area with a whole number of tiles, the image is rescaled
+  so that it does.
+
+  https://www.w3.org/TR/css-backgrounds-3/#valdef-border-image-repeat-round
+
+  -->
+
+  <style>
+  div
+    {
+      border: red solid 64px;
+      border-image-repeat: stretch round;
+      /*
+      "
+      The first keyword applies to the horizontal scaling and
+      tiling of the top, middle and bottom parts, the second to
+      the vertical scaling and tiling of the left, middle and right parts
+      "
+      https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat
+      */
+      border-image-slice: 64 fill; /* the center will be black */
+      border-image-source: url("support/4bicolor-squares.png");
+      display: inline-block;
+      margin-right: 1em;
+   }
+
+  div#first-subtest
+    {
+      height: 96px;
+      width: 192px;
+      /*
+      96px divided by 64px == 1.5 which is rounded up to 2.
+      So, the image should be 96px divided by 2 == 48px
+      wide. That means that the left and right
+      bicolor (orange and blue) images should be 48px tall,
+      therefore rescaled down, from sliced 64px to 48px.
+
+      The top and bottom sides should be stretched from
+      sliced 64px to 192px (3 times).
+      */
+    }
+
+  div#second-subtest
+    {
+      height: 80px;
+      width: 128px;
+      /*
+      80px divided by 64px == 1.25 which is rounded down to 1.
+      So, each image should be 80px divided by 1 == 80px
+      tall. That means that the left and right bicolor
+      (orange and blue) images should be 80px tall
+      therefore rescaled up, from sliced 64px to 80px.
+
+      The top and bottom sides should be stretched from
+      sliced 64px to 128px (2 times).
+      */
+    }
+  </style>
+
+  <div id="first-subtest"></div>
+
+  <div id="second-subtest"></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm b/tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm
index d6484b06db3..45feaf60ad7 100644
Binary files a/tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm and b/tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm differ
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm
index a07426a6282..2a5d02e8acc 100644
Binary files a/tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm and b/tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm differ
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-002.htm
deleted file mode 100644
index 3503e8373fc..00000000000
Binary files a/tests/wpt/tests/css/css-backgrounds/border-image-width-002.htm and /dev/null differ
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-003.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-003.htm
deleted file mode 100644
index d85c6352885..00000000000
Binary files a/tests/wpt/tests/css/css-backgrounds/border-image-width-003.htm and /dev/null differ
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-004.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-004.htm
deleted file mode 100644
index 0d1fc02f141..00000000000
Binary files a/tests/wpt/tests/css/css-backgrounds/border-image-width-004.htm and /dev/null differ
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-013-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-013-ref.html
new file mode 100644
index 00000000000..789afe1a7a2
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-013-ref.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+
+  <meta charset="utf-8">
+
+  <title>CSS Reference Test</title>
+
+  <!--
+
+  Author is Chris Nardi
+
+  -->
+
+  <style>
+  .borderContainer
+    {
+      height: 50px;
+      position: relative;
+      width: 50px;
+    }
+
+  .borderContainer > div
+    {
+      background-image: url("../support/green-dot.png");
+      height: 10px;
+      position: absolute;
+      width: 10px;
+    }
+
+  .left
+    {
+      left: 0px;
+    }
+
+  .left1
+    {
+      left: 10px;
+    }
+
+  .left2
+    {
+      left: 20px;
+    }
+
+  .left3
+    {
+      left: 30px;
+    }
+
+  .right
+    {
+      right: 0px;
+    }
+
+  .top
+    {
+      top: 0px;
+    }
+
+  .top1
+    {
+      top: 10px;
+    }
+
+  .top2
+    {
+      top: 20px;
+    }
+
+  .top3
+    {
+      top: 30px;
+    }
+
+  .bottom
+    {
+      bottom: 0px;
+    }
+  </style>
+
+    <p>Pass if the square has borders made of green dots and <strong>no red</strong>.
+
+    <div class="borderContainer">
+        <div class="top left"></div><div class="top left1"></div><div class="top left2"></div><div class="top left3"></div><div class="top right"></div>
+        <div class="left top1"></div><div class="right top1"></div>
+        <div class="left top2"></div><div class="right top2"></div>
+        <div class="left top3"></div><div class="right top3"></div>
+        <div class="bottom left"></div><div class="bottom left1"></div><div class="bottom left2"></div><div class="bottom left3"></div><div class="bottom right"></div>
+    </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-003-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-003-ref.html
new file mode 100644
index 00000000000..4b63a4c032e
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-003-ref.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div#first-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      margin-right: 1em;
+      table-layout: fixed;
+
+      height: 224px;
+      width: 224px;
+    }
+
+  div#second-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      table-layout: fixed;
+
+      height: 208px;
+      width: 208px;
+    }
+
+  div#third-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      margin-top: 1em;
+      table-layout: fixed;
+
+      height: 272px;
+      width: 296px;
+    }
+  </style>
+
+    <div id="first-subtest">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 25%, purple 25% 50%, yellow 50% 75%, purple 75% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 25%, purple 25% 50%, yellow 50% 75%, purple 75% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div>
+
+    <div id="second-subtest" style="vertical-align: bottom;">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div><br>
+
+  <div id="third-subtest">
+    <div style="display: table-row;">
+      <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0px 28px, purple 28px 56px, yellow 56px 84px, purple 84px 112px, yellow 112px 140px, purple 140px 168px, yellow 168px 196px, purple 196px 224px);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+    </div>
+
+    <div style="display: table-row;">
+      <div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div>
+    </div>
+
+    <div style="display: table-row;">
+      <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0px 28px, purple 28px 56px, yellow 56px 84px, purple 84px 112px, yellow 112px 140px, purple 140px 168px, yellow 168px 196px, purple 196px 224px);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+    </div>
+  </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-stretch-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-stretch-001-ref.html
new file mode 100644
index 00000000000..32253750f0b
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-stretch-001-ref.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div#first-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      margin-right: 1em;
+      table-layout: fixed;
+
+      height: 320px;
+      width: 224px;
+    }
+
+  div#second-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      table-layout: fixed;
+
+      height: 256px;
+      width: 208px;
+    }
+  </style>
+
+    <div id="first-subtest">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 25%, purple 25% 50%, yellow 50% 75%, purple 75% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 25%, purple 25% 50%, yellow 50% 75%, purple 75% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div>
+
+    <div id="second-subtest" style="vertical-align: bottom;">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-stretch-round-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-stretch-round-001-ref.html
new file mode 100644
index 00000000000..931dd3be5e8
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-stretch-round-001-ref.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div#first-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      margin-right: 1em;
+      table-layout: fixed;
+
+      height: 224px;
+      width: 320px;
+    }
+
+  div#second-subtest
+    {
+      background-color: black;
+      display: inline-table;
+      table-layout: fixed;
+
+      height: 208px;
+      width: 256px;
+    }
+  </style>
+
+    <div id="first-subtest">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 25%, blue 25% 50%, orange 50% 75%, blue 75% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div>
+
+    <div id="second-subtest" style="vertical-align: bottom;">
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div><div style="display: table-cell;"></div><div style="display: table-cell; background-image: linear-gradient(orange 0% 50%, blue 50% 100%);"></div>
+      </div>
+
+      <div style="display: table-row;">
+        <div style="display: table-cell; height: 64px; width: 64px;"></div><div style="display: table-cell; background-image: linear-gradient(to right, yellow 0% 50%, purple 50% 100%);"></div><div style="display: table-cell; height: 64px; width: 64px;"></div>
+      </div>
+    </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-006-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-006-ref.html
new file mode 100644
index 00000000000..d4312675731
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-006-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest reference</title>
+
+  <style>
+  div
+    {
+      background-color: green;
+      height: 30px;
+      margin: 50px;
+      position: relative;
+      width: 30px;
+    }
+
+  div#top-right
+    {
+      left: 130px;
+      bottom: 80px;
+    }
+
+  div#bottom-left
+    {
+      bottom: 30px;
+    }
+
+  div#bottom-right
+    {
+      left: 130px;
+      bottom: 110px;
+    }
+  </style>
+
+  <p>Test passes if there are four identical green squares and <strong>no red</strong>.
+
+  <div id="top-left"></div><div id="top-right"></div><div id="bottom-left"></div><div id="bottom-right"></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/reference/border-image-width-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-width-001-ref.html
new file mode 100644
index 00000000000..a3e1a91eef0
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/reference/border-image-width-001-ref.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest reference</title>
+
+  <style>
+  div.subtest
+    {
+      background-color: green;
+      height: 120px;
+      margin: 8px auto 8px 0px;
+      width: 120px;
+    }
+
+  div > div
+    {
+      background-color: lime;
+      position: relative;
+    }
+
+  div#subtest1 > div
+    {
+      height: 75px;
+      left: 15px;
+      top: 30px;
+      width: 80px;
+    }
+
+  div#subtest2 > div
+    {
+      height: 60px;
+      left: 10px;
+      top: 30px;
+      width: 100px;
+    }
+
+  div#subtest3 > div
+    {
+      height: 75px;
+      left: 15px;
+      top: 30px;
+      width: 80px;
+    }
+
+  div#subtest4 > div
+    {
+      height: 90px;
+      left: 25px;
+      top: 15px;
+      width: 70px;
+    }
+  </style>
+
+  <div class="subtest" id="subtest1"><div></div></div>
+
+  <div class="subtest" id="subtest2"><div></div></div>
+
+  <div class="subtest" id="subtest3" style="height: 135px; width: 110px;"><div></div></div>
+
+  <div class="subtest" id="subtest4"><div></div></div>
diff --git a/tests/wpt/tests/css/css-backgrounds/support/4bicolor-squares.png b/tests/wpt/tests/css/css-backgrounds/support/4bicolor-squares.png
new file mode 100644
index 00000000000..252710dc44d
Binary files /dev/null and b/tests/wpt/tests/css/css-backgrounds/support/4bicolor-squares.png differ
diff --git a/tests/wpt/tests/css/css-backgrounds/support/green-dot.png b/tests/wpt/tests/css/css-backgrounds/support/green-dot.png
new file mode 100644
index 00000000000..034353e234e
Binary files /dev/null and b/tests/wpt/tests/css/css-backgrounds/support/green-dot.png differ
diff --git a/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print-ref.html b/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print-ref.html
new file mode 100644
index 00000000000..08f69ef6a1e
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <title>Absolute position frame inside 'overflow: hidden' immediately after a forced page break</title>
+  <link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+  <style>
+    .inner {
+      box-sizing: border-box;
+      width: 100%;
+    }
+    .outer {
+      break-after: page;
+      width: 100vw;
+      height: 100vh;
+    }
+    html, body { margin: 0; }
+  </style>
+  <body>
+    <div class="outer">
+      <div class="inner" style="border: 3px solid blue">111</div>
+    </div>
+    <div class="outer">
+      <div class="inner" style="border: 3px solid black">222</div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print.html b/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print.html
new file mode 100644
index 00000000000..12d8a679ad7
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/abspos-overflow-hidden-001-print.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <title>Absolute position frame inside 'overflow: hidden' immediately after a forced page break</title>
+  <link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+  <link rel="match" href="abspos-overflow-hidden-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-break-3/#page-break-values"/>
+  <meta name="assert" content="An abspos box after a forced pagebreak and inside 'overflow:hidden' should be visible on the next page"/>
+  <style>
+    .inner {
+      position: absolute;
+      box-sizing: border-box;
+      width: 100%;
+    }
+    .outer {
+      overflow: hidden;
+      position: relative;
+      break-after: page;
+      width: 100vw;
+      height: 100vh;
+    }
+    html, body { margin: 0; }
+  </style>
+  <body>
+    <div class="outer">
+      <div class="inner" style="border: 3px solid blue">111</div>
+    </div>
+    <div class="outer">
+      <div class="inner" style="border: 3px solid black">222</div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-break/block-in-inline-008.html b/tests/wpt/tests/css/css-break/block-in-inline-008.html
new file mode 100644
index 00000000000..013cb8447e4
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/block-in-inline-008.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1457464">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<!-- There are no valid breakpoints in this test. Blink will still place a break
+     between the end of #monolith and the bottom padding of #container, to
+     prevent fragmentainer overflow, whereas Gecko won't insert any breaks at
+     all. All we want to test here, though, is that no break is inserted between
+     the top border of #outer and #container. -->
+<div style="columns:1; overflow:hidden; column-fill:auto; width:100px; height:100px; background:red;">
+  <div id="outer" style="width:100px; border-top:10px solid green;">
+    <span>
+      <div id="container" style="padding-bottom:50px;">
+        <div id="monolith" style="contain:size; height:90px; background:green;"></div>
+      </div>
+    </span>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/block-in-inline-009.html b/tests/wpt/tests/css/css-break/block-in-inline-009.html
new file mode 100644
index 00000000000..0acb317464f
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/block-in-inline-009.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1457464">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; gap:0; column-fill:auto; height:200px; orphans:1; widows:1;">
+    <div style="height:100px; background:green;"></div>
+    <div style="height:10px;"></div>
+    <div style="border-top:40px solid green;">
+      <span>
+        <div style="contain:size; height:60px; background:green;"></div>
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/float-013.html b/tests/wpt/tests/css/css-break/float-013.html
new file mode 100644
index 00000000000..5f8c595c042
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/float-013.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1458768">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; gap:0; column-fill:auto; height:200px;">
+    <div style="height:100px; background:green;"></div>
+    <div style="float:left; break-inside:avoid; margin-bottom:1px; width:100%; height:100px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/float-014.tentative.html b/tests/wpt/tests/css/css-break/float-014.tentative.html
new file mode 100644
index 00000000000..95c9d6f89f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/float-014.tentative.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1458768">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/9191">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; gap:0; column-fill:auto; height:200px;">
+    <div style="height:100px; background:green;"></div>
+    <div style="float:left; margin-bottom:1px; width:100%; height:100px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/float-015.tentative.html b/tests/wpt/tests/css/css-break/float-015.tentative.html
new file mode 100644
index 00000000000..885edbc84c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/float-015.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1458768">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/9191">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; gap:0; column-fill:auto; height:200px;">
+    <div style="height:100px; background:green;"></div>
+    <div style="float:left; margin-bottom:1px; width:100%; height:100px; background:green;">
+      <div style="height:150px;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/zero-height-page-break-001-print-ref.html b/tests/wpt/tests/css/css-break/zero-height-page-break-001-print-ref.html
new file mode 100644
index 00000000000..d56687c9e52
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/zero-height-page-break-001-print-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <title>Zero height box immediately after a forced page-break</title>
+  <link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+  <body>
+    <div style="break-after: page; height: 100%">Page 1</div>
+    <div style="height: 1in"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-break/zero-height-page-break-001-print.html b/tests/wpt/tests/css/css-break/zero-height-page-break-001-print.html
new file mode 100644
index 00000000000..3e3fb82628a
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/zero-height-page-break-001-print.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <title>Zero height box immediately after a forced page-break</title>
+  <link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+  <link rel="match" href="zero-height-page-break-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-break-3/#page-break-values"/>
+  <meta name="assert" content="Ensures that a zero-height frame after a forced page-break appears on the following page."/>
+  <!-- This will cause a failure of there is only one page, regardless of matching the ref -->
+  <meta name="reftest-pages" content="1,2"/>
+  <body>
+    <div style="break-after: page; height: 100%">Page 1</div>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-cascade/scope-focus.html b/tests/wpt/tests/css/css-cascade/scope-focus.html
new file mode 100644
index 00000000000..578a7702c1d
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/scope-focus.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<title>@scope and :focus</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-6/#scope-atrule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<main id=main></main>
+
+<template id=test_subject>
+  <div>
+    <style>
+        @scope (.a:focus) {
+          :scope { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>1</div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_subject.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+
+  assert_equals(getComputedStyle(a).zIndex, 'auto');
+  await test_driver.bless('focus', () => a.focus());
+  assert_equals(getComputedStyle(a).zIndex, '1');
+}, ':focus via :scope in subject');
+</script>
+
+<template id=test_non_subject>
+  <div>
+    <style>
+        @scope (.a:focus) {
+          :scope .b { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>
+      <div class=b>2</div>
+    </div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_non_subject.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+  let b = main.querySelector('.b');
+
+  assert_equals(getComputedStyle(b).zIndex, 'auto');
+  await test_driver.bless('focus', () => a.focus());
+  assert_equals(getComputedStyle(b).zIndex, '1');
+}, ':focus via :scope in non-subject');
+</script>
+
+<template id=test_subject_limit>
+  <div>
+    <style>
+        @scope (.a) to (:scope:focus) {
+          :scope { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>3</div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_subject_limit.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+
+  assert_equals(getComputedStyle(a).zIndex, '1');
+  await test_driver.bless('focus', () => a.focus());
+  // After focus(), we're no longer in scope because the limit (to-selector)
+  // kicks in.
+  assert_equals(getComputedStyle(a).zIndex, 'auto');
+}, ':focus in limit, :scope in subject');
+</script>
+
+<template id=test_non_subject_limit>
+  <div>
+    <style>
+        @scope (.a) to (.b:focus) {
+          .b { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>
+      <div class=b tabindex=1>4</div>
+    </div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_non_subject_limit.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+  let b = main.querySelector('.b');
+
+  assert_equals(getComputedStyle(b).zIndex, '1');
+  await test_driver.bless('focus', () => b.focus());
+  // After focus(), we're no longer in scope because the limit (to-selector)
+  // kicks in.
+  assert_equals(getComputedStyle(b).zIndex, 'auto');
+}, ':focus in intermediate limit, :scope in subject');
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-hover.html b/tests/wpt/tests/css/css-cascade/scope-hover.html
new file mode 100644
index 00000000000..648fb361d67
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/scope-hover.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<title>@scope and :hover</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-6/#scope-atrule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<main id=main></main>
+
+<script>
+  async function hover(element) {
+    let actions = new test_driver.Actions().pointerMove(0, 0, {origin: element});
+    await actions.send();
+  }
+</script>
+
+<template id=test_subject>
+  <div>
+    <style>
+        @scope (.a:hover) {
+          :scope { z-index: 1; }
+        }
+    </style>
+    <div class=a>1</div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_subject.content.cloneNode(true));
+  let a = main.querySelector('.a');
+  assert_equals(getComputedStyle(a).zIndex, 'auto');
+  await hover(a);
+  assert_equals(getComputedStyle(a).zIndex, '1');
+}, ':hover via :scope in subject');
+</script>
+
+<template id=test_non_subject>
+  <div>
+    <style>
+        @scope (.a:hover) {
+          :scope .b { z-index: 1; }
+        }
+    </style>
+    <div class=a>
+      <div class=b>2</div>
+    </div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_non_subject.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+  let b = main.querySelector('.b');
+
+  assert_equals(getComputedStyle(b).zIndex, 'auto');
+  await hover(a);
+  assert_equals(getComputedStyle(b).zIndex, '1');
+}, ':hover via :scope in non-subject');
+</script>
+
+<template id=test_subject_limit>
+  <div>
+    <style>
+        @scope (.a) to (:scope:hover) {
+          :scope { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>3</div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_subject_limit.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+
+  assert_equals(getComputedStyle(a).zIndex, '1');
+  await hover(a);
+  // After hover, we're no longer in scope because the limit (to-selector)
+  // kicks in.
+  assert_equals(getComputedStyle(a).zIndex, 'auto');
+}, ':hover in limit, :scope in subject');
+</script>
+
+<template id=test_non_subject_limit>
+  <div>
+    <style>
+        @scope (.a) to (.b:hover) {
+          .b { z-index: 1; }
+        }
+    </style>
+    <div class=a tabindex=0>
+      <div class=b tabindex=1>4</div>
+    </div>
+</template>
+<script>
+promise_test(async (t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_non_subject_limit.content.cloneNode(true));
+
+  let a = main.querySelector('.a');
+  let b = main.querySelector('.b');
+
+  assert_equals(getComputedStyle(b).zIndex, '1');
+  await hover(b);
+  // After hover, we're no longer in scope because the limit (to-selector)
+  // kicks in.
+  assert_equals(getComputedStyle(b).zIndex, 'auto');
+}, ':hover in intermediate limit, :scope in subject');
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-invalidation.html b/tests/wpt/tests/css/css-cascade/scope-invalidation.html
index d41df57851e..d53257e8944 100644
--- a/tests/wpt/tests/css/css-cascade/scope-invalidation.html
+++ b/tests/wpt/tests/css/css-cascade/scope-invalidation.html
@@ -62,6 +62,36 @@ test_scope_invalidation(document.currentScript, () => {
 }, 'Element becoming scope root');
 </script>
 
+<template>
+  <style>
+    @scope (.a, .b) {
+      span { background-color: green; }
+    }
+  </style>
+  <div>
+    <span></span>
+  </div>
+</template>
+<script>
+test_scope_invalidation(document.currentScript, () => {
+  let div = main.querySelector('div');
+  let span = main.querySelector('div > span');
+
+  // .a
+  assert_not_green(span);
+  div.classList.add('a');
+  assert_green(span);
+  div.classList.remove('a');
+  assert_not_green(span);
+
+  // .b
+  assert_not_green(span);
+  div.classList.add('b');
+  assert_green(span);
+  div.classList.remove('b');
+  assert_not_green(span);
+}, 'Element becoming scope root (selector list)');
+</script>
 
 <template>
   <style>
@@ -106,6 +136,39 @@ test_scope_invalidation(document.currentScript, () => {
 }, 'Parent element becoming scope limit');
 </script>
 
+<template>
+  <style>
+    @scope (.a) to (.b, .c) {
+      span { background-color: green; }
+    }
+  </style>
+  <div class=a>
+    <div>
+      <span></span>
+    </div>
+  </div>
+</template>
+<script>
+test_scope_invalidation(document.currentScript, () => {
+  let inner_div = main.querySelector('.a > div');
+  let span = main.querySelector('.a > div > span');
+
+  // .b
+  assert_green(span);
+  inner_div.classList.add('b');
+  assert_not_green(span);
+  inner_div.classList.remove('b');
+  assert_green(span);
+
+  // .c
+  assert_green(span);
+  inner_div.classList.add('c');
+  assert_not_green(span);
+  inner_div.classList.remove('c');
+  assert_green(span);
+}, 'Parent element becoming scope limit (selector list)');
+</script>
+
 <template>
   <style>
     @scope (.a) to (.b) {
@@ -562,3 +625,158 @@ test_scope_invalidation(document.currentScript, () => {
   assert_not_green(inner_a);
 }, ':not(scope) in limit ancestor');
 </script>
+
+<template>
+  <style>
+    @scope (:nth-child(2n of .a)) {
+      :scope { background-color: green; }
+    }
+  </style>
+  <div id=wrapper>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+  </div>
+</template>
+<script>
+test_scope_invalidation(document.currentScript, () => {
+  let e = main.querySelectorAll('#wrapper > div');
+  assert_equals(e.length, 8);
+
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  assert_not_green(e[0]);
+  assert_not_green(e[1]);
+  assert_green(e[2]);
+  assert_not_green(e[3]);
+  assert_not_green(e[4]);
+  assert_not_green(e[5]);
+  assert_green(e[6]);
+  assert_not_green(e[7]);
+
+  e[1].classList.add('a');
+  // <div class=a></div>
+  // <div class=a></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  assert_not_green(e[0]);
+  assert_green(e[1]);
+  assert_not_green(e[2]);
+  assert_not_green(e[3]);
+  assert_green(e[4]);
+  assert_not_green(e[5]);
+  assert_not_green(e[6]);
+  assert_not_green(e[7]);
+
+  e[1].classList.remove('a');
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  assert_not_green(e[0]);
+  assert_not_green(e[1]);
+  assert_green(e[2]);
+  assert_not_green(e[3]);
+  assert_not_green(e[4]);
+  assert_not_green(e[5]);
+  assert_green(e[6]);
+  assert_not_green(e[7]);
+}, ':nth-child() in scope root');
+</script>
+
+<template>
+  <style>
+    @scope (#wrapper) to (:nth-child(4n of .a)) {
+      div { background-color: green; }
+    }
+  </style>
+  <div id=wrapper>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+    <div class=a></div>
+    <div></div>
+  </div>
+</template>
+<script>
+test_scope_invalidation(document.currentScript, () => {
+  let e = main.querySelectorAll('#wrapper > div');
+  assert_equals(e.length, 8);
+
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>  <= limit
+  // <div></div>
+  assert_green(e[0]);
+  assert_green(e[1]);
+  assert_green(e[2]);
+  assert_green(e[3]);
+  assert_green(e[4]);
+  assert_green(e[5]);
+  assert_not_green(e[6]);
+  assert_green(e[7]);
+
+  e[1].classList.add('a');
+  // <div class=a></div>
+  // <div class=a></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>  <= limit
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  assert_green(e[0]);
+  assert_green(e[1]);
+  assert_green(e[2]);
+  assert_green(e[3]);
+  assert_not_green(e[4]);
+  assert_green(e[5]);
+  assert_green(e[6]);
+  assert_green(e[7]);
+
+  e[1].classList.remove('a');
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>
+  // <div></div>
+  // <div class=a></div>  <= limit
+  // <div></div>
+  assert_green(e[0]);
+  assert_green(e[1]);
+  assert_green(e[2]);
+  assert_green(e[3]);
+  assert_green(e[4]);
+  assert_green(e[5]);
+  assert_not_green(e[6]);
+  assert_green(e[7]);
+}, ':nth-child() in scope limit');
+
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-name-defining-rules.html b/tests/wpt/tests/css/css-cascade/scope-name-defining-rules.html
new file mode 100644
index 00000000000..9f4b3428877
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/scope-name-defining-rules.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<title>@scope - name-defining at-rules</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#scope-scope">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<main id=main></main>
+
+<template id=test_keyframes>
+  <style>
+    @scope (#inner) {
+      @keyframes --my-anim {
+        from { background-color: rgb(0, 0, 255); }
+        to { background-color: rgb(0, 0, 255); }
+      }
+    }
+    @scope (#outer) {
+      @keyframes --my-anim {
+        from { background-color: rgb(0, 128, 0); }
+        to { background-color: rgb(0, 128, 0); }
+      }
+    }
+    #animating {
+      animation: --my-anim 1000s linear;
+    }
+  </style>
+  <div id=outer>
+    <div id=inner>
+      <div id=animating></div>
+    <div>
+  </div>
+</template>
+<script>
+  test((t) => {
+    main.append(test_keyframes.content.cloneNode(true));
+    t.add_cleanup(() => main.replaceChildren());
+    assert_equals(getComputedStyle(animating).backgroundColor, 'rgb(0, 128, 0)');
+  }, '@keyframes is unaffected by @scope');
+</script>
+
+<template id=test_keyframes_non_matching>
+  <style>
+    @scope (#nomatch) {
+      @keyframes --my-anim {
+        from { background-color: rgb(0, 128, 0); }
+        to { background-color: rgb(0, 128, 0); }
+      }
+    }
+    #animating {
+      animation: --my-anim 1000s linear;
+    }
+  </style>
+  <div id=animating></div>
+</template>
+<script>
+  test((t) => {
+    main.append(test_keyframes_non_matching.content.cloneNode(true));
+    t.add_cleanup(() => main.replaceChildren());
+    assert_equals(getComputedStyle(animating).backgroundColor, 'rgb(0, 128, 0)');
+  }, '@keyframes is unaffected by non-matching @scope');
+</script>
+
+<template id=test_property>
+  <style>
+    @scope (#inner) {
+      @property --my-prop {
+        syntax: "<length>";
+        initial-value: 1px;
+        inherits: false;
+      }
+    }
+    @scope (#outer) {
+      @property --my-prop {
+        syntax: "<length>";
+        initial-value: 2px;
+        inherits: false;
+      }
+    }
+  </style>
+  <div id=outer>
+    <div id=inner>
+      <div id=subject></div>
+    <div>
+  </div>
+</template>
+<script>
+  test((t) => {
+    main.append(test_property.content.cloneNode(true));
+    t.add_cleanup(() => main.replaceChildren());
+    assert_equals(getComputedStyle(subject).getPropertyValue('--my-prop'), '2px');
+  }, '@property is unaffected by @scope');
+</script>
+
+<template id=test_property_non_matching>
+  <style>
+    @scope (#nomatch) {
+      @property --my-prop {
+        syntax: "<length>";
+        initial-value: 2px;
+        inherits: false;
+      }
+    }
+  </style>
+  <div id=subject></div>
+</template>
+<script>
+  test((t) => {
+    main.append(test_property_non_matching.content.cloneNode(true));
+    t.add_cleanup(() => main.replaceChildren());
+    assert_equals(getComputedStyle(subject).getPropertyValue('--my-prop'), '2px');
+  }, '@property is unaffected by non-matching @scope');
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-nesting.html b/tests/wpt/tests/css/css-cascade/scope-nesting.html
index 05cdac9fc94..44e5b7536ae 100644
--- a/tests/wpt/tests/css/css-cascade/scope-nesting.html
+++ b/tests/wpt/tests/css/css-cascade/scope-nesting.html
@@ -334,3 +334,40 @@ test((t) => {
   assert_equals(getComputedStyle(c).zIndex, 'auto');
 }, 'Implicit rule within nested @scope ');
 </script>
+
+<template id=test_direct_declarations_in_nested_scope_proximity>
+  <div>
+    <style>
+      .a {
+        /* We're supposed to prepend :scope to this declaration. If we do that,
+           then :where() does not matter, since :scope does not gain any
+           specificity from the enclosing @scope rule. However, if an
+           implementation incorrectly prepends & instead, then :where() is
+           needed to avoid the test incorrectly passing due to specificity. */
+        @scope (:where(&) .b) {
+          z-index: 1; /* Should win due to proximity */
+        }
+      }
+      .b { z-index: 2; }
+    </style>
+    <div class=a>
+      <div class="b x">
+        <div class=c>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+test((t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_direct_declarations_in_nested_scope_proximity.content.cloneNode(true));
+
+  let a = document.querySelector('.a');
+  let b = document.querySelector('.b');
+  let c = document.querySelector('.c');
+  assert_equals(getComputedStyle(a).zIndex, 'auto');
+  assert_equals(getComputedStyle(b).zIndex, '1');
+  assert_equals(getComputedStyle(c).zIndex, 'auto');
+}, 'Implicit rule within nested @scope (proximity)');
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html b/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html
index 7bcd2e63cf8..28fed27cee8 100644
--- a/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html
+++ b/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html
@@ -20,11 +20,8 @@
   </template>
 </div>
 <script>
-  setup(() => {
-    polyfill_declarative_shadow_dom(document);
-  });
-
   test(() => {
+    polyfill_declarative_shadow_dom(host_plain);
     let a = host_plain.shadowRoot.querySelector('.a');
     assert_equals(getComputedStyle(a).zIndex, '1');
   }, '@scope can match :host');
@@ -50,11 +47,8 @@
   </template>
 </div>
 <script>
-  setup(() => {
-    polyfill_declarative_shadow_dom(document);
-  });
-
   test(() => {
+    polyfill_declarative_shadow_dom(host_functional);
     let a = host_functional.shadowRoot.querySelector('.a');
     assert_equals(getComputedStyle(a).zIndex, '1');
   }, '@scope can match :host(...)');
@@ -74,11 +68,8 @@
   </template>
 </div>
 <script>
-  setup(() => {
-    polyfill_declarative_shadow_dom(document);
-  });
-
   test(() => {
+    polyfill_declarative_shadow_dom(host_scope_subject);
     assert_equals(getComputedStyle(host_scope_subject).zIndex, '1');
   }, ':scope matches host via the scoping root');
 </script>
@@ -106,11 +97,8 @@
   </div>
 </div>
 <script>
-  setup(() => {
-    polyfill_declarative_shadow_dom(document);
-  });
-
   test(() => {
+    polyfill_declarative_shadow_dom(host_scope_subject_is);
     let host = host_scope_subject_is.querySelector('.host');
     assert_equals(getComputedStyle(host).zIndex, '1');
     let a = host.shadowRoot.querySelector('.a');
@@ -120,3 +108,63 @@
     assert_equals(getComputedStyle(a_outside).zIndex, 'auto');
   }, ':scope within :is() matches host via the scoping root');
 </script>
+
+<!-- Tentative. https://github.com/w3c/csswg-drafts/issues/9178 -->
+<div id=implicit_scope_shadow_parent>
+  <div class=host>
+    <template shadowrootmode=open>
+      <style>
+          @scope {
+            /* Matches host */
+            :scope {
+              z-index: 1;
+            }
+            :scope > .a {
+              z-index: 2;
+            }
+          }
+      </style>
+      <div class=a>
+      </div>
+    </template>
+  </div>
+</div>
+<script>
+  test(() => {
+    polyfill_declarative_shadow_dom(implicit_scope_shadow_parent);
+    let host = implicit_scope_shadow_parent.querySelector('.host');
+    let a = host.shadowRoot.querySelector('.a');
+    assert_equals(getComputedStyle(host).zIndex, '1');
+    assert_equals(getComputedStyle(a).zIndex, '2');
+  }, 'Implicit @scope as direct child of shadow root');
+</script>
+
+<!-- Tentative. https://github.com/w3c/csswg-drafts/issues/9178 -->
+<div id=implicit_scope_constructed>
+  <div class=host>
+    <template shadowrootmode=open>
+      <div class=a>
+      </div>
+    </template>
+  </div>
+</div>
+<script>
+  test(() => {
+    polyfill_declarative_shadow_dom(implicit_scope_constructed);
+    let host = implicit_scope_constructed.querySelector('.host');
+    let sheet = new CSSStyleSheet();
+    sheet.replaceSync(`
+      @scope {
+        :scope {
+          z-index: 1;
+        }
+        :scope .a {
+          z-index: 2;
+        }
+    `);
+    host.shadowRoot.adoptedStyleSheets = [sheet];
+    let a = host.shadowRoot.querySelector('.a');
+    assert_equals(getComputedStyle(host).zIndex, '1');
+    assert_equals(getComputedStyle(a).zIndex, '2');
+  }, 'Implicit @scope in construted stylesheet');
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-visited-ref.html b/tests/wpt/tests/css/css-cascade/scope-visited-ref.html
new file mode 100644
index 00000000000..91efd659216
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/scope-visited-ref.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<title>@scope - :visited</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-6/#scoped-styles">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#link">
+
+<style>
+    /* The visited background-color magically gets the alpha of the
+     unvisited color, which by default is rgba(0, 0, 0, 0). Set alpha to
+     255 so that visited colors also gets this alpha. */
+  * { background-color: rgba(255, 255, 255, 255); }
+</style>
+
+<!-- :visited via :scope in subject -->
+<div>
+  <a id=visited href="" style="background-color:coral">
+    Visited <span>Span</span>
+  </a>
+</div>
+
+<!-- :link via :scope in subject -->
+<div>
+  <a id=unvisited href="x" style="background-color:skyblue">
+    Unvisited <span>Span</span>
+  </a>
+</div>
+
+<!-- :visited via :scope in non-subject -->
+<div>
+  <a id=visited href="">
+    Visited <span style="background-color:coral">Span</span>
+  </a>
+</div>
+
+<!-- :link via :scope in non-subject -->
+<div>
+  <a id=unvisited href="x">
+    Unvisited <span style="background-color:skyblue">Span</span>
+  </a>
+</div>
+
+<!-- :visited in scope-end -->
+<div>
+  <main>
+    Main
+    <a id=visited href="">
+      Visited <span>Span</span>
+    </a>
+  </main>
+</div>
+
+<!-- :visited in scope-end, unvisited link -->
+<div>
+  <main>
+    Main
+    <a id=unvisited href="x" style="background-color:skyblue">
+      Unvisited <span>Span</span>
+    </a>
+  </main>
+</div>
+
+<!-- :link in scope-end -->
+<div>
+  <main>
+    Main
+    <a id=unvisited href="x">
+      Unvisited <span>Span</span>
+    </a>
+  </main>
+</div>
+
+<!-- :link in scope-end, visited link -->
+<div>
+  <main>
+    Main
+    <a id=visited href="" style="background-color:coral">
+      Visited <span>Span</span>
+    </a>
+  </main>
+</div>
+
+<!-- :link in scope-end, visited link -->
+<div>
+  <main>
+    Main
+    <a id=outer_visited href="">
+      Visited1
+    </a>
+  </main>
+</div>
+<script>
+  // Insert inner <a> with JS, since the parser can't produce this result.
+  let inner_a = document.createElement('a');
+  inner_a.setAttribute('href', '');
+  inner_a.textContent = 'Visited2';
+  outer_visited.append(inner_a);
+</script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-visited.html b/tests/wpt/tests/css/css-cascade/scope-visited.html
new file mode 100644
index 00000000000..afccb41a4f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/scope-visited.html
@@ -0,0 +1,218 @@
+<!DOCTYPE html>
+<title>@scope - :visited</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-6/#scoped-styles">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#link">
+<link rel="match" href="scope-visited-ref.html">
+<script src="/resources/declarative-shadow-dom-polyfill.js"></script>
+
+<!-- Sub-tests use ShadowDOM to stay isolated from eachother. -->
+
+<!-- :visited via :scope in subject -->
+<div>
+  <template shadowrootmode=open>
+    <a id=visited href="">
+      Visited <span>Span</span>
+    </a>
+    <style>
+      /* The visited background-color magically gets the alpha of the
+         unvisited color, which by default is rgba(0, 0, 0, 0). Set alpha to
+         255 so that visited colors also gets this alpha. */
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (:visited) {
+        :scope { background-color: coral; }
+      }
+      @scope (:link) {
+        :scope { background-color: skyblue; } /* Does not match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :link via :scope in subject -->
+<div>
+  <template shadowrootmode=open>
+    <a id=unvisited href="x">
+      Unvisited <span>Span</span>
+    </a>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (:link) {
+        :scope { background-color: skyblue; }
+      }
+      @scope (:visited) {
+        :scope { background-color: coral; } /* Does not match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :visited via :scope in non-subject -->
+<div>
+  <template shadowrootmode=open>
+    <a id=visited href="">
+      Visited <span>Span</span>
+    </a>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (:visited) {
+        :scope span { background-color: coral; }
+      }
+      @scope (:link) {
+        :scope span { background-color: skyblue; } /* Does not match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :link via :scope in non-subject -->
+<div>
+  <template shadowrootmode=open>
+    <a id=unvisited href="x">
+      Unvisited <span>Span</span>
+    </a>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (:link) {
+        :scope span { background-color: skyblue; }
+      }
+      @scope (:visited) {
+        :scope span { background-color: coral; } /* Does not match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :visited in scope-end -->
+<div>
+  <template shadowrootmode=open>
+    <main>
+      Main
+      <a id=visited href="">
+        Visited <span>Span</span>
+      </a>
+    </main>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (main) to (:visited) {
+        /* Does not match, because #visited is not in scope. */
+        :scope :visited { background-color: coral; }
+      }
+      @scope (main) {
+        :scope :link { background-color: skyblue; } /* Also doesn't match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :visited in scope-end, unvisited link -->
+<div>
+  <template shadowrootmode=open>
+    <main>
+      Main
+      <a id=unvisited href="x">
+        Unvisited <span>Span</span>
+      </a>
+    </main>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (main) to (:visited) {
+        /* Does not match, because #unvisited does not match it. */
+        :scope :visited { background-color: coral; }
+      }
+      @scope (main) {
+        /* Should match, because the scope-end selector (:visited) does not
+           match anything, hence we are in-scope. */
+        :scope :link { background-color: skyblue; }
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :link in scope-end -->
+<div>
+  <template shadowrootmode=open>
+    <main>
+      Main
+    <a id=unvisited href="x">
+      Unvisited <span>Span</span>
+    </a>
+    </main>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (main) to (:link) {
+        /* Does not match, because #unvisited is not in scope. */
+        :scope :link { background-color: skyblue; }
+      }
+      @scope (main) {
+        :scope :visited { background-color: coral; } /* Also doesn't match. */
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :link in scope-end, visited link -->
+<div>
+  <template shadowrootmode=open>
+    <main>
+      Main
+      <a id=visited href="">
+        Visited <span>Span</span>
+      </a>
+    </main>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      @scope (main) to (:link) {
+        /* Does not match, because #visited does not match it. */
+        :scope :link { background-color: skyblue; }
+      }
+      @scope (main) {
+        /* Should match, because the scope-end selector (:visited) does not
+           match anything, hence we are in-scope. */
+        :scope :visited { background-color: coral; }
+      }
+    </style>
+  </template>
+</div>
+
+<!-- :visited within :visited -->
+<div id=visited_in_visited>
+  <template shadowrootmode=open>
+    <main>
+      Main
+      <a href="">
+        Visited1
+      </a>
+    </main>
+    <style>
+      * { background-color: rgba(255, 255, 255, 255); }
+
+      /* Should not match since visited-link matching stops applying
+         once a link is seen. */
+      @scope (:visited) {
+        :scope > :visited { background-color: coral; }
+      }
+    </style>
+  </template>
+</div>
+
+<script>
+  window.onload = () => {
+    polyfill_declarative_shadow_dom(document);
+
+    // Insert the inner :visited link with JS, since the parser
+    // can't produce this.
+    let outer_a = visited_in_visited.shadowRoot.querySelector('main > a');
+    let inner_a = document.createElement('a');
+    inner_a.setAttribute('href', '');
+    inner_a.textContent = 'Visited2';
+    outer_a.append(inner_a);
+  }
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
index 2148d89317f..b451746bbba 100644
--- a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
@@ -1,4 +1,5 @@
 <!doctype HTML>
+<html class="reftest-wait">
 <meta charset="utf8">
 <title>CSS Content Visibility: auto with content changes</title>
 <link rel="author" title="Cathie Chen" href="mailto:cathiechen@igalia.com">
@@ -6,6 +7,8 @@
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
 <meta name="assert" content="content-visibility auto element should be resized when content changes">
 
+<script src="/common/reftest-wait.js"></script>
+
 <style>
 .auto {
   content-visibility: auto;
@@ -25,6 +28,7 @@
 function changeContent() {
   requestAnimationFrame(() => {
     target.classList.toggle("hidden");
+    requestAnimationFrame(takeScreenshot);
   });
 }
 function runTest() {
diff --git a/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html
index df3aaf33740..324cfc3cecf 100644
--- a/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html
+++ b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html
@@ -9,7 +9,7 @@
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
 <style>
 html,body {
-  color:black; background-color:white; font:12px/1 monospace; padding:0; margin:0;
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
 }
 
 span { color:blue; }
diff --git a/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html
index 1f391163da0..45dd6d9b775 100644
--- a/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html
+++ b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html
@@ -12,7 +12,7 @@
   <link rel="match" href="display-contents-shadow-dom-1-ref.html">
 <style>
 html,body {
-  color:black; background-color:white; font:12px/1 monospace; padding:0; margin:0;
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
 }
 .before::before, ::slotted(.before)::before {content: "a ";}
 .after::after, ::slotted(.after)::after {content: " c";}
diff --git a/tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html b/tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html
index c8c2b4239a8..9d1604116ba 100644
--- a/tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html
+++ b/tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html
@@ -6,6 +6,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="match" href="reference/paint-order-001-ref.tentative.html">
 <link rel="help" href="https://www.w3.org/TR/fill-stroke-3/#strokes">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-5">
 <style>
 span { -webkit-text-stroke: 5px orange; }
 span.i { paint-order: initial; }
diff --git a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html
index e804c33cb4c..7f9a9d5fca0 100644
--- a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html
+++ b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html
@@ -17,7 +17,7 @@
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html
index c7d2c8af704..80a3d22a031 100644
--- a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html
+++ b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html
@@ -18,7 +18,7 @@
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html
index 15f35401756..07bc4d709c7 100644
--- a/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html
+++ b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html
@@ -18,7 +18,7 @@
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-fonts/font-synthesis-position-001-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-position-001-ref.html
new file mode 100644
index 00000000000..228dc652f29
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-synthesis-position-001-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS reference</title>
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+    .sub {
+        font-feature-settings: 'subs' 1;
+    }
+    .super {
+        font-feature-settings: 'sups' 1;
+    }
+</style>
+
+<section class="test">
+    <p>Synthetic super- and subscripts <em>must not</em> be used:</p>
+    <p>Text with sub and <span class="sub">123</span> and <span class="sub">3.14</span></p>
+    <!-- note that Lato does not support a superscript FULL STOP -->
+    <p>Text with <span class="super">super</span> and <span class="super">123</span> and <span class="super">3</span>.<span class="super">14</span></p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/font-synthesis-position-001.html b/tests/wpt/tests/css/css-fonts/font-synthesis-position-001.html
new file mode 100644
index 00000000000..1ed13f67c19
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-synthesis-position-001.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS Test: font-synthesis-position: none disables fake super/subscripts</title>
+<link rel="match" href="font-synthesis-position-001-ref.html">
+<meta name="assert" content="font-synthesis-position:none must prevent synthesizing forms for font-variant-position">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-synthesis-intro">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7441#issuecomment-1680918811">
+
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    @supports not (font-synthesis-position: none) {
+        .test::before {
+            color: red;
+            content: "font-synthesis-position is unsupported!"
+        }
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+    .nosynth {
+        font-synthesis-position: none;
+    }
+    .sub {
+        font-variant-position: sub;
+    }
+    .super {
+        font-variant-position: super;
+    }
+</style>
+
+<section class="test nosynth">
+    <p>Synthetic super- and subscripts <em>must not</em> be used:</p>
+    <p>Text with <span class="sub">sub</span> and <span class="sub">123</span> and <span class="sub">3.14</span></p>
+    <!-- note that Lato does not support a superscript FULL STOP, so it will look bad! -->
+    <p>Text with <span class="super">super</span> and <span class="super">123</span> and <span class="super">3.14</span></p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-position-04-notref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-04-notref.html
new file mode 100644
index 00000000000..5bfe6db4331
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-position-04-notref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS Reference (mismatch)</title>
+
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+</style>
+
+<section class="test">
+    <p>Synthetic subscript letters <em>must</em> be used:</p>
+    <p>Text with subscript letters</p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-position-04.html b/tests/wpt/tests/css/css-fonts/font-variant-position-04.html
new file mode 100644
index 00000000000..de1cbd87795
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-position-04.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS Test: font-variant-position must synthesize super/subscripts for unsupported characters</title>
+<link rel="mismatch" href="font-variant-position-04-notref.html">
+<meta name="assert" content="In the case of OpenType fonts that lack subscript or superscript glyphs for a given character, user agents must synthesize appropriate subscript and superscript glyphs">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-variant-position-prop">
+
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+    .sub {
+        font-variant-position: sub;
+    }
+</style>
+
+<section class="test">
+    <p>Synthetic subscript letters <em>must</em> be used:</p>
+    <p>Text with <span class="sub">subscript</span> letters</p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-position-05-notref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-05-notref.html
new file mode 100644
index 00000000000..a79c7b83a77
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-position-05-notref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS Reference (mismatch)</title>
+
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+    .super {
+        font-variant-position: super;
+    }
+</style>
+
+<section class="test">
+    <p>Synthetic superscript characters <em>must</em> be used:</p>
+    <!-- ZERO WIDTH SPACE between the spans separates the runs, so the first can use OpenType alternates
+         but the second can't. -->
+    <p>Text with <span class="super">superscript</span>&#x200b;<span class="super"> 3.14</span></p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-position-05.html b/tests/wpt/tests/css/css-fonts/font-variant-position-05.html
new file mode 100644
index 00000000000..f93cb986173
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-position-05.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<title>CSS Test: font-variant-position must synthesize super/subscripts for unsupported characters</title>
+<link rel="mismatch" href="font-variant-position-05-notref.html">
+<meta name="assert" content="if a variant glyph is not available for all the characters in the run, simulated glyphs should be synthesized for all characters">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-variant-position-prop">
+
+<style>
+    /* Lato has superscript Latin letters, but not subscript ones;
+     * digits are available in both super- and subscript form.
+     */
+    @font-face {
+        font-family: "lato";
+        src: url(support/fonts/Lato-Medium.ttf);
+    }
+    .test {
+        font-family: "lato";
+        font-size: 2em;
+    }
+    .super {
+        font-variant-position: super;
+    }
+</style>
+
+<section class="test">
+    <p>Synthetic superscript characters <em>must</em> be used:</p>
+    <!-- Note that Lato does not have a superscript alternate for the space or period!
+         Therefore, the entire superscript run should be synthesized. -->
+    <p>Text with <span class="super">superscript 3.14</span></p>
+</section>
diff --git a/tests/wpt/tests/css/css-fonts/inheritance.html b/tests/wpt/tests/css/css-fonts/inheritance.html
index 0646a786786..8f7d4b9d5ad 100644
--- a/tests/wpt/tests/css/css-fonts/inheritance.html
+++ b/tests/wpt/tests/css/css-fonts/inheritance.html
@@ -35,7 +35,7 @@ assert_inherited('font-size', mediumFontSize /* medium */, '123px');
 assert_inherited('font-size-adjust', 'none', '1.5');
 assert_inherited('font-stretch', '100%' /* normal */, '75%');
 assert_inherited('font-style', 'normal', 'italic');
-assert_inherited('font-synthesis', 'weight style small-caps', 'none');
+assert_inherited('font-synthesis', 'weight style small-caps position', 'none');
 assert_inherited('font-variant', 'normal', 'none');
 assert_inherited('font-variant-alternates', 'normal', 'historical-forms');
 assert_inherited('font-variant-caps', 'normal', 'small-caps');
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html
index eba354927a7..b7f121c067e 100644
--- a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html
@@ -16,10 +16,16 @@ test_computed_value('font-synthesis', 'none');
 test_computed_value('font-synthesis', 'weight');
 test_computed_value('font-synthesis', 'style');
 test_computed_value('font-synthesis', 'small-caps');
+test_computed_value('font-synthesis', 'position');
+test_computed_value('font-synthesis', 'small-caps position');
 test_computed_value('font-synthesis', 'style small-caps');
+test_computed_value('font-synthesis', 'style position');
+test_computed_value('font-synthesis', 'style small-caps position');
 test_computed_value('font-synthesis', 'weight small-caps');
 test_computed_value('font-synthesis', 'weight style');
+test_computed_value('font-synthesis', 'weight position');
 test_computed_value('font-synthesis', 'weight style small-caps');
+test_computed_value('font-synthesis', 'weight style small-caps position');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html
index 8d647997d77..e68c07bcbac 100644
--- a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Fonts Module: parsing font-synthesis with invalid values</title>
 <link rel="help" href="https://drafts.csswg.org/css-fonts/#font-synthesis">
-<meta name="assert" content="font-synthesis supports only the grammar 'none | [ weight || style || small-caps ]'.">
+<meta name="assert" content="font-synthesis supports only the grammar 'none | [ weight || style || small-caps || position ]'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -14,9 +14,11 @@
 test_invalid_value('font-synthesis', 'auto');
 test_invalid_value('font-synthesis', 'none weight');
 test_invalid_value('font-synthesis', 'none style');
+test_invalid_value('font-synthesis', 'none position');
 test_invalid_value('font-synthesis', 'style none');
 test_invalid_value('font-synthesis', 'none small-caps');
 test_invalid_value('font-synthesis', 'small-caps none');
+test_invalid_value('font-synthesis', 'position none');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-invalid.html
new file mode 100644
index 00000000000..57d6870b318
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-synthesis-position with invalid values</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7441">
+<meta name="assert" content="font-synthesis-position supports only the grammar 'auto | none'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-synthesis-position', 'normal');
+test_invalid_value('font-synthesis-position', 'auto none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-valid.html
new file mode 100644
index 00000000000..e95b8ecdec7
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-position-valid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-synthesis-position with valid values</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7441">
+<meta name="assert" content="font-synthesis-position supports the full grammar 'auto | none'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-synthesis-position', 'auto');
+test_valid_value('font-synthesis-position', 'none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html
index 4c91fb9b443..84663e8a3e9 100644
--- a/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Fonts Module: parsing font-synthesis with valid values</title>
 <link rel="help" href="https://drafts.csswg.org/css-fonts/#font-synthesis">
-<meta name="assert" content="font-synthesis supports the full grammar 'none | [ weight || style || small-caps ]'.">
+<meta name="assert" content="font-synthesis supports the full grammar 'none | [ weight || style || small-caps || position]'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -15,12 +15,16 @@ test_valid_value('font-synthesis', 'none');
 test_valid_value('font-synthesis', 'weight');
 test_valid_value('font-synthesis', 'style');
 test_valid_value('font-synthesis', 'small-caps');
+test_valid_value('font-synthesis', 'position');
 test_valid_value('font-synthesis', 'style weight', 'weight style');
 test_valid_value('font-synthesis', 'small-caps weight', 'weight small-caps');
 test_valid_value('font-synthesis', 'small-caps style', 'style small-caps');
 test_valid_value('font-synthesis', 'style weight small-caps', 'weight style small-caps');
 test_valid_value('font-synthesis', 'style small-caps weight ', 'weight style small-caps');
 test_valid_value('font-synthesis', 'small-caps style weight ', 'weight style small-caps');
+test_valid_value('font-synthesis', 'position style', 'style position');
+test_valid_value('font-synthesis', 'position weight style', 'weight style position');
+test_valid_value('font-synthesis', 'position weight small-caps style', 'weight style small-caps position');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html
index 0cafef6ecca..ad1d778c57f 100644
--- a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html
+++ b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html
@@ -7,19 +7,19 @@
   justify-items: start;
   position: relative;
 }
-.target > div, td {
+.target > div, .target td {
   background: hotpink;
   font-size: 20px;
   line-height: 0;
 }
-table { border-spacing: 0; }
-td { padding: 5px; min-width: 5px; min-height: 5px; }
-caption {
+.target table { border-spacing: 0; }
+.target td { padding: 5px; min-width: 5px; min-height: 5px; }
+.target caption {
   margin: 10px;
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html
index 6fc444ff843..cabb32c40a8 100644
--- a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html
+++ b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html
@@ -8,19 +8,19 @@
   position: relative;
   writing-mode: vertical-rl;
 }
-.target > div, td {
+.target > div, .target td {
   background: hotpink;
   font-size: 20px;
   line-height: 0;
 }
-table { border-spacing: 0; }
-td { padding: 5px; min-width: 5px; min-height: 5px; }
-caption {
+.target table { border-spacing: 0; }
+.target td { padding: 5px; min-width: 5px; min-height: 5px; }
+.target caption {
   margin: 10px;
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html
index 43ba6ae86df..5c2e56b6494 100644
--- a/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html
+++ b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html
@@ -8,19 +8,19 @@
   position: relative;
   writing-mode: vertical-lr;
 }
-.target > div, td {
+.target > div, .target td {
   background: hotpink;
   font-size: 20px;
   line-height: 0;
 }
-table { border-spacing: 0; }
-td { padding: 5px; min-width: 5px; min-height: 5px; }
-caption {
+.target table { border-spacing: 0; }
+.target td { padding: 5px; min-width: 5px; min-height: 5px; }
+.target caption {
   margin: 10px;
   background: lime;
   block-size: 20px;
 }
-span {
+.target span {
   display: inline-block;
   width: 1em;
   height: 1em;
diff --git a/tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html
index 8e693437a21..15a9f8a14c3 100644
--- a/tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html
+++ b/tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html
@@ -41,3 +41,13 @@
         <div class=item></div>
     </div>
 </div>
+
+<script>
+    let grid = document.getElementsByClassName("grid")[0];
+    // Force a layout.
+    grid.offsetLeft = grid.offsetLeft;
+    if (window.getComputedStyle(grid).gridTemplateColumns === "100px") {
+        // Test passes - only one repeat of 100px was computed.
+        grid.style.width = "min-content";
+    }
+</script>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
index 3cd48cff4bc..20ba330c03e 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
@@ -44,7 +44,7 @@
 
   test_shorthand_roundtrip('grid: auto-flow auto / 100px 100px',
                             {
-    'grid': ['auto-flow / 100px 100px', 'none / 100px 100px'],
+    'grid': 'none / 100px 100px',
     'grid-template-areas': 'none'
   });
 
diff --git a/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-009.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-009.html
index 73b52a616b2..086a4769d42 100644
--- a/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-009.html
+++ b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-009.html
@@ -10,7 +10,7 @@ html,body {
 
 .wrapper {
   display: inline-block;
-  width: 100px;
+  width: 110px;
   border: 1px solid;
 }
 
@@ -100,11 +100,11 @@ html,body {
 
 <script>
   const expectedResults = [
-    "none",
-    "none",
-    "none",
-    "none",
-    "none",
+    "10px 10px 10px 10px 10px 10px 10px 10px 10px 10px 10px",
+    "10px 10px 10px 10px 10px 10px 10px 10px 10px 10px 10px",
+    "10px 10px 10px 10px 10px 10px 10px 10px 10px 10px 10px",
+    "10px 10px 10px 10px 10px 10px 10px 10px 10px 10px 10px",
+    "10px 10px 10px 10px 10px 10px 10px 10px 10px 10px 10px",
   ];
   [...document.querySelectorAll('.grid')].forEach(function(grid, i) {
     let actual = window.getComputedStyle(grid)['grid-template-columns'];
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html
new file mode 100644
index 00000000000..e1503d3f122
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+    div {
+      height: 100px;
+    }
+    #red {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
+    }
+    #green {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
+    }
+    #blue {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
+    }
+    #redAndGreen {
+      background: linear-gradient(to right in srgb, color(srgb 0 0.5 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
+    }
+    #multiple {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
+        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
+    }
+    #noneOnLeft {
+      background: linear-gradient(to right in srgb, color(srgb 0.5 0 0), color(srgb 0.5 0.25 0.25),
+        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
+    }
+    #noneOnRight {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
+        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.5), color(srgb 1 1 0.5));
+    }
+    #allNone {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0 1 1));
+    }
+ </style>
+ </head>
+ <body>
+  <div id="red"></div>
+  <div id="green"></div>
+  <div id="blue"></div>
+  <div id="redAndGreen"></div>
+  <div id="multiple"></div>
+  <div id="noneOnLeft"></div>
+  <div id="noneOnRight"></div>
+  <div id="allNone"></div>
+ </body>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html
new file mode 100644
index 00000000000..a3905b07cee
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Gradient interpolation</title>
+  <link rel="author" title="Aaron Krajeski" href="mailto:aaronhk@chromium.org">
+  <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+  <meta name="assert" content="Channel values of 'none' should not affect the gradient.">
+  <link rel="match" href="gradient-none-interpolation-ref.html">
+  <style>
+    div {
+      height: 100px;
+    }
+    #red {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb none 0.5 0.5), color(srgb 1 1 1));
+    }
+    #green {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 none 0.5), color(srgb 1 1 1));
+    }
+    #blue {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 none), color(srgb 1 1 1));
+    }
+    #redAndGreen {
+      background: linear-gradient(to right in srgb, color(srgb 0 none 0), color(srgb 0.5 0.5 none), color(srgb 1 1 1));
+    }
+    #multiple {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 none),
+        color(srgb 0.5 0.5 none), color(srgb 0.75 0.75 none), color(srgb 1 1 1));
+    }
+    #noneOnLeft {
+      background: linear-gradient(to right in srgb, color(srgb none 0 0), color(srgb none 0.25 0.25),
+        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
+    }
+    #noneOnRight {
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
+        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 none), color(srgb 1 1 none));
+    }
+    #allNone {
+      background: linear-gradient(to right in srgb, color(srgb none 0 0), color(srgb none 1 1));
+    }
+ </style>
+ </head>
+ <body>
+  <div id="red"></div>
+  <div id="green"></div>
+  <div id="blue"></div>
+  <div id="redAndGreen"></div>
+  <div id="multiple"></div>
+  <div id="noneOnLeft"></div>
+  <div id="noneOnRight"></div>
+  <div id="allNone"></div>
+ </body>
+</html>
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html
new file mode 100644
index 00000000000..02b2051c9ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: first generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: first;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-y="29"></span>
+  <textarea data-offset-y="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="29"></span>
+  <textarea data-offset-y="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-y="29"></span>
+  <textarea data-offset-y="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-002.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-002.tentative.html
new file mode 100644
index 00000000000..633ba615e74
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-002.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: first generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+  writing-mode: vertical-rl;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: first;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-x="60"></span>
+  <textarea data-offset-x="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="60"></span>
+  <textarea data-offset-x="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="60"></span>
+  <textarea data-offset-x="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="25"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="25"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="25"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-003.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-003.tentative.html
new file mode 100644
index 00000000000..098b05bd1c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-textarea-003.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: first generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+  writing-mode: vertical-lr;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: first;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-x="30"></span>
+  <textarea data-offset-x="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="30"></span>
+  <textarea data-offset-x="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="30"></span>
+  <textarea data-offset-x="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="65"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="65"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="65"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-001.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-001.tentative.html
new file mode 100644
index 00000000000..156c007233c
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-001.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: last generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: last;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-y="80"></span>
+  <textarea data-offset-y="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
+
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-002.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-002.tentative.html
new file mode 100644
index 00000000000..d8b20b35ebd
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-002.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: last generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+  writing-mode: vertical-rl;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: last;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
diff --git a/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-003.tentative.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-003.tentative.html
new file mode 100644
index 00000000000..c80d464a101
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-textarea-003.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-inline-3/#baseline-source">
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<meta name="assert" content="<textarea> with baseline-source: last generates sensible baselines.">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.target {
+  inline-size: 200px;
+  padding: 10px;
+  border: solid 3px;
+  position: relative;
+  line-height: 0;
+  font-size: 20px;
+  writing-mode: vertical-lr;
+}
+
+.inner {
+  border: solid 5px;
+  padding: 10px;
+  baseline-source: last;
+  font-size: 30px;
+}
+
+span {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  outline: solid cyan 3px;
+  outline-offset: -3px;
+}
+
+textarea {
+  border: solid 5px;
+  width: 60px;
+  height: 60px;
+  vertical-align: baseline;
+  font-family: Ahem;
+  line-height: 1;
+  margin: 0;
+  padding: 0;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.target > *')">
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" placeholder="X X X X X"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;"></textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;">X X X X X</textarea>
+</div>
+<div class="target">
+  <span data-offset-x="45"></span>
+  <textarea data-offset-x="10" class="inner" style="font-size: 100px;" placeholder="X X X X X"></textarea>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-001.svg
new file mode 100644
index 00000000000..06c810cd111
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-001.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+<g id="testmeta">
+  <title>CSS Masking: Basic shape without a geometry-box should default to stroke-box</title>
+  <html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path"/>
+  <html:link rel="match" href="reference/clip-path-square-002-ref.svg" />
+  <desc class="assert">The spec states: "If no reference box is specified, the
+  border-box will be used as reference box", and "For SVG elements without
+  an associated CSS layout box, the used value for ... border-box and margin-box
+  is stroke-box." In this testcase, no reference box is specified, so the
+  clip-path of "inset(0)" should be equivalent to "inset(0) stroke-box", and
+  should not clip out the stroke. You should see a 100x100 green square formed
+  by a stroked rect.</desc>
+</g>
+<rect x="75" y="75" width="50" height="50" stroke-width="50" stroke="green" style="clip-path: inset(0)"></rect>
+</svg>
diff --git a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-002.svg
new file mode 100644
index 00000000000..bfc60355bac
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-inset-stroke-002.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+<g id="testmeta">
+  <title>CSS Masking: Basic shape using border-box should use stroke-box</title>
+  <html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path"/>
+  <html:link rel="match" href="reference/clip-path-square-002-ref.svg" />
+  <desc class="assert">The spec states: "For SVG elements without an associated
+  CSS layout box, the used value for ... border-box and margin-box is
+  stroke-box." In this testcase, border-box is specified, so the
+  clip-path of "inset(0) border-box" should be equivalent to
+  "inset(0) stroke-box", and should not clip out the stroke. You should see a
+  100x100 green square formed by a stroked rect.</desc>
+</g>
+<rect x="75" y="75" width="50" height="50" stroke-width="50" stroke="green" style="clip-path: inset(0) border-box"></rect>
+</svg>
diff --git a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
index 044b2ecc9e1..be5ad144e51 100644
--- a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
+++ b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
@@ -5,7 +5,7 @@
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#svg-clipping-paths"/>
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path"/>
 	<html:link rel="match" href="reference/clip-path-circle-001-ref.svg" />
-	<html:meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-76"/>
+	<html:meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-78"/>
 	<metadata class="flags">svg</metadata>
 	<desc class="assert">A basic shape function circle() applied to an SVG
 	rectangle. The specified keyword stroke-box defines the reference box
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
index f050159385d..91f3c9da6b7 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path border-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1b.html
new file mode 100644
index 00000000000..d77fd716fd5
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1b.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Masking: clip-path: clip path fill-box</title>
+    <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
+    <link rel="match" href="clip-path-geometryBox-1-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="assert" content="Test checks whether clip-path fill-box works correctly or not. This test is for clip-path applied to an SVG foreign object element.">
+  </head>
+  <body>
+    <svg width="200" height="200" style="position: absolute; left: 50px; top: 50px;">
+      <foreignObject x="0" y="0" width="100" height="100" fill="blue" clip-path="circle(50%) fill-box">
+        <div style="width: 100px; height: 100px; background: blue"></div>
+      </foreignObject>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004-ref.html
new file mode 100644
index 00000000000..9dfce3f7fae
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin: 50px;
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004.html
new file mode 100644
index 00000000000..8061a91988c
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-004.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>clip-path on inline with margin-box</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box">
+<link rel="match" href="clip-path-inline-004-ref.html">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin: 50px;
+    clip-path: circle(25%) margin-box;
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005-ref.html
new file mode 100644
index 00000000000..9dfce3f7fae
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin: 50px;
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005.html
new file mode 100644
index 00000000000..39dac759e2a
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-005.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>clip-path on inline with content-box</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-content-box">
+<link rel="match" href="clip-path-inline-005-ref.html">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    padding: 50px;
+    clip-path: circle(50%) content-box;
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006-ref.html
new file mode 100644
index 00000000000..9dfce3f7fae
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin: 50px;
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006.html
new file mode 100644
index 00000000000..7a37c04f441
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-006.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>clip-path on inline with padding-box</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-padding-box">
+<link rel="match" href="clip-path-inline-006-ref.html">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    border: 50px solid red;
+    clip-path: circle(50%) padding-box;
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
index 31fec7516ca..de6d907a78f 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path stroke-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
index 26f2750e324..adc00493c5e 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path view-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1d.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1d.html
new file mode 100644
index 00000000000..3d5f355825b
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1d.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Masking: clip-path: clip path view-box</title>
+    <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
+    <link rel="match" href="clip-path-geometryBox-1-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
+    <meta name="assert" content="Test checks whether clip-path view-box works correctly or not. This test is for clip-path applied to an SVG foreign object element.">
+  </head>
+  <body>
+    <svg width="200" height="200" style="position: absolute; left: 50px; top: 50px;">
+      <foreignObject x="0" y="0" width="100" height="100" fill="blue" clip-path="circle(25% at 50 50) view-box">
+        <div style="width: 100px; height: 100px; background: blue"></div>
+      </foreignObject>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
index aa40dc97da3..2fb0c6248a2 100644
--- a/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
+++ b/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
@@ -72,11 +72,11 @@ test_valid_value("clip-path", "fill-box");
 test_valid_value("clip-path", "stroke-box");
 test_valid_value("clip-path", "view-box");
 
-// basic-shape> <geometry-box>
+// <basic-shape> <geometry-box>
 test_valid_value("clip-path", "circle(7% at 8% 9%) border-box");
 
-// <geometry-box> basic-shape>
-test_valid_value("clip-path", "border-box circle(7% at 8% 9%)");
+// <geometry-box> <basic-shape>
+test_valid_value("clip-path", "border-box circle(7% at 8% 9%)", ["border-box circle(7% at 8% 9%)", "circle(7% at 8% 9%) border-box"]);
 
 // <clip-source>
 test_valid_value("clip-path", "url(https://example.com/)", ["url(https://example.com/)", "url(\"https://example.com/\")"]);
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/table-caption-in-clipped-overflow.html b/tests/wpt/tests/css/css-multicol/crashtests/table-caption-in-clipped-overflow.html
new file mode 100644
index 00000000000..116010565cf
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/table-caption-in-clipped-overflow.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1459623">
+<div style="columns:3; column-fill:auto; height:100px;">
+  <div style="overflow:clip;">
+    <div style="display:table-caption; max-height:190px;">
+      <div style="height:230px;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht
index 5774d353e6e..077693d129b 100644
--- a/tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht
+++ b/tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht
@@ -9,7 +9,7 @@
 <meta name="assert" value="Test that the ch unit can be used as a value for column-width."/>
 <style type="text/css"><![CDATA[
 .multicol {
-  font: 1em monospace;
+  font: 3em monospace;
   width: 69ch;
   column-width: 13ch;
   column-gap: 1ch;
diff --git a/tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht
index 8adefc11e76..75002b419d2 100644
--- a/tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht
+++ b/tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht
@@ -8,7 +8,7 @@
 .multicol-ref {
   display: flow-root;
   width: 69ch;
-  font: 1em monospace;
+  font: 3em monospace;
   background: yellow;
 }
 .multicol-ref > span {
diff --git a/tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html
index 36b07c92b6f..8fb7c8674a5 100644
--- a/tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html
+++ b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html
@@ -15,4 +15,5 @@
 <body>
   <p>Tests pass if <strong>block is green</strong></p>
   <div class="test"></div>
+  <div class="test"></div>
 </body>
diff --git a/tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html
index d399142f7ef..561b5a3af5e 100644
--- a/tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html
+++ b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html
@@ -17,6 +17,12 @@
     }
   }
 
+  .does-not-exist {
+    :is(.test-2, :unknown(div,&)) {
+      background-color: green;
+    }
+  }
+
   body * + * {
     margin-top: 8px;
   }
@@ -24,4 +30,5 @@
 <body>
   <p>Tests pass if <strong>block is green</strong></p>
   <div class="test test-1"></div>
+  <div class="test test-2"></div>
 </body>
diff --git a/tests/wpt/tests/css/css-position/backdrop-tree-abiding-slotted.html b/tests/wpt/tests/css/css-position/backdrop-tree-abiding-slotted.html
new file mode 100644
index 00000000000..55db27a80e0
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/backdrop-tree-abiding-slotted.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Position Test: ::backdrop is tree abiding, allowed after ::slotted</title>
+<link rel="help" href="https://drafts.csswg.org/css-position-4/#backdrop">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#tree-abiding">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#slotted-pseudo">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/declarative-shadow-dom-polyfill.js"></script>
+<div>
+  <template shadowrootmode="open">
+    <style>
+      ::slotted(dialog)::backdrop {
+        background-color: green;
+      }
+    </style>
+    <slot></slot>
+  </template>
+  <dialog id="target"></dialog>
+</div>
+<script>
+  const target = document.getElementById("target");
+  target.showModal();
+
+  test(() => {
+    assert_equals(getComputedStyle(target, "::backdrop").backgroundColor, "rgb(0, 128, 0)");
+  }, "::backdrop is tree-abiding and should be allowed after ::slotted()");
+</script>
diff --git a/tests/wpt/tests/css/css-scoping/slotted-parsing.html b/tests/wpt/tests/css/css-scoping/slotted-parsing.html
index 25b003091fa..bed4dedd560 100644
--- a/tests/wpt/tests/css/css-scoping/slotted-parsing.html
+++ b/tests/wpt/tests/css/css-scoping/slotted-parsing.html
@@ -28,12 +28,12 @@
   test_valid_selector("::slotted(:not(.a))");
 
   test_valid_selector("::slotted(*):is()");
-  test_valid_selector("::slotted(*):is(:hover)", "::slotted(*):is()");
-  test_valid_selector("::slotted(*):is(#id)", "::slotted(*):is()");
+  test_valid_selector("::slotted(*):is(:hover)");
+  test_valid_selector("::slotted(*):is(#id)");
 
   test_valid_selector("::slotted(*):where()");
-  test_valid_selector("::slotted(*):where(:hover)", "::slotted(*):where()");
-  test_valid_selector("::slotted(*):where(#id)", "::slotted(*):where()");
+  test_valid_selector("::slotted(*):where(:hover)");
+  test_valid_selector("::slotted(*):where(#id)");
 
   // Allow tree-abiding pseudo elements after ::slotted
   test_valid_selector("::slotted(*)::before");
diff --git a/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html b/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
index b34caf87f12..13437492ca1 100644
--- a/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
+++ b/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
@@ -31,7 +31,9 @@
     <script>
       promise_test(async (t) => {
         await waitForCompositorCommit();
-        let scrollend_promise = waitForScrollendEvent(t, scroller);
+        let scrollend_promise = new Promise((resolve) => {
+          scroller.addEventListener("scrollend", resolve);
+        });
         let scroll_promise = new Promise((resolve) => {
           scroller.addEventListener("scroll", resolve);
         });
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011-ref.html
new file mode 100644
index 00000000000..a4db731eb0d
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011-ref.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<style>
+  :root {
+    scrollbar-color: blue blue;
+    color: blue;
+  }
+
+  body {
+    overflow: scroll;
+  }
+</style>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011.html
new file mode 100644
index 00000000000..90b6c45cdec
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-011.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color with current color works correctly</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-011-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
+<style>
+  :root {
+    scrollbar-color: currentColor currentColor;
+    color: blue;
+  }
+
+  body {
+    overflow: scroll;
+  }
+</style>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1-ref.html
new file mode 100644
index 00000000000..b431edf4240
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1-ref.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: blue green;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    flex: 0 0;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+
+<div class="container">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1.html
new file mode 100644
index 00000000000..0b4820c7b7e
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-1.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-colors and ensure scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars" />
+<link rel="match" href="scrollbar-color-dynamic-1-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div class="container">
+  <div class="content"></div>
+</div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.documentElement.style.scrollbarColor = 'blue green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2-ref.html
new file mode 100644
index 00000000000..94e5841ef29
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2-ref.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: blue green;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    overflow: scroll;
+  }
+  .container {
+    scrollbar-gutter: stable;
+    overflow: scroll;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+</style>
+<div class="container"></div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2.html
new file mode 100644
index 00000000000..4adce84f246
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-2.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-color and ensure overflow scroll scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars/#valdef-scrollbar-color-auto" />
+<link rel="match" href="scrollbar-color-dynamic-2-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    overflow: scroll;
+  }
+  .container {
+    scrollbar-gutter: stable;
+    overflow: scroll;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+</style>
+<div class="container"></div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.documentElement.style.scrollbarColor = 'blue green';
+
+   takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3-ref.html
new file mode 100644
index 00000000000..3551f3bbaa6
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3-ref.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-color: blue green;
+    scrollbar-gutter: stable;
+    flex: 0 0;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+
+<div class="container">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3.html
new file mode 100644
index 00000000000..0bb72a68e4a
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-3.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-color on container and ensure scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars/#valdef-scrollbar-color-auto" />
+<link rel="match" href="scrollbar-color-dynamic-3-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div class="container">
+  <div class="content"></div>
+</div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.querySelector(".container").style.scrollbarColor = 'blue green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4-ref.html
new file mode 100644
index 00000000000..b10df541489
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4-ref.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    overflow: scroll;
+  }
+  .container {
+    scrollbar-color: blue green;
+    scrollbar-gutter: stable;
+    overflow: scroll;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+</style>
+<div class="container"></div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4.html
new file mode 100644
index 00000000000..e8cd6e1e7c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-4.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-color on container with overflow scroll and ensure scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars/#valdef-scrollbar-color-auto" />
+<link rel="match" href="scrollbar-color-dynamic-4-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: red yellow;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    overflow: scroll;
+  }
+  .container {
+    scrollbar-gutter: stable;
+    overflow: scroll;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+</style>
+<div class="container"></div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.querySelector(".container").style.scrollbarColor = 'blue green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5-ref.html
new file mode 100644
index 00000000000..667d5b3be36
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5-ref.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: green green;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    flex: 0 0;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+
+<div class="container">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5.html
new file mode 100644
index 00000000000..2faa28caac0
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-5.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set color and ensure scrollbars using currentcolor update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars" />
+<link rel="match" href="scrollbar-color-dynamic-5-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: currentColor currentColor;
+    color: blue;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div class="container">
+  <div class="content"></div>
+</div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.documentElement.style.color = 'green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6-ref.html
new file mode 100644
index 00000000000..d4c6a169817
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6-ref.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: blue blue;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    flex: 0 0;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+    scrollbar-color: green green;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+
+<div class="container">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6.html
new file mode 100644
index 00000000000..85791297529
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-6.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set color on container and ensure scrollbars using currentcolor update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars" />
+<link rel="match" href="scrollbar-color-dynamic-6-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: currentColor currentColor;
+    color: blue;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+    scrollbar-color: currentColor currentColor;
+    color: blue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div class="container">
+  <div class="content"></div>
+</div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.querySelector(".container").style.color = 'green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html
index 2592110a119..50adea0c27b 100644
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html
+++ b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html
@@ -8,5 +8,6 @@
   }
 </style>
 
-<p>The test passes if "quikc" has a grammar error marker that is not the default color (usually green).</p>
+<p>The test passes if the grammar error marker on both instances of "quikc" have the same color.
+<div>The <span>quikc</span> brown fox.</div>
 <div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.html
similarity index 55%
rename from tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html
rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.html
index 1758933a50c..e9560bb47cf 100644
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html
+++ b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.html
@@ -3,19 +3,17 @@
 <title>CSS Text Decoration Test: text-decoration-line: grammar-error color</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-grammar-error">
-<meta name="assert" content="This test checks that it is possible to tweak the color of 'text-decoration-line: grammar-error' with 'text-decoration-color' property.">
-<link rel="match" href="text-decoration-line-grammar-error-color-002-ref.html">
+<meta name="assert" content="This test checks that it is not possible to tweak the color of 'text-decoration-line: grammar-error' with 'text-decoration-color' property.">
+<link rel="match" href="text-decoration-line-grammar-error-color-001-ref.html">
 <style>
-  div {
-    padding: 10px;
-    background: cyan;
-  }
-
   span {
     text-decoration-line: grammar-error;
-    text-decoration-color: transparent;
+  }
+  .test {
+    text-decoration-color: rgba(200, 225, 50, 0.75);
   }
 </style>
 
-<p>The test passes if you cannot see a grammar error marker in the next sentence.</p>
+<p>The test passes if the grammar error marker on both instances of "quikc" have the same color.
+<div>The <span class=test>quikc</span> brown fox.</div>
 <div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html
deleted file mode 100644
index 6309d73a0e7..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: text-decoration-line: grammar-error color</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-grammar-error">
-<meta name="assert" content="This test checks that it is possible to tweak the color of 'text-decoration-line: grammar-error' with 'text-decoration-color' property.">
-<link rel="mismatch" href="text-decoration-line-grammar-error-color-001-ref.html">
-<style>
-  span {
-    text-decoration-line: grammar-error;
-    text-decoration-color: rgba(200, 225, 50, 0.75);
-  }
-</style>
-
-<p>The test passes if "quikc" has a grammar error marker that is not the default color (usually green).</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html
deleted file mode 100644
index 2416ba8dd6b..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  div {
-    padding: 10px;
-    background: cyan;
-  }
-</style>
-
-<p>The test passes if you cannot see a grammar error marker in the next sentence.</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html
deleted file mode 100644
index e54b6814ec1..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  span {
-    text-decoration-line: grammar-error;
-    text-decoration-color: magenta;
-  }
-</style>
-
-<p>The test passes if "quikc" has a magenta grammar error marker.</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html
deleted file mode 100644
index 58ff6aeb5cd..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: text-decoration-line: grammar-error color dynamic</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-grammar-error">
-<meta name="assert" content="This test checks that it is possible to dinamically tweak the color of 'text-decoration-line: grammar-error' with 'text-decoration-color' property.">
-<link rel="match" href="text-decoration-line-grammar-error-color-dynamic-001-ref.html">
-<script src="/common/reftest-wait.js"></script>
-<style>
-  span {
-    text-decoration-line: grammar-error;
-    text-decoration-color: cyan;
-  }
-</style>
-
-<p>The test passes if "quikc" has a magenta grammar error marker.</p>
-<div>The <span id="target">quikc</span> brown fox.</div>
-
-<script>
-  requestAnimationFrame(() => requestAnimationFrame(() => {
-    target.style.textDecorationColor = "magenta";
-    takeScreenshot();
-  }));
-</script>
-</html>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html
index 9cd5199eb85..d20e4e49b38 100644
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html
+++ b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html
@@ -8,5 +8,6 @@
   }
 </style>
 
-<p>The test passes if "quikc" has a spelling error marker that is not the default color (usually red).</p>
+<p>The test passes if the spelling error marker on both instances of "quikc" have the same color.
+<div>The <span>quikc</span> brown fox.</div>
 <div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.html
similarity index 55%
rename from tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html
rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.html
index 3a87976f292..e2855f04aa6 100644
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html
+++ b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.html
@@ -3,19 +3,17 @@
 <title>CSS Text Decoration Test: text-decoration-line: spelling-error color</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-spelling-error">
-<meta name="assert" content="This test checks that it is possible to tweak the color of 'text-decoration-line: spelling-error' with 'text-decoration-color' property.">
-<link rel="match" href="text-decoration-line-spelling-error-color-002-ref.html">
+<meta name="assert" content="This test checks that it is not possible to tweak the color of 'text-decoration-line: spelling-error' with 'text-decoration-color' property.">
+<link rel="match" href="text-decoration-line-spelling-error-color-001-ref.html">
 <style>
-  div {
-    padding: 10px;
-    background: cyan;
-  }
-
   span {
     text-decoration-line: spelling-error;
-    text-decoration-color: transparent;
+  }
+  .test {
+    text-decoration-color: rgba(200, 225, 50, 0.75);
   }
 </style>
 
-<p>The test passes if you cannot see a spelling error marker in the next sentence.</p>
+<p>The test passes if the spelling error marker on both instances of "quikc" have the same color.
+<div>The <span class=test>quikc</span> brown fox.</div>
 <div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html
deleted file mode 100644
index 5e5475fe2dd..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: text-decoration-line: spelling-error color</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-spelling-error">
-<meta name="assert" content="This test checks that it is possible to tweak the color of 'text-decoration-line: spelling-error' with 'text-decoration-color' property.">
-<link rel="mismatch" href="text-decoration-line-spelling-error-color-001-ref.html">
-<style>
-  span {
-    text-decoration-line: spelling-error;
-    text-decoration-color: rgba(200, 225, 50, 0.75);
-  }
-</style>
-
-<p>The test passes if "quikc" has a spelling error marker that is not the default color (usually red).</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html
deleted file mode 100644
index b8bd6811843..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  div {
-    padding: 10px;
-    background: cyan;
-  }
-</style>
-
-<p>The test passes if you cannot see a spelling error marker in the next sentence.</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html
deleted file mode 100644
index e96898a81ef..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  span {
-    text-decoration-line: spelling-error;
-    text-decoration-color: magenta;
-  }
-</style>
-
-<p>The test passes if "quikc" has a magenta spelling error marker.</p>
-<div>The <span>quikc</span> brown fox.</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html
deleted file mode 100644
index d712e354bb9..00000000000
--- a/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8" />
-<title>CSS Text Decoration Test: text-decoration-line: spelling-error color dynamic</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#valdef-text-decoration-line-spelling-error">
-<meta name="assert" content="This test checks that it is possible to dinamically tweak the color of 'text-decoration-line: spelling-error' with 'text-decoration-color' property.">
-<link rel="match" href="text-decoration-line-spelling-error-color-dynamic-001-ref.html">
-<script src="/common/reftest-wait.js"></script>
-<style>
-  span {
-    text-decoration-line: spelling-error;
-    text-decoration-color: cyan;
-  }
-</style>
-
-<p>The test passes if "quikc" has a magenta spelling error marker.</p>
-<div>The <span id="target">quikc</span> brown fox.</div>
-
-<script>
-  requestAnimationFrame(() => requestAnimationFrame(() => {
-    target.style.textDecorationColor = "magenta";
-    takeScreenshot();
-  }));
-</script>
-</html>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html
index dea68b0f876..39c50250f58 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html
@@ -2,24 +2,24 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — NARROW NO-BREAK SPACE after atomic inline</title>
-<meta name=assert content="There is a soft wrap opportunity between an atomic inline and a preceeding NARROW NO-BREAK SPACE">
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding NARROW NO-BREAK SPACE">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
 <link rel=match href="../../reference/ref-filled-green-100px-square.xht">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
-  font: 50px/1 Ahem;
+  font: 100px/1 Ahem;
   color: green;
   width: 100px;
-  height: 100px;
   background: red;
 }
 span {
   display: inline-block;
+  color: transparent;
 }
 </style>
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.
 
-<div>AB&#8239;<span>CD</span></div>
+<div>A&#8239;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html
index c10492f5c6c..fc27424026d 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html
@@ -2,31 +2,24 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — NARROW NO-BREAK SPACE before atomic inline</title>
-<meta name=assert content="There is a soft wrap opportunity between an atomic inline and a following NARROW NO-BREAK SPACE">
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following NARROW NO-BREAK SPACE">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
-<link rel=match href="reference/line-breaking-atomic-004-ref.html">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
-.red {
-  font: 50px/1 Ahem;
-  position: absolute;
-  z-index: -1;
-  color: red;
-}
-
-.test {
-  font: 50px/1 Ahem;
-  color: green;
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
   width: 100px;
-  height: 100px;
+  background: red;
 }
 span {
   display: inline-block;
+  color: green;
 }
 </style>
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.
 
-<div class=red>&#8239;AB<br>&#8239;CD</div>
-<div class=test><span>&#8239;AB</span>&#8239;CD</div>
+<div><span>A</span>&#8239;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html
index 9901b013bb6..900487118c1 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html
@@ -2,31 +2,24 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — WORD JOINER after atomic inline</title>
-<meta name=assert content="There is a soft wrap opportunity between an atomic inline and a following WORD JOINER">
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following WORD JOINER">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
-<link rel=match href="reference/line-breaking-atomic-005-ref.html">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
-.red {
-  font: 50px/1 Ahem;
-  position: absolute;
-  z-index: -1;
-  color: red;
-}
-
-.test {
-  font: 50px/1 Ahem;
-  color: green;
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
   width: 100px;
-  height: 100px;
+  background: red;
 }
 span {
   display: inline-block;
+  color: green;
 }
 </style>
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.
 
-<div class=red>&#8288;AB<br>&#8288;CD</div>
-<div class=test><span>&#8288;AB</span>&#8288;CD</div>
+<div><span>A</span>&#8288;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html
index bd3573bb7e8..5552ec02274 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html
@@ -2,24 +2,24 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — WORD JOINER before atomic inline</title>
-<meta name=assert content="There is a soft wrap opportunity between an atomic inline and a preceeding WORD JOINER">
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding WORD JOINER">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
 <link rel=match href="../../reference/ref-filled-green-100px-square.xht">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
-  font: 50px/1 Ahem;
+  font: 100px/1 Ahem;
   color: green;
   width: 100px;
-  height: 100px;
   background: red;
 }
 span {
   display: inline-block;
+  color: transparent;
 }
 </style>
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.
 
-<div>AB&#8288;<span>CD</span></div>
+<div>A&#8288;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-010.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-010.html
new file mode 100644
index 00000000000..318da447f96
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-010.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — ZERO WIDTH JOINER after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following ZERO WIDTH JOINER">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x200D;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-011.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-011.html
new file mode 100644
index 00000000000..06fc493a666
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-011.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — ZERO WIDTH JOINER before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding ZERO WIDTH JOINER">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: green;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: transparent;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div>A&#x200D;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-012.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-012.html
new file mode 100644
index 00000000000..5bd3423f6ed
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-012.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — ZERO WIDTH NO-BREAK SPACE after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following ZERO WIDTH NO-BREAK SPACE">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#xFEFF;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-013.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-013.html
new file mode 100644
index 00000000000..04a0ef7bc0c
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-013.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — ZERO WIDTH NO-BREAK SPACE before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding ZERO WIDTH NO-BREAK SPACE">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: green;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: transparent;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div>A&#xFEFF;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-014.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-014.html
new file mode 100644
index 00000000000..70bc118c6f6
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-014.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — MONGOLIAN VOWEL SEPARATOR after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding MONGOLIAN VOWEL SEPARATOR">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: green;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: transparent;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div>A&#x180E;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-015.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-015.html
new file mode 100644
index 00000000000..f696ce0a14f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-015.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — MONGOLIAN VOWEL SEPARATOR before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following MONGOLIAN VOWEL SEPARATOR">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x180E;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-016.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-016.html
new file mode 100644
index 00000000000..a3bbe40118b
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-016.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — COMBINING GRAPHEME JOINER after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding COMBINING GRAPHEME JOINER">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: green;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: transparent;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div>A&#x034F;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-017.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-017.html
new file mode 100644
index 00000000000..ac62af6ce0d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-017.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — COMBINING GRAPHEME JOINER before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following COMBINING GRAPHEME JOINER">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x034F;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-018.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-018.html
new file mode 100644
index 00000000000..3517dcebce7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-018.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — FIGURE SPACE after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding FIGURE SPACE (class GL)">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: green;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: transparent;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div>A&#x2007;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-019.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-019.html
new file mode 100644
index 00000000000..2c173063154
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-019.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — FIGURE SPACE before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following FIGURE SPACE (class GL)">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x2007;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-020.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-020.html
new file mode 100644
index 00000000000..02bd61f83d6
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-020.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — NON-BREAKING HYPHEN after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding NON-BREAKING HYPHEN">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+}
+a {
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><a>A</a>&#x2011;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-021.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-021.html
new file mode 100644
index 00000000000..14c3dfbf037
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-021.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — NON-BREAKING HYPHEN before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following NON-BREAKING HYPHEN">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x2011;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-022.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-022.html
new file mode 100644
index 00000000000..b3541e9a21a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-022.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK SBRUL SHAD after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding TIBETAN MARK SBRUL SHAD">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+}
+a {
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><a>A</a>&#x0F08;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-023.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-023.html
new file mode 100644
index 00000000000..8616ca60aad
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-023.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK SBRUL SHAD before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following TIBETAN MARK SBRUL SHAD">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x0F08;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-024.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-024.html
new file mode 100644
index 00000000000..b823dace2bd
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-024.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK DELIMITER TSHEG BSTAR after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding TIBETAN MARK DELIMITER TSHEG BSTAR">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+}
+a {
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><a>A</a>&#x0F0C;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-025.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-025.html
new file mode 100644
index 00000000000..541a82de966
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-025.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK DELIMITER TSHEG BSTAR before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following TIBETAN MARK DELIMITER TSHEG BSTAR">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x0F0C;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-026.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-026.html
new file mode 100644
index 00000000000..2b52e730415
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-026.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK RGYA GRAM SHAD after atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a preceeding TIBETAN MARK RGYA GRAM SHAD">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+}
+a {
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><a>A</a>&#x0F12;<span>B</span></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-027.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-027.html
new file mode 100644
index 00000000000..acbe4edf075
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-027.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — TIBETAN MARK RGYA GRAM SHAD before atomic inline</title>
+<meta name=assert content="There is no soft wrap opportunity between an atomic inline and a following TIBETAN MARK RGYA GRAM SHAD">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 100px/1 Ahem;
+  color: transparent;
+  width: 100px;
+  background: red;
+}
+span {
+  display: inline-block;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div><span>A</span>&#x0F12;B</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html
index 8f3d229dd25..d50c104ed0b 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html
@@ -2,22 +2,25 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — NARROW NO-BREAK SPACE and replaced element</title>
-<meta name=assert content="There is a soft wrap opportunity between replaced elements and adjacent NARROW NO-BREAK SPACE">
+<meta name=assert content="There is no soft wrap opportunity between replaced elements and adjacent NARROW NO-BREAK SPACE">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
 <link rel=match href="reference/line-breaking-replaced-002-ref.html">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <style>
-.red {
-	position: absolute;
-	z-index: -1;
-}
 .test {
-	width: 0;
+    width: 50px;
+}
+.red {
+    position: absolute;
+    color: red;
+    z-index: -1;
+    padding-left: 60px;
+    padding-top: 40px;
 }
 </style>
 
 <p>Test passes if there is no red.
 
-<div class=red><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==" width=50><br>&#8239;<br><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==" width=50></div>
+<div class=red>&#8239;XX</div>
 
-<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50>&#8239;<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50></div>
+<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100>&#8239;<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html
index aae116c0f9d..81b15d9d4cb 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html
@@ -2,22 +2,25 @@
 <html>
 <meta charset="utf-8">
 <title>CSS Text — WORD JOINER and replaced element</title>
-<meta name=assert content="There is a soft wrap opportunity between replaced elements and adjacent WORD JOINER">
+<meta name=assert content="There is no soft wrap opportunity between replaced elements and adjacent WORD JOINER">
 <link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
 <link rel=match href="reference/line-breaking-replaced-003-ref.html">
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
 <style>
-.red {
-	position: absolute;
-	z-index: -1;
-}
 .test {
-	width: 0;
+    width: 50px;
+}
+.red {
+    position: absolute;
+    color: red;
+    z-index: -1;
+    padding-left: 60px;
+    padding-top: 40px;
 }
 </style>
 
 <p>Test passes if there is no red.
 
-<div class=red><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==" width=50><br>&#8288;<br><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==" width=50></div>
+<div class=red>XX</div>
 
-<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50><br>&#8288;<br><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50></div>
+<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100>&#8288;<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html
deleted file mode 100644
index 022004bfc70..00000000000
--- a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-<style>
-div {
-  font: 50px/1 Ahem;
-  position: absolute;
-  z-index: -1;
-  color: green;
-}
-</style>
-
-<p>Test passes if there is a filled green square and <strong>no red</strong>.
-
-<div>&#8239;AB<br>&#8239;CD</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html
deleted file mode 100644
index bd88329ad0e..00000000000
--- a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-<style>
-div {
-  font: 50px/1 Ahem;
-  position: absolute;
-  z-index: -1;
-  color: green;
-}
-</style>
-
-<p>Test passes if there is a filled green square and <strong>no red</strong>.
-
-<div>&#8288;AB<br>&#8288;CD</div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html
index ae6f20488e2..8ab22c33e30 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html
@@ -3,7 +3,6 @@
 <meta charset="utf-8">
 <title>Test reference</title>
 <link rel=author title="Florian Rivoal" href="https://florian.rivoal.net">
-
 <p>Test passes if there is no red.
 
-<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50><br>&#8239;<br><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50></div>
+<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100>&#8239;<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100></div>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html
index 570f005418b..a1721545b76 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html
@@ -6,4 +6,4 @@
 
 <p>Test passes if there is no red.
 
-<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50><br>&#8288;<br><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50></div>
+<div class=test><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkaGD4DwACiQGBU29HsgAAAABJRU5ErkJggg==" width=50 height=100></div>
diff --git a/tests/wpt/tests/css/cssom/cssimportrule.html b/tests/wpt/tests/css/cssom/cssimportrule.html
index 2703b9a69b5..84cd7292f38 100644
--- a/tests/wpt/tests/css/cssom/cssimportrule.html
+++ b/tests/wpt/tests/css/cssom/cssimportrule.html
@@ -16,6 +16,7 @@
         @import url("support/a-green.css") screen;
         @import url("support/a-green.css") all;
         @import url("support/a-green") supports((display: flex) or (display: block));
+        @import url('quote"quote');
         @page { background-color: red; }
     </style>
 </head>
@@ -23,7 +24,7 @@
     <div id="log"></div>
 
     <script type="text/javascript">
-        var styleSheet, ruleList, rule, ruleWithMedia, ruleWithMediaAll, ruleWithSupports;
+        var styleSheet, ruleList, rule, ruleWithMedia, ruleWithMediaAll, ruleWithSupports, ruleWithQuote;
         setup(function() {
             styleSheet = document.getElementById("styleElement").sheet;
             ruleList = styleSheet.cssRules;
@@ -31,6 +32,7 @@
             ruleWithMedia = ruleList[1];
             ruleWithMediaAll = ruleList[2];
             ruleWithSupports = ruleList[3];
+            ruleWithQuote = ruleList[4];
         });
 
         test(function() {
@@ -71,6 +73,7 @@
             assert_equals(ruleWithMedia.cssText, '@import url("support/a-green.css") screen;');
             assert_equals(ruleWithMediaAll.cssText, '@import url("support/a-green.css") all;');
             assert_equals(ruleWithSupports.cssText, '@import url("support/a-green") supports((display: flex) or (display: block));');
+            assert_equals(ruleWithQuote.cssText, '@import url("quote\\\"quote");');
             assert_equals(rule.parentRule, null);
             assert_true(rule.parentStyleSheet instanceof CSSStyleSheet);
         }, "Values of CSSRule attributes");
@@ -99,7 +102,7 @@
         }, "CSSImportRule : MediaList mediaText attribute should be updated due to [PutForwards]");
 
         test(function() {
-            var ruleWithPage = ruleList[4];
+            var ruleWithPage = ruleList[5];
             ruleWithPage.style = "margin-top: 10px;"
             assert_equals(ruleWithPage.style.cssText, "margin-top: 10px;");
         }, "CSSStyleDeclaration cssText attribute should be updated due to [PutForwards]");
diff --git a/tests/wpt/tests/css/cssom/stylesheet-dom-mutation-event-crash.html b/tests/wpt/tests/css/cssom/stylesheet-dom-mutation-event-crash.html
new file mode 100644
index 00000000000..942660c7a53
--- /dev/null
+++ b/tests/wpt/tests/css/cssom/stylesheet-dom-mutation-event-crash.html
@@ -0,0 +1,13 @@
+<script>
+function go() {
+  b.innerHTML = undefined
+}
+document.addEventListener("DOMContentLoaded", () => {
+  b.appendChild(document.createTextNode(""))
+  a.addEventListener("DOMNodeRemoved", go)
+  go();
+})
+</script>
+<div id="a">
+<style id="b">
+</style>
diff --git a/tests/wpt/tests/css/printing/monolithic-overflow-023-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-023-print-ref.html
new file mode 100644
index 00000000000..bdc4eb1ab0e
--- /dev/null
+++ b/tests/wpt/tests/css/printing/monolithic-overflow-023-print-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  @page {
+    size: 600px;
+    margin: 0;
+  }
+  body {
+    margin: 0;
+  }
+</style>
+<div style="width:100px; height:100px; background:green;"></div>
+<div>
+  There should be two pages. A green square should be on each page. Nothing
+  should overlap with the square.
+</div>
+<div style="break-before:page; width:100px; height:100px; background:green;"></div>
+<div style="height:100px; border:solid;">
+  This text should go on the second page, right below the green square. It
+  should NOT be placed on top of the square.
+</div>
diff --git a/tests/wpt/tests/css/printing/monolithic-overflow-023-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-023-print.html
new file mode 100644
index 00000000000..c047d486575
--- /dev/null
+++ b/tests/wpt/tests/css/printing/monolithic-overflow-023-print.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1458850">
+<link rel="match" href="monolithic-overflow-023-print-ref.html">
+<style>
+  @page {
+    size: 600px;
+    margin: 0;
+  }
+  body {
+    margin: 0;
+  }
+</style>
+<div style="display:table;">
+  <div style="display:table-header-group; break-inside:avoid;">
+    <div style="width:100px; height:100px; background:green;"></div>
+  </div>
+  <div style="display:table-row;">
+    <div style="height:530px; contain:size;">
+      There should be two pages. A green square should be on each page. Nothing
+      should overlap with the square.
+    </div>
+  </div>
+  <div style="display:table-row;">
+    <div style="height:100px; border:solid;">
+      This text should go on the second page, right below the green square. It
+      should NOT be placed on top of the square.
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/printing/subpixel-page-size-001-print-ref.html b/tests/wpt/tests/css/printing/subpixel-page-size-001-print-ref.html
new file mode 100644
index 00000000000..cf59f2be374
--- /dev/null
+++ b/tests/wpt/tests/css/printing/subpixel-page-size-001-print-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  body { margin: 0; }
+  @page {
+    size: 400px 123.9px;
+    margin: 0;
+  }
+</style>
+There should be no red.
diff --git a/tests/wpt/tests/css/printing/subpixel-page-size-001-print.html b/tests/wpt/tests/css/printing/subpixel-page-size-001-print.html
new file mode 100644
index 00000000000..9054cd4513f
--- /dev/null
+++ b/tests/wpt/tests/css/printing/subpixel-page-size-001-print.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-page-3/#page-size-prop">
+<link rel="match" href="subpixel-page-size-001-print-ref.html">
+<meta name=reftest-pages content="2">
+<style>
+  body { margin: 0; }
+  @page {
+    size: 400px 123.9px;
+    margin: 0;
+  }
+</style>
+<div style="height:123.9px; background:red;">
+  This page should not be printed.
+</div>
+There should be no red.
diff --git a/tests/wpt/tests/css/printing/subpixel-page-size-002-print-ref.html b/tests/wpt/tests/css/printing/subpixel-page-size-002-print-ref.html
new file mode 100644
index 00000000000..4ed4bdb5ff3
--- /dev/null
+++ b/tests/wpt/tests/css/printing/subpixel-page-size-002-print-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  body { margin: 0; }
+  @page {
+    size: 400px 123.1px;
+    margin: 0;
+  }
+</style>
+There should be no red.
diff --git a/tests/wpt/tests/css/printing/subpixel-page-size-002-print.html b/tests/wpt/tests/css/printing/subpixel-page-size-002-print.html
new file mode 100644
index 00000000000..463cb21f25d
--- /dev/null
+++ b/tests/wpt/tests/css/printing/subpixel-page-size-002-print.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-page-3/#page-size-prop">
+<link rel="match" href="subpixel-page-size-002-print-ref.html">
+<meta name=reftest-pages content="2">
+<style>
+  body { margin: 0; }
+  @page {
+    size: 400px 123.1px;
+    margin: 0;
+  }
+</style>
+<div style="height:123.1px; background:red;">
+  This page should not be printed.
+</div>
+There should be no red.
diff --git a/tests/wpt/tests/css/selectors/is-where-error-recovery.html b/tests/wpt/tests/css/selectors/is-where-error-recovery.html
index 1d6e870ed23..f7e6f6ff6ea 100644
--- a/tests/wpt/tests/css/selectors/is-where-error-recovery.html
+++ b/tests/wpt/tests/css/selectors/is-where-error-recovery.html
@@ -23,18 +23,12 @@
         "random-selector",
         "Should've parsed",
       );
-      assert_not_equals(
-        rule.selectorText,
-        invalidSelector,
-        "Should not be considered valid and parsed as-is",
-      );
-      let emptyList = `:${pseudo}()`;
       assert_equals(
         rule.selectorText,
-        emptyList,
-        "Should be serialized as an empty selector-list",
+        invalidSelector,
+        "Should be parsed as-is (but not be considered valid)",
       );
-      assert_equals(document.querySelector(emptyList), null, "Should never match, but should parse");
+      assert_equals(document.querySelector(rule.selectorText), null, "Should never match, but should parse");
       for (let mixedList of [
         `:${pseudo}(:total-nonsense, #test-div)`,
         `:${pseudo}(:total-nonsense and-more-stuff, #test-div)`,
@@ -43,8 +37,8 @@
         rule.selectorText = mixedList;
         assert_equals(
           rule.selectorText,
-          `:${pseudo}(#test-div)`,
-          `${mixedList}: Should ignore invalid selectors`,
+          mixedList,
+          `${mixedList}: Should parse invalid selectors`,
         );
         let testDiv = document.getElementById("test-div");
         assert_equals(document.querySelector(mixedList), testDiv, "Should correctly match");
diff --git a/tests/wpt/tests/css/selectors/is-where-parsing.html b/tests/wpt/tests/css/selectors/is-where-parsing.html
index c9cc2236a32..3159ecfe6a6 100644
--- a/tests/wpt/tests/css/selectors/is-where-parsing.html
+++ b/tests/wpt/tests/css/selectors/is-where-parsing.html
@@ -10,7 +10,7 @@
 </style>
 <script>
   let rule = document.getElementById("test-sheet").sheet.cssRules[0];
-  function assert_valid(expected_valid, pattern, expected_pattern, description) {
+  function assert_valid(expected_parseable, pattern, expected_pattern, description) {
     test(function() {
       for (let pseudo of ["is", "where"]) {
         let selector = pattern.replace("{}", ":" + pseudo);
@@ -19,7 +19,7 @@
           expected_selector = expected_pattern.replace("{}", ":" + pseudo);
         rule.selectorText = "random-selector";
         rule.selectorText = selector;
-        (expected_valid ? assert_equals : assert_not_equals)(
+        (expected_parseable ? assert_equals : assert_not_equals)(
           rule.selectorText,
           expected_selector,
           `${description}: ${selector}`
@@ -42,7 +42,8 @@
   assert_valid(true, "{}(:hover, :active)", null, "Pseudo-classes inside");
   assert_valid(true, "{}(div):hover", null, "Pseudo-classes after");
   assert_valid(true, "{}(div)::before", null, "Pseudo-elements after");
-  assert_valid(false, "{}(::before)", null, "Pseudo-elements inside");
+  // Should ask clarification from CSSWG
+  assert_valid(true, "{}(::before)", null, "Pseudo-elements inside");
 
   assert_valid(true, "{}(div) + bar", null, "Combinators after");
   assert_valid(true, "::part(foo):is(:hover)", null, "After part with simple pseudo-class");
diff --git a/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
index 9cf989fcbeb..c5fcb589a3c 100644
--- a/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
+++ b/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
@@ -8,6 +8,6 @@
 <script src="/css/support/parsing-testcommon.js"></script>
 <script>
   test_invalid_selector('.a:has(.b:has(.c))');
-  test_valid_selector('.a:has(:is(.b:has(.c)))', '.a:has(:is())');
-  test_valid_selector('.a:has(:is(.b:has(.c), .d))', '.a:has(:is(.d))');
+  test_valid_selector('.a:has(:is(.b:has(.c)))');
+  test_valid_selector('.a:has(:is(.b:has(.c), .d))');
 </script>
diff --git a/tests/wpt/tests/css/selectors/parsing/parse-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has.html
index 5d071010b42..902fc98ff68 100644
--- a/tests/wpt/tests/css/selectors/parsing/parse-has.html
+++ b/tests/wpt/tests/css/selectors/parsing/parse-has.html
@@ -37,5 +37,5 @@
   test_invalid_selector(':has()');
   test_invalid_selector(':has(123)');
   test_invalid_selector(':has(.a, 123)');
-  test_valid_selector(':has(:is(.a, 123))', ':has(:is(.a))');
+  test_valid_selector(':has(:is(.a, 123))');
 </script>
diff --git a/tests/wpt/tests/css/selectors/selectors-4/lang-016.html b/tests/wpt/tests/css/selectors/selectors-4/lang-016.html
new file mode 100644
index 00000000000..4923890fe64
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/selectors-4/lang-016.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>CSS Selectors 4 - :lang matching</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
+<link rel="match" href="lang-000-ref.html">
+
+<style>
+div.test { color: red; }
+:lang(fr) { color: green; }
+</style>
+
+<div class="test"><span lang="fr-FR-x-foobar">This should be green</span></div>
diff --git a/tests/wpt/tests/css/selectors/selectors-4/lang-017.html b/tests/wpt/tests/css/selectors/selectors-4/lang-017.html
new file mode 100644
index 00000000000..d5c86e5b779
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/selectors-4/lang-017.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>CSS Selectors 4 - :lang matching</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
+<link rel="match" href="lang-000-ref.html">
+
+<style>
+div.test { color: red; }
+:lang("fr-x-foobar") { color: green; }
+</style>
+
+<div class="test"><span lang="fr-Latn-FR-x-foobar">This should be green</span></div>
diff --git a/tests/wpt/tests/css/selectors/selectors-4/lang-018.html b/tests/wpt/tests/css/selectors/selectors-4/lang-018.html
new file mode 100644
index 00000000000..2f777a2ab4f
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/selectors-4/lang-018.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>CSS Selectors 4 - :lang matching</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
+<link rel="match" href="lang-000-ref.html">
+
+<style>
+div.test { color: red; }
+:lang("*-x-foobar") { color: green; }
+</style>
+
+<div class="test"><span lang="fr-Latn-FR-x-foobar">This should be green</span></div>
diff --git a/tests/wpt/tests/css/selectors/selectors-4/lang-019.html b/tests/wpt/tests/css/selectors/selectors-4/lang-019.html
new file mode 100644
index 00000000000..a1e793cdacf
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/selectors-4/lang-019.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>CSS Selectors 4 - :lang matching</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
+<link rel="match" href="lang-000-ref.html">
+
+<style>
+div.test { color: green; }
+:lang("fr-x-foobar") { color: red; }
+</style>
+
+<div class="test"><span lang="fr">This should be green</span></div>
diff --git a/tests/wpt/tests/dom/events/remove-all-listeners.html b/tests/wpt/tests/dom/events/remove-all-listeners.html
new file mode 100644
index 00000000000..3a2a751a146
--- /dev/null
+++ b/tests/wpt/tests/dom/events/remove-all-listeners.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<title>Various edge cases where listeners are removed during iteration</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+
+test(function() {
+  var type = "foo";
+  var target = document.createElement("div");
+
+  var listener1CallCount = 0;
+  var listener2CallCount = 0;
+  var listener3CallCount = 0;
+  function listener1() {
+    listener1CallCount++;
+    target.removeEventListener(type, listener1);
+    target.removeEventListener(type, listener2);
+    target.addEventListener(type, listener3);
+  }
+  function listener2() {
+    listener2CallCount++;
+  }
+  function listener3() {
+    listener3CallCount++;
+  }
+
+  target.addEventListener(type, listener1);
+  target.addEventListener(type, listener2);
+
+  // Dispatch the event. Only listener1 should be called because
+  // it removes listener2. And listener3 is added when we've already
+  // started iterating, so it shouldn't be called either.
+  target.dispatchEvent(new Event(type));
+  assert_equals(listener1CallCount, 1);
+  assert_equals(listener2CallCount, 0);
+  assert_equals(listener3CallCount, 0);
+
+  // Now that only listener3 is set, dispatch another event. Only
+  // listener3 should be called.
+  target.dispatchEvent(new Event(type));
+  assert_equals(listener1CallCount, 1);
+  assert_equals(listener2CallCount, 0);
+  assert_equals(listener3CallCount, 1);
+}, "Removing all listeners and then adding a new one should work.");
+
+test(function() {
+  var type = "foo";
+  var target = document.createElement("div");
+
+  var listener1CallCount = 0;
+  var listener2CallCount = 0;
+  var listener3CallCount = 0;
+  function listener1() {
+    listener1CallCount++;
+    // Recursively dispatch another event from this listener.
+    // This will only call listener2 because listener1 is a "once" listener.
+    target.dispatchEvent(new Event(type));
+    assert_equals(listener1CallCount, 1);
+    assert_equals(listener2CallCount, 1);
+    assert_equals(listener3CallCount, 0);
+
+    // Now all listeners are removed - the two "once" listeners have already both
+    // been called once. Add another listener.
+    target.addEventListener(type, listener3);
+  }
+  function listener2() {
+    listener2CallCount++;
+  }
+  function listener3() {
+    listener3CallCount++;
+  }
+
+  // Add two "once" listeners.
+  target.addEventListener(type, listener1, { once: true });
+  target.addEventListener(type, listener2, { once: true });
+
+  // Dispatch the event.
+  target.dispatchEvent(new Event(type));
+
+  // The listener call counts should still match what they were
+  // at the end of listener1.
+  assert_equals(listener1CallCount, 1);
+  assert_equals(listener2CallCount, 1);
+  assert_equals(listener3CallCount, 0);
+
+  // Now that only listener3 is set, dispatch another event. Only
+  // listener3 should be called.
+  target.dispatchEvent(new Event(type));
+  assert_equals(listener1CallCount, 1);
+  assert_equals(listener2CallCount, 1);
+  assert_equals(listener3CallCount, 1);
+}, "Nested usage of once listeners should work.");
+
+</script>
diff --git a/tests/wpt/tests/fenced-frame/script-focus.https.html b/tests/wpt/tests/fenced-frame/script-focus.https.html
index 4b5fe758b48..0bef98219bd 100644
--- a/tests/wpt/tests/fenced-frame/script-focus.https.html
+++ b/tests/wpt/tests/fenced-frame/script-focus.https.html
@@ -84,7 +84,8 @@ promise_test(async t => {
 
   // Give the browser time to receive the focus event before attempting
   // another focus.
-  await t.step_timeout(async () => {await AttemptButtonFocus(frame, true);}, 20);
+  await t.step_timeout(async () => {await AttemptButtonFocus(frame, true);},
+      500);
 }, "Focused fenced frames can move programmatic focus within frame");
 
 promise_test(async () => {
diff --git a/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
new file mode 100644
index 00000000000..0613d18dffb
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
@@ -0,0 +1,28 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const numPerMethod = 20;
+  const total = numPerMethod * 2;
+
+  // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
+  const iframe = await loadScriptAsIframe(`
+    const url = "${url}";
+    for (let i = 0; i < ${numPerMethod}; i++) {
+      let get = fetchLater(url);
+      let post = fetchLater(url, {method: 'POST'});
+    }
+  `);
+
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: total});
+}, 'A discarded document sends all its fetchLater requests with default config.');
diff --git a/tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js b/tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js
index f1afeeb740b..37a61c12b56 100644
--- a/tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js
+++ b/tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js
@@ -15,7 +15,7 @@ async_test(t => {
   // https://github.com/whatwg/html/issues/125 and https://github.com/whatwg/html/issues/1230 this
   // should be changed to use the load event instead.
   t.step_timeout(() => {
-    assert_equals(frame.contentDocument, null);
+    assert_equals(window.frameLoaded, undefined);
     t.done();
   }, 1000);
   document.body.append(frame);
diff --git a/tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py b/tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py
index 223b3c40278..d91998b998d 100644
--- a/tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py
+++ b/tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py
@@ -1,4 +1,4 @@
 def main(request, response):
     response.headers.set(b"Content-Type", b"text/html")
     response.headers.set(b"Custom", b"\0")
-    return b"<!doctype html><b>This is a document.</b>"
+    return b"<!doctype html><script>top.frameLoaded=true</script><b>This is a document.</b>"
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js
new file mode 100644
index 00000000000..edb30186364
--- /dev/null
+++ b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js
@@ -0,0 +1,128 @@
+importScripts('/resources/testharness.js');
+importScripts('resources/sandboxed-fs-test-helpers.js');
+importScripts('resources/test-helpers.js');
+
+'use strict';
+
+// Adds tests that assert file operations which acquire a lock cannot
+// run on a file that is locked by the primitive created by running
+// and awaiting `openScopedPrimitive` on a file handle.
+// `openScopedPrimitive` must close the respective primitive during test cleanup
+function crossLockOperationTests(primitiveName, openScopedPrimitive) {
+  directory_test(async (t, rootDir) => {
+    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    await openScopedPrimitive(t, fileHandle);
+
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError', fileHandle.remove());
+  }, `A file with an open ${primitiveName} cannot be removed`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    await openScopedPrimitive(t, fileHandle);
+
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError', fileHandle.move('OPFS2.test'));
+  }, `A file with an open ${primitiveName} cannot be moved`);
+
+  directory_test(async (t, rootDir) => {
+    const dirHandle =
+        await rootDir.getDirectoryHandle('foo', {create: true});
+    const fileHandle =
+        await dirHandle.getFileHandle('OPFS.test', {create: true});
+
+    await openScopedPrimitive(t, fileHandle);
+
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError', dirHandle.remove());
+  }, `A directory containing a file with an open ${primitiveName} cannot be` +
+  ` removed`);
+}
+
+// Adds tests for expected behaviors of an access handle created in `sahMode`
+// mode across primitives.
+function crossLockSAHTests(sahMode) {
+  const sahOptions = {mode: sahMode};
+
+  crossLockOperationTests(`access handle in ${sahMode} mode`,
+    async (t, fileHandle) => {
+      const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
+      t.add_cleanup(() => syncHandle.close());
+    });
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle =
+        await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
+    t.add_cleanup(() => syncHandle.close());
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError', fileHandle.createWritable());
+
+    syncHandle.close();
+    const writable = await fileHandle.createWritable();
+    await writable.close();
+  }, `When there's an open access handle in ${sahMode} mode on a file, cannot` +
+  ` open a writable stream on that same file`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle =
+        await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    const writable1 = await fileHandle.createWritable();
+    const writable2 = await fileHandle.createWritable();
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError',
+        fileHandle.createSyncAccessHandle(sahOptions));
+
+    await writable1.close();
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError',
+        fileHandle.createSyncAccessHandle(sahOptions));
+
+    await writable2.close();
+    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
+    syncHandle.close();
+  }, `When there's an open writable stream on a file, cannot open a access` +
+  `handle in ${sahMode} mode on that same file`);
+
+  directory_test(async (t, rootDir) => {
+    const fooFileHandle =
+        await rootDir.getFileHandle('foo.test', {create: true});
+    const barFileHandle =
+        await rootDir.getFileHandle('bar.test', {create: true});
+
+    await cleanup_writable(t, await fooFileHandle.createWritable());
+
+    const barSyncHandle =
+        await barFileHandle.createSyncAccessHandle(sahOptions);
+    t.add_cleanup(() => barSyncHandle.close());
+  }, `A writable stream from one file does not interfere with the creation of` +
+  ` an access handle in ${sahMode} mode on another file`);
+
+  directory_test(async (t, rootDir) => {
+    const fooFileHandle =
+        await rootDir.getFileHandle('foo.test', {create: true});
+    const barFileHandle =
+        await rootDir.getFileHandle('bar.test', {create: true});
+
+    const fooSyncHandle =
+        await fooFileHandle.createSyncAccessHandle(sahOptions);
+    t.add_cleanup(() => fooSyncHandle.close());
+
+    await cleanup_writable(t, await barFileHandle.createWritable());
+  }, `An open access handle in ${sahMode} mode from one file does not interfere` +
+  ` with the creation of a writable stream on another file`);
+}
+
+crossLockSAHTests('readwrite');
+crossLockSAHTests('read-only');
+crossLockSAHTests('readwrite-unsafe');
+
+crossLockOperationTests('writable stream', async (t, fileHandle) => {
+  await cleanup_writable(t, await fileHandle.createWritable());
+});
+
+done();
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js
new file mode 100644
index 00000000000..c5636e7e329
--- /dev/null
+++ b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js
@@ -0,0 +1,166 @@
+importScripts('/resources/testharness.js');
+importScripts('resources/sandboxed-fs-test-helpers.js');
+importScripts('resources/test-helpers.js');
+
+'use strict';
+
+const SAH_MODES = ['readwrite', 'read-only', 'readwrite-unsafe'];
+
+const LOCK_ACCESS = {
+  SHARED: 'shared',
+  EXCLUSIVE: 'exclusive',
+};
+const LOCK_WRITE_PERMISSION = {
+  NOT_WRITABLE: 'not writable',
+  WRITABLE: 'writable',
+};
+
+async function testLockAccess(t, fileHandle, sahMode) {
+  const syncHandle1 = await fileHandle.createSyncAccessHandle({mode: sahMode});
+  t.add_cleanup(() => syncHandle1.close());
+
+  let access;
+  try {
+    const syncHandle2 =
+        await fileHandle.createSyncAccessHandle({mode: sahMode});
+    syncHandle2.close();
+    access = LOCK_ACCESS.SHARED;
+  } catch (e) {
+    access = LOCK_ACCESS.EXCLUSIVE;
+    assert_throws_dom('NoModificationAllowedError', () => {
+      throw e;
+    });
+  }
+  syncHandle1.close();
+
+  // Can open another sync access handle after other handles have closed.
+  const syncHandle3 = await fileHandle.createSyncAccessHandle({mode: sahMode});
+  syncHandle3.close();
+
+  return access;
+}
+
+async function testLockWritePermission(t, fileHandle, sahMode) {
+  const syncHandle = await fileHandle.createSyncAccessHandle({mode: sahMode});
+  t.add_cleanup(() => syncHandle.close());
+
+  let permission;
+  const writeBuffer = new TextEncoder().encode('Hello Storage Foundation');
+  try {
+    syncHandle.write(writeBuffer, {at: 0});
+    permission = LOCK_WRITE_PERMISSION.WRITABLE;
+  } catch (e) {
+    permission = LOCK_WRITE_PERMISSION.NOT_WRITABLE;
+    assert_throws_dom('NoModificationAllowedError', () => {
+      throw e;
+    });
+  }
+  // truncate and flush should throw a NoModificationAllowedError if an only if
+  // write threw a NoModificationAllowedError.
+  if (permission == LOCK_WRITE_PERMISSION.WRITABLE) {
+    syncHandle.truncate(0);
+    syncHandle.flush();
+  } else {
+    assert_throws_dom(
+        'NoModificationAllowedError', () => syncHandle.truncate(0));
+    assert_throws_dom('NoModificationAllowedError', () => syncHandle.flush());
+  }
+
+  return permission;
+}
+
+// Adds tests for expected behaviors of an access handle created in `sahMode`
+// mode.
+function lockPropertyTests(
+    sahMode, expectedLockAccess, expectedLockWritePermission) {
+  const sahOptions = {mode: sahMode};
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle =
+        await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
+    const {mode} = syncHandle;
+    syncHandle.close();
+    assert_equals(mode, sahMode);
+  }, `An access handle in ${sahMode} mode has a mode property equal to` +
+  ` ${sahMode}`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+    assert_equals(
+        await testLockAccess(t, fileHandle, sahMode), expectedLockAccess);
+  }, `${sahMode} mode takes a ${expectedLockAccess}`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+    assert_equals(
+        await testLockWritePermission(t, fileHandle, sahMode),
+        expectedLockWritePermission);
+  }, `${sahMode} mode is ${expectedLockWritePermission}`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle =
+        await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
+    t.add_cleanup(() => syncHandle.close());
+    for (const mode of SAH_MODES) {
+      if (sahMode !== mode) {
+        await promise_rejects_dom(
+            t, 'NoModificationAllowedError',
+            fileHandle.createSyncAccessHandle({mode: mode}));
+      }
+    }
+  }, `When there's an open access handle in ${sahMode} mode on a file, cannot` +
+  ` open another access handle of another mode on that same file`);
+
+  directory_test(async (t, rootDir) => {
+    const fooFileHandle =
+        await rootDir.getFileHandle('foo.test', {create: true});
+    const barFileHandle =
+        await rootDir.getFileHandle('bar.test', {create: true});
+
+    const fooSyncHandle =
+        await fooFileHandle.createSyncAccessHandle(sahOptions);
+    t.add_cleanup(() => fooSyncHandle.close());
+
+    for (const mode of SAH_MODES) {
+      const barSyncHandle =
+          await barFileHandle.createSyncAccessHandle({mode});
+      barSyncHandle.close();
+    }
+  }, `When there's an open access handle in ${sahMode} mode on a file, can` +
+  ` open another access handle of any mode on a different file`);
+
+  directory_test(async (t, rootDir) => {
+    const fileHandle =
+        await rootDir.getFileHandle('OPFS.test', {create: true});
+
+    const syncHandle1 = await fileHandle.createSyncAccessHandle(sahOptions);
+    syncHandle1.close();
+
+    for (const mode of SAH_MODES) {
+      const syncHandle2 = await fileHandle.createSyncAccessHandle({mode});
+      syncHandle2.close();
+    }
+  }, `After an access handle in ${sahMode} mode on a file has been closed,` +
+  ` can open another access handle of any mode on the same file`);
+}
+
+directory_test(async (t, rootDir) => {
+  const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+
+  const syncHandle = await fileHandle.createSyncAccessHandle();
+  t.add_cleanup(() => syncHandle.close());
+  assert_equals(syncHandle.mode, 'readwrite');
+}, 'A sync access handle opens in readwrite mode by default');
+
+lockPropertyTests(
+    'readwrite', LOCK_ACCESS.EXCLUSIVE, LOCK_WRITE_PERMISSION.WRITABLE);
+lockPropertyTests(
+    'read-only', LOCK_ACCESS.SHARED, LOCK_WRITE_PERMISSION.NOT_WRITABLE);
+lockPropertyTests(
+    'readwrite-unsafe', LOCK_ACCESS.SHARED, LOCK_WRITE_PERMISSION.WRITABLE);
+
+done();
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js
deleted file mode 100644
index dbecc24c1da..00000000000
--- a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js
+++ /dev/null
@@ -1,92 +0,0 @@
-importScripts('/resources/testharness.js');
-importScripts('resources/sandboxed-fs-test-helpers.js');
-importScripts('resources/test-helpers.js');
-
-'use strict';
-
-directory_test(async (t, root_dir) =>  {
-  const fileHandle = await root_dir.getFileHandle('OPFS.test', {create: true});
-
-  const syncHandle1 = await fileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => syncHandle1.close());
-  await promise_rejects_dom(
-      t, 'NoModificationAllowedError', fileHandle.createSyncAccessHandle());
-
-  syncHandle1.close();
-  const syncHandle2 = await fileHandle.createSyncAccessHandle();
-  syncHandle2.close();
-}, 'There can only be one open access handle at any given time');
-
-directory_test(async (t, root_dir) =>  {
-  const fooFileHandle = await root_dir.getFileHandle('foo.test', {create: true});
-  const barFileHandle = await root_dir.getFileHandle('bar.test', {create: true});
-
-  const fooSyncHandle = await fooFileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => fooSyncHandle.close());
-
-  const barSyncHandle1 = await barFileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => barSyncHandle1.close());
-  await promise_rejects_dom(
-      t, 'NoModificationAllowedError', barFileHandle.createSyncAccessHandle());
-
-  barSyncHandle1.close();
-  const barSyncHandle2 = await barFileHandle.createSyncAccessHandle();
-  barSyncHandle2.close();
-}, 'An access handle from one file does not interfere with the creation of an' +
-     ' access handle on another file');
-
-directory_test(async (t, root_dir) =>  {
-  const fooFileHandle = await root_dir.getFileHandle('foo.test', {create: true});
-  const barFileHandle = await root_dir.getFileHandle('bar.test', {create: true});
-
-  const fooWritable = await fooFileHandle.createWritable();
-  t.add_cleanup(() => fooWritable.close());
-
-  const barSyncHandle = await barFileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => barSyncHandle.close());
-}, 'A writable stream from one file does not interfere with the creation of an' +
-     ' access handle on another file');
-
-directory_test(async (t, root_dir) =>  {
-  const fooFileHandle = await root_dir.getFileHandle('foo.test', {create: true});
-  const barFileHandle = await root_dir.getFileHandle('bar.test', {create: true});
-
-  const fooSyncHandle = await fooFileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => fooSyncHandle.close());
-
-  const barWritable = await barFileHandle.createWritable();
-  t.add_cleanup(() => barWritable.close());
-}, 'An access handle from one file does not interfere with the creation of a' +
-     ' writable stream on another file');
-
-directory_test(async (t, root_dir) =>  {
-  const fileHandle = await root_dir.getFileHandle('OPFS.test', {create: true});
-
-  const syncHandle = await fileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => { syncHandle.close(); });
-  await promise_rejects_dom(
-    t, 'NoModificationAllowedError', cleanup_writable(t, fileHandle.createWritable()));
-
-  syncHandle.close();
-  const writable = await fileHandle.createWritable();
-  await writable.close();
-}, 'Writable streams cannot be created if there is an open access handle');
-
-directory_test(async (t, root_dir) =>  {
-  const fileHandle = await root_dir.getFileHandle('OPFS.test', {create: true});
-
-  const writable1 = await fileHandle.createWritable();
-  const writable2 = await fileHandle.createWritable();
-  await promise_rejects_dom(
-      t, 'NoModificationAllowedError', fileHandle.createSyncAccessHandle());
-
-  await writable1.close();
-  await promise_rejects_dom(
-      t, 'NoModificationAllowedError', fileHandle.createSyncAccessHandle());
-
-  await writable2.close();
-  const syncHandle = await fileHandle.createSyncAccessHandle();
-  syncHandle.close();
-}, 'Access handles cannot be created if there are open Writable streams');
-
-done();
diff --git a/tests/wpt/tests/fs/resources/message-target.js b/tests/wpt/tests/fs/resources/message-target.js
index 7c29afb799c..ac5fa63e137 100644
--- a/tests/wpt/tests/fs/resources/message-target.js
+++ b/tests/wpt/tests/fs/resources/message-target.js
@@ -108,8 +108,8 @@ function add_message_event_handlers(receiver, target, target_origin) {
           // success to the sender.
           let success = true;
           try {
-            const access_handle = await message_data.file_handle
-                                    .createSyncAccessHandle({mode: "in-place"});
+            const access_handle =
+                await message_data.file_handle.createSyncAccessHandle();
             access_handle.close();
           } catch (error) {
             success = false;
diff --git a/tests/wpt/tests/html-aam/roles-contextual.html b/tests/wpt/tests/html-aam/roles-contextual.html
new file mode 100644
index 00000000000..d2a09db453c
--- /dev/null
+++ b/tests/wpt/tests/html-aam/roles-contextual.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html>
+<head>
+  <title>HTML-AAM Contextual-Specific Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+
+<p>Tests contextual computedrole mappings defined in <a href="https://w3c.github.io/html-aam/">HTML-AAM</a>, where the returned computed role is expected to change based on the context. Most test names correspond to a unique ID defined in the spec.<p>
+
+<p>These should remain in alphabetical order.</code></p>
+
+
+<!-- el-a -->
+<a href="#" data-testname="el-a" data-expectedrole="link" class="ex">x</a>
+<a data-testname="el-a-no-href" class="ex-generic">x</a>
+
+<!-- el-aside -->
+<nav>
+  <aside data-testname="el-aside-in-section-with-name" data-expectedrole="complementary" aria-label="x" class="ex">x</aside>
+  <aside data-testname="el-aside-in-section-without-name" class="ex-generic">x</aside>
+</nav>
+<aside data-testname="el-aside-ancestorbodymain" data-expectedrole="complementary" class="ex">x</aside>
+
+<!-- el-footer -->
+<nav>
+  <footer data-testname="el-footer" aria-label="x" class="ex-generic">x</aside>
+</nav>
+<footer data-testname="el-footer-ancestorbody" data-expectedrole="contentinfo" class="ex">x</footer>
+
+<!-- el-header -->
+<nav>
+  <header data-testname="el-header" aria-label="x" class="ex-generic">x</header>
+</nav>
+<header data-testname="el-header-ancestorbody" data-expectedrole="banner" class="ex">x</header>
+
+<!-- el-section -->
+<section data-testname="el-section" aria-label="x" data-expectedrole="region" class="ex">x</section>
+<section data-testname="el-section-no-name" class="ex-generic">x</section>
+
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html-aam/roles-generic.html b/tests/wpt/tests/html-aam/roles-generic.html
new file mode 100644
index 00000000000..e6ff46b0662
--- /dev/null
+++ b/tests/wpt/tests/html-aam/roles-generic.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+  <title>HTML-AAM Generic Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+
+<p>Tests ONLY the <code>generic</code> mappings defined in <a href="https://w3c.github.io/html-aam/">HTML-AAM</a>. Most test names correspond to a unique ID defined in the spec.<p>
+
+<p>These should remain in alphabetical order by tagname.</p>
+
+<!-- a -> ./roles-contextual.html -->
+<!-- aside -> ./roles-contextual.html -->
+<b data-testname="el-b" class="ex-generic">x</b>
+<bdi data-testname="el-bdi" class="ex-generic">x</bdi>
+<bdo data-testname="el-bdo" class="ex-generic">x</bdo>
+<data value="1" data-testname="el-data" class="ex-generic">x</data>
+<div open data-testname="el-div" class="ex-generic">x</div>
+<!-- footer -> ./roles-contextual.html -->
+<!-- header -> ./roles-contextual.html -->
+<i data-testname="el-i" class="ex-generic">x</i>
+<li data-testname="el-li-orphaned" class="ex-generic">x</li><!-- todo: should orphaned roles be tested in a new ./roles-orphaned.html file? -->
+<pre data-testname="el-pre" class="ex-generic">x</pre>
+<q data-testname="el-q" class="ex-generic">x</q>
+<samp data-testname="el-samp" class="ex-generic">x</samp>
+<!-- section -> ./roles-contextual.html -->
+<small data-testname="el-small" class="ex-generic">x</small>
+<span data-testname="el-span" class="ex-generic">x</span>
+<u data-testname="el-u" class="ex-generic">x</u>
+
+<script>
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html-aam/roles.html b/tests/wpt/tests/html-aam/roles.html
index ff4986370f4..4b24743c8d5 100644
--- a/tests/wpt/tests/html-aam/roles.html
+++ b/tests/wpt/tests/html-aam/roles.html
@@ -12,30 +12,23 @@
 <body>
 
 
-<p>Tests the computedrole mappings defined in <a href="https://w3c.github.io/html-aam/">HTML-AAM</a>. Most test names correspond to unique ID defined in the spec.<p>
+<p>Tests the computedrole mappings defined in <a href="https://w3c.github.io/html-aam/">HTML-AAM</a>. Most test names correspond to a unique ID defined in the spec.<p>
 
 <p>These should remain in alphabetical order, and include all HTML tagnames. If a tag is not tested here, include a pointer to the file where it is tested, such as: <code>&lt;!-- caption -&gt; ./table-roles.html --&gt;</code></p>
 
-<a href="#" data-testname="el-a" data-expectedrole="link" class="ex">x</a>
-<a data-testname="el-a-no-href" data-expectedrole="generic" class="ex">x</a>
+
+<!-- a (w/ and w/o href) -> ./roles-contextual.html -->
 <!-- todo: abbr -->
 <address data-testname="el-address" data-expectedrole="group" class="ex">x</address>
 <!-- area -> ./fragile/area-role.html -->
 <article data-testname="el-article" data-expectedrole="article" class="ex">x</article>
-
-<!-- el-aside -->
-<nav>
-  <aside data-testname="el-aside-in-section-with-name" data-expectedrole="complementary" aria-label="x" class="ex">x</aside>
-  <aside data-testname="el-aside-in-section-without-name" data-expectedrole="generic" class="ex">x</aside>
-</nav>
-<aside data-testname="el-aside-ancestorbodymain" data-expectedrole="complementary" class="ex">x</aside>
-
+<!-- aside -> ./roles-contextual.html -->
 <!-- todo: audio -->
 <!-- todo: autonomous custom element -->
-<b data-testname="el-b" data-expectedrole="generic" class="ex">x</b>
+<!-- b -> ./roles-generic.html -->
 <!-- base (not mapped) -->
-<bdi data-testname="el-bdi" data-expectedrole="generic" class="ex">x</bdi>
-<bdo data-testname="el-bdo" data-expectedrole="generic" class="ex">x</bdo>
+<!-- bdi -> ./roles-generic.html -->
+<!-- bdo -> ./roles-generic.html -->
 <blockquote data-testname="el-blockquote" data-expectedrole="blockquote" class="ex">x</blockquote>
 <!-- todo: body -->
 <!-- br (not mapped) -->
@@ -46,7 +39,7 @@
 <code data-testname="el-code" data-expectedrole="code" class="ex">x</code>
 <!-- todo: col -->
 <!-- todo: colgroup -->
-<data value="1" data-testname="el-data" data-expectedrole="generic" class="ex">x</data>
+<!-- data -> ./roles-generic.html -->
 <!-- todo: datalist -->
 
 <!-- el-dd -->
@@ -58,7 +51,7 @@
 <del data-testname="el-del" data-expectedrole="deletion" class="ex">x</del>
 <details data-testname="el-details" data-expectedrole="group" class="ex"><summary>x</summary>x</details>
 <dfn data-testname="el-dfn" data-expectedrole="term" class="ex">x</dfn>
-<div open data-testname="el-div" data-expectedrole="generic" class="ex">x</div>
+<!-- div -> ./roles-generic.html -->
 <!-- todo: dl -->
 
 <!-- el-dt -->
@@ -72,13 +65,7 @@
 <fieldset data-testname="el-fieldset" data-expectedrole="group" class="ex"><legend>x</legend><input></fieldset>
 <!-- todo: figcaption -->
 <figure data-testname="el-figure" data-expectedrole="figure" class="ex"><img src="#" alt="x"><figcaption>x</figcaption></figure>
-
-<!-- el-footer -->
-<nav>
-  <footer data-testname="el-footer" data-expectedrole="generic" aria-label="x" class="ex">x</aside>
-</nav>
-<footer data-testname="el-footer-ancestorbody" data-expectedrole="contentinfo" class="ex">x</footer>
-
+<!-- footer -> ./roles-contextual.html -->
 <form data-testname="el-form" data-expectedrole="form" class="ex"><input></form>
 <!-- todo: form-associated custom element -->
 
@@ -92,16 +79,11 @@
 
 <!-- head (not mapped) -->
 
-<!-- el-header -->
-<nav>
-  <header data-testname="el-header" data-expectedrole="generic" aria-label="x" class="ex">x</header>
-</nav>
-<header data-testname="el-header-ancestorbody" data-expectedrole="banner" class="ex">x</header>
-
+<!-- header -> ./roles-contextual.html -->
 <hgroup data-testname="el-hgroup" data-expectedrole="group" class="ex"><h1>x</h1></hgroup>
 <hr data-testname="el-hr" data-expectedrole="separator" class="ex">
 <!-- todo: html -->
-<i data-testname="el-i" data-expectedrole="generic" class="ex">x</i>
+<!-- i -> ./roles-generic.html -->
 <!-- todo: iframe -->
 <img src="#" alt="x" data-testname="el-img" data-expectedrole="image" class="ex">
 
@@ -141,7 +123,7 @@
 <!-- todo: legend -->
 
 <!-- el-li -->
-<li data-testname="el-li-orphaned" data-expectedrole="generic" class="ex">x</li>
+<!-- li (orphaned) -> ./roles-generic.html -->
 <ul><li data-testname="el-li-in-ul" data-expectedrole="listitem" class="ex">x</li><li>x</li></ul>
 <ol><li data-testname="el-li-in-ol" data-expectedrole="listitem" class="ex">x</li><li>x</li></ol>
 
@@ -170,20 +152,17 @@
 <p data-testname="el-p" data-expectedrole="paragraph" class="ex">x</p>
 <!-- param (not mapped) -->
 <!-- todo: picture -->
-<pre data-testname="el-pre" data-expectedrole="generic" class="ex">x</pre>
+<!-- pre -> ./roles-generic.html -->
 <progress data-testname="el-progress" data-expectedrole="progressbar" class="ex">x</progress>
-<q data-testname="el-q" data-expectedrole="generic" class="ex">x</q>
+<!-- q -> ./roles-generic.html -->
 <!-- todo: rp -> /ruby-aam? -->
 <!-- todo: rt -> /ruby-aam? -->
 <!-- todo: ruby -> /ruby-aam? -->
 <s data-testname="el-s" data-expectedrole="deletion" class="ex">x</s>
-<samp data-testname="el-samp" data-expectedrole="generic" class="ex">x</samp>
+<!-- samp -> ./roles-generic.html -->
 <!-- script (not mapped) -->
 <search data-testname="el-search" data-expectedrole="search" class="ex">x</search>
-
-<!-- el-section -->
-<section data-testname="el-section" aria-label="x" data-expectedrole="region" class="ex">x</section>
-<section data-testname="el-section-no-name" data-expectedrole="generic" class="ex">x</section>
+<!-- section -> ./roles-contextual.html -->
 
 <!-- Blocked: HTML-AAM Issue #467 -->
 <!-- <select data-testname="el-select-combobox" data-expectedrole="combobox" class="ex"><option>a1</option><option>a2</option></select>-->
@@ -191,9 +170,9 @@
 <select data-testname="el-select-listbox" size="2" data-expectedrole="listbox" class="ex"><option>b1</option><option>b2</option></select>
 
 <!-- slot (not mapped) -->
-<small data-testname="el-small" data-expectedrole="generic" class="ex">x</small>
+<!-- small -> ./roles-generic.html -->
 <!-- source (not mapped) -->
-<span data-testname="el-span" data-expectedrole="generic" class="ex">x</span>
+<!-- span -> ./roles-generic.html -->
 <strong data-testname="el-strong" data-expectedrole="strong" class="ex">x</strong>
 <!-- style (not mapped) -->
 <sub data-testname="el-sub" data-expectedrole="subscript" class="ex">x</sub>
@@ -212,7 +191,7 @@
 <!-- tr -> ./table-roles.html -->
 <textarea data-testname="el-textarea" data-expectedrole="textbox" class="ex">x</textarea>
 <!-- track (not mapped) -->
-<u data-testname="el-u" data-expectedrole="generic" class="ex">x</u>
+<!-- u -> ./roles-generic.html -->
 <ul data-testname="el-ul" data-expectedrole="list" class="ex"><li>x</li><li>x</li></ul>
 <!-- var (not mapped) -->
 <!-- todo: video -->
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
index 758fbcf360d..d32e972cc5f 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
index 111cb8033d5..b9774aeba67 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
index a7ebc6ab48a..15808ee50e7 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
index 9f270f4aed8..067f1299839 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
index 23f4723cd31..88ecdb98108 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
index 15ac2bf6d71..046e4d97b13 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
@@ -42,9 +42,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
index d1f5be3d4b8..1c7660ac991 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
@@ -42,9 +42,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
index 85c23d60be5..6760b18db74 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html
index bcb47509207..1ff7c44193e 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html
index 070a97e49b2..00ece5750e3 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html
index a7b06f16aeb..be9c1a810a7 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html
index d7abedc14e9..5e9bd4c7214 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html
@@ -34,9 +34,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html
index c928e1878ba..ea9dfdb3bbe 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html
index 7bbe734468b..b07fd02518a 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html
index 7705d0966f4..7c19baf5c57 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html
@@ -34,9 +34,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html
index 25e1c019fdd..6487fc440b8 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html
index 75a077a610d..908a0dbc193 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html
@@ -35,9 +35,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html
index a93120c44bb..07f52d73631 100644
--- a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html
@@ -33,9 +33,9 @@ _addTest(function(canvas, ctx) {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
index 4a639778ccd..c270a751752 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
index 114dab0a219..07ea409ad83 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
index 94fe289b1a4..89d8757bde5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
index e6f53fb9992..686721cbc69 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
index 7cf9867dba8..cda6743f66e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
index 132d131bcae..c96b9c59f22 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
index 27f75a8a743..a6f1d676191 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
index 9534174757b..22e6cb49cea 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
index b46155701c9..5cda039e944 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
index fffce0f9f2f..c4e70f53c9d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
index 5c4d8125265..290923b5e5c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
@@ -43,9 +43,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
index 5bd3f5eafa9..d03c0db23c4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
@@ -39,9 +39,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
index 1dec145e58a..edf1909ac17 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
@@ -43,9 +43,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
index 31638cff3d5..8788954a3c0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
@@ -39,9 +39,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
index 6cffa28175a..9487c8c931c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
index 85a9eae4054..6fc834373a4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html
index 52319ef6126..b14b44fe30a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
index 7f5ad50ff39..c8e6095805a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html
index f0da2c2742a..a55f0a11044 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
index 37ed851ab31..5da290a7ce6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html
index 3f255027a16..3a7af0658be 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
index 0f36051e6a1..dd49fa37714 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html
index 1ef80a568ee..3a539e6b639 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html
@@ -35,9 +35,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
index 3c9131dbb3f..0d05bf4d5b0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
@@ -31,9 +31,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html
index 61fed27df87..2643c67170a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
index b23eb81d148..52d45093ba8 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html
index 814beccf510..423de4491d7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
index 44eb4f4b2ce..861dcccbe34 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html
index 632ada6b9ce..61df3dccfea 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html
@@ -35,9 +35,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
index 16d0c1a8ee0..db65ea1b8b4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
@@ -31,9 +31,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html
index 38235188133..86e2af14281 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
index 853ad165a3f..dd8d7272098 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html
index af5bbd78971..b0ff86ad055 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html
@@ -36,9 +36,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
index 434c27b0b1f..ad6bc9d897b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
@@ -32,9 +32,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html
index 1cf578bc80d..5e085fd998e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html
@@ -34,9 +34,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
index 34fb0caa448..540e9a7ed48 100644
--- a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
@@ -30,9 +30,9 @@ t.step(function() {
   _assertPixel(canvas, 98,1, 0,255,0,255);
   _assertPixel(canvas, 1,25, 0,255,0,255);
   _assertPixel(canvas, 50,25, 0,255,0,255);
-  _assertPixel(canvas, 98,25, 0,255,0,255);
+  _assertPixelApprox(canvas, 98,25, 0,255,0,255, 1);
   _assertPixel(canvas, 1,48, 0,255,0,255);
-  _assertPixel(canvas, 50,48, 0,255,0,255);
+  _assertPixelApprox(canvas, 50,48, 0,255,0,255, 1);
   _assertPixel(canvas, 98,48, 0,255,0,255);
   t.done();
 });
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml
index e30eb010088..19157d962b4 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml
@@ -626,9 +626,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -648,9 +648,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -671,9 +671,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -693,9 +693,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -715,9 +715,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -738,9 +738,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -760,9 +760,9 @@
     @assert pixel 98,1 == 0,255,0,255; @moz-todo
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
-    @assert pixel 98,25 == 0,255,0,255; @moz-todo
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255; @moz-todo
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
   expected: green
 
@@ -784,9 +784,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -806,9 +806,9 @@
     @assert pixel 98,1 == 0,255,0,255; @moz-todo
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
-    @assert pixel 98,25 == 0,255,0,255; @moz-todo
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255; @moz-todo
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
   expected: green
 
@@ -828,9 +828,9 @@
     @assert pixel 98,1 == 0,255,0,255; @moz-todo
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
-    @assert pixel 98,25 == 0,255,0,255; @moz-todo
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255; @moz-todo
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
   expected: green
 
@@ -850,9 +850,9 @@
     @assert pixel 98,1 == 0,255,0,255; @moz-todo
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
-    @assert pixel 98,25 == 0,255,0,255; @moz-todo
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255; @moz-todo
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
   expected: green
 
@@ -872,9 +872,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -894,9 +894,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -916,9 +916,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -938,9 +938,9 @@
     @assert pixel 98,1 == 0,255,0,255; @moz-todo
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
-    @assert pixel 98,25 == 0,255,0,255; @moz-todo
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255; @moz-todo
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
   expected: green
 
@@ -960,9 +960,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -991,9 +991,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255;
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
@@ -1022,9 +1022,9 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,25 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255;
-    @assert pixel 98,25 == 0,255,0,255;
+    @assert pixel 98,25 ==~ 0,255,0,255 +/- 1;
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
-    @assert pixel 50,48 == 0,255,0,255;
+    @assert pixel 50,48 ==~ 0,255,0,255 +/- 1;
     @assert pixel 98,48 == 0,255,0,255;
   expected: green
 
diff --git a/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001-ref.html b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001-ref.html
new file mode 100644
index 00000000000..43f2216bec7
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<title>Details pseudo-elements</title>
+<!-- This test is (at time of writing) _EXTREMELY_ tentative. -->
+<style>
+
+div { background: aqua }
+summary { background: fuchsia }
+
+</style>
+
+<details open>
+  <summary>The summary</summary>
+  <div>The details!</div>
+</details>
diff --git a/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html
new file mode 100644
index 00000000000..08321977c6b
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-001.tentative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Details pseudo-elements</title>
+<!-- This test is (at time of writing) _EXTREMELY_ tentative. -->
+<link rel="match" href="details-pseudo-elements-001-ref.html">
+<link rel="help" href="https://github.com/dbaron/details-styling">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1469418">
+<style>
+
+details::details-content {
+  background: aqua;
+  display: block; /* override display: contents for slot */
+}
+details::details-summary {
+  background: fuchsia;
+  display: block; /* override display: contents for slot */
+}
+
+</style>
+
+<details open>
+  <summary>The summary</summary>
+  <div>The details!</div>
+</details>
diff --git a/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html
index b519246aa5d..3c54fff1075 100644
--- a/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html
+++ b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html
@@ -15,9 +15,9 @@
     <script src="/resources/testharnessreport.js"></script>
     <script>
       var num_iframes = 8;
-      var order = ['8c692a23f8c9b5860cf06fb334041d2e97e96f5c','95cb768746a1ca7ac02d39c0bb2b10d9e965e37c','06bd3583493359d112d19765f68fac3901267408','48d8375ef2d9d73bd133f2947858a3450a988d53','36fb2178fbdfa1b32701a9d9214c3fd115fd7184','d373bc3abdda01b17a6055af21b16c151dd1d697','4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2',];
+      var order = ['8c692a23f8c9b5860cf06fb334041d2e97e96f5c','95cb768746a1ca7ac02d39c0bb2b10d9e965e37c','06bd3583493359d112d19765f68fac3901267408','48d8375ef2d9d73bd133f2947858a3450a988d53','36fb2178fbdfa1b32701a9d9214c3fd115fd7184','d373bc3abdda01b17a6055af21b16c151dd1d697','4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2','38b248763fb49ca6c1abc2f2f9d9e502c5ed5041','054c57cdb4b945b7273a4627a68f470705640e3e',];
       var tests = {
-          "8c692a23f8c9b5860cf06fb334041d2e97e96f5c":[async_test('html5lib_innerHTML_tests4.html 8c692a23f8c9b5860cf06fb334041d2e97e96f5c'), "direct%20div%20content", "%23document%0A%7C%20%22direct%20div%20content%22", 'div'],"95cb768746a1ca7ac02d39c0bb2b10d9e965e37c":[async_test('html5lib_innerHTML_tests4.html 95cb768746a1ca7ac02d39c0bb2b10d9e965e37c'), "direct%20textarea%20content", "%23document%0A%7C%20%22direct%20textarea%20content%22", 'textarea'],"06bd3583493359d112d19765f68fac3901267408":[async_test('html5lib_innerHTML_tests4.html 06bd3583493359d112d19765f68fac3901267408'), "textarea%20content%20with%20%3Cem%3Epseudo%3C/em%3E%20%3Cfoo%3Emarkup", "%23document%0A%7C%20%22textarea%20content%20with%20%3Cem%3Epseudo%3C/em%3E%20%3Cfoo%3Emarkup%22", 'textarea'],"48d8375ef2d9d73bd133f2947858a3450a988d53":[async_test('html5lib_innerHTML_tests4.html 48d8375ef2d9d73bd133f2947858a3450a988d53'), "this%20is%20%26%23x0043%3BDATA%20inside%20a%20%3Cstyle%3E%20element", "%23document%0A%7C%20%22this%20is%20%26%23x0043%3BDATA%20inside%20a%20%3Cstyle%3E%20element%22", 'style'],"36fb2178fbdfa1b32701a9d9214c3fd115fd7184":[async_test('html5lib_innerHTML_tests4.html 36fb2178fbdfa1b32701a9d9214c3fd115fd7184'), "%3C/plaintext%3E", "%23document%0A%7C%20%22%3C/plaintext%3E%22", 'plaintext'],"d373bc3abdda01b17a6055af21b16c151dd1d697":[async_test('html5lib_innerHTML_tests4.html d373bc3abdda01b17a6055af21b16c151dd1d697'), "setting%20html%27s%20innerHTML", "%23document%0A%7C%20%3Chead%3E%0A%7C%20%3Cbody%3E%0A%7C%20%20%20%22setting%20html%27s%20innerHTML%22", 'html'],"4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2":[async_test('html5lib_innerHTML_tests4.html 4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2'), "%3Ctitle%3Esetting%20head%27s%20innerHTML%3C/title%3E", "%23document%0A%7C%20%3Ctitle%3E%0A%7C%20%20%20%22setting%20head%27s%20innerHTML%22", 'head'],
+          "8c692a23f8c9b5860cf06fb334041d2e97e96f5c":[async_test('html5lib_innerHTML_tests4.html 8c692a23f8c9b5860cf06fb334041d2e97e96f5c'), "direct%20div%20content", "%23document%0A%7C%20%22direct%20div%20content%22", 'div'],"95cb768746a1ca7ac02d39c0bb2b10d9e965e37c":[async_test('html5lib_innerHTML_tests4.html 95cb768746a1ca7ac02d39c0bb2b10d9e965e37c'), "direct%20textarea%20content", "%23document%0A%7C%20%22direct%20textarea%20content%22", 'textarea'],"06bd3583493359d112d19765f68fac3901267408":[async_test('html5lib_innerHTML_tests4.html 06bd3583493359d112d19765f68fac3901267408'), "textarea%20content%20with%20%3Cem%3Epseudo%3C/em%3E%20%3Cfoo%3Emarkup", "%23document%0A%7C%20%22textarea%20content%20with%20%3Cem%3Epseudo%3C/em%3E%20%3Cfoo%3Emarkup%22", 'textarea'],"48d8375ef2d9d73bd133f2947858a3450a988d53":[async_test('html5lib_innerHTML_tests4.html 48d8375ef2d9d73bd133f2947858a3450a988d53'), "this%20is%20%26%23x0043%3BDATA%20inside%20a%20%3Cstyle%3E%20element", "%23document%0A%7C%20%22this%20is%20%26%23x0043%3BDATA%20inside%20a%20%3Cstyle%3E%20element%22", 'style'],"36fb2178fbdfa1b32701a9d9214c3fd115fd7184":[async_test('html5lib_innerHTML_tests4.html 36fb2178fbdfa1b32701a9d9214c3fd115fd7184'), "%3C/plaintext%3E", "%23document%0A%7C%20%22%3C/plaintext%3E%22", 'plaintext'],"d373bc3abdda01b17a6055af21b16c151dd1d697":[async_test('html5lib_innerHTML_tests4.html d373bc3abdda01b17a6055af21b16c151dd1d697'), "setting%20html%27s%20innerHTML", "%23document%0A%7C%20%3Chead%3E%0A%7C%20%3Cbody%3E%0A%7C%20%20%20%22setting%20html%27s%20innerHTML%22", 'html'],"4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2":[async_test('html5lib_innerHTML_tests4.html 4f91b1d4c6e2bbc0595c9effc490b7357e9cefc2'), "%3Ctitle%3Esetting%20head%27s%20innerHTML%3C/title%3E", "%23document%0A%7C%20%3Ctitle%3E%0A%7C%20%20%20%22setting%20head%27s%20innerHTML%22", 'head'],"38b248763fb49ca6c1abc2f2f9d9e502c5ed5041":[async_test('html5lib_innerHTML_tests4.html 38b248763fb49ca6c1abc2f2f9d9e502c5ed5041'), "direct%20%3Ctitle%3E%20content", "%23document%0A%7C%20%22direct%20%3Ctitle%3E%20content%22", 'title'],"054c57cdb4b945b7273a4627a68f470705640e3e":[async_test('html5lib_innerHTML_tests4.html 054c57cdb4b945b7273a4627a68f470705640e3e'), "%3C%21--%20inside%20%3C/script%3E%20--%3E", "%23document%0A%7C%20%22%3C%21--%20inside%20%3C/script%3E%20--%3E%22", 'script'],
       }
       init_tests("innerHTML");
     </script>
diff --git a/tests/wpt/tests/html/syntax/parsing/html5lib_quirks01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_quirks01.html
new file mode 100644
index 00000000000..333292c9a20
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/parsing/html5lib_quirks01.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf8">
+    <title>HTML 5 Parser tests html5lib_quirks01.html</title>
+    <meta name="timeout" content="long">
+    <meta name="variant" content="?run_type=uri">
+    <meta name="variant" content="?run_type=write">
+    <meta name="variant" content="?run_type=write_single">
+  </head>
+  <body>
+    <h1>html5lib Parser Test</h1>
+    <div id="log"></div>
+    <script src="common.js"></script>
+    <script src="test.js"></script>
+    <script src="template.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      var num_iframes = 8;
+      var order = ['700e38ecb6ac91e9c5477fd451591b844d51f38e','d196aec77885a47ff43166960d48c8c9eb2cbee0','d4b597fe74a7af1b96750e29cb1180af8b97a1f4','e1bacd20039e6d1bed0de4aff51c37e303762170',];
+      var tests = {
+          "700e38ecb6ac91e9c5477fd451591b844d51f38e":[async_test('html5lib_quirks01.html 700e38ecb6ac91e9c5477fd451591b844d51f38e'), "%3C%21DOCTYPE%20html%20PUBLIC%20%22-//W3C//DTD%20XHTML%201.0%20Frameset//EN%22%0A%22http%3A//www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd%22%3E%3Cp%3E%3Ctable%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%20%22-//W3C//DTD%20XHTML%201.0%20Frameset//EN%22%20%22http%3A//www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd%22%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"d196aec77885a47ff43166960d48c8c9eb2cbee0":[async_test('html5lib_quirks01.html d196aec77885a47ff43166960d48c8c9eb2cbee0'), "%3C%21DOCTYPE%20html%20SYSTEM%20%22http%3A//www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd%22%3E%3Cp%3E%3Ctable%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%20%22%22%20%22http%3A//www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd%22%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E"],"d4b597fe74a7af1b96750e29cb1180af8b97a1f4":[async_test('html5lib_quirks01.html d4b597fe74a7af1b96750e29cb1180af8b97a1f4'), "%3C%21DOCTYPE%20html%20PUBLIC%20%22html%22%3E%3Cp%3E%3Ctable%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%20%22html%22%20%22%22%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E"],"e1bacd20039e6d1bed0de4aff51c37e303762170":[async_test('html5lib_quirks01.html e1bacd20039e6d1bed0de4aff51c37e303762170'), "%3C%21DOCTYPE%20HTML%20PUBLIC%20%22-//W3C//DTD%20HTML%203.2//EN%22%0A%20%20%20%22http%3A//www.w3.org/TR/html4/strict.dtd%22%3E%3Cp%3E%3Ctable%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%20%22-//W3C//DTD%20HTML%203.2//EN%22%20%22http%3A//www.w3.org/TR/html4/strict.dtd%22%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E"],
+      }
+      init_tests(get_type());
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html
index bcc8a949380..fb922f8e68e 100644
--- a/tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html
+++ b/tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html
@@ -18,9 +18,9 @@
     <script src="/resources/testharnessreport.js"></script>
     <script>
       var num_iframes = 8;
-      var order = ['86a267778d1960b41f887b7bd2cd3ebf691d2e42','b6c1142484570bb90c36e454ee193cca17bb618a','7c507b825650f9721ea9656b1e844752a2424271','d10316cac9d03820ecfbc85ab373632e12d70c75','331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30','6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f','9d01d4a7d7519e410e10493c8b108298b6733c31','b4615709ab72b6aa6cbf836582bd40fd93c0deb5','24132334bffa9eea4c8e29c940a8201f4253baf5','103784c31b8e3280b19e30f3b26f467585fbc304','0787e31440ae020f6f6e6207c364e9a2daec1c6f','1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c','aea3c063f853938a36184825893e0820b700e241','6595dc192b10c479a543dbe25e67e6e0b6923ea8','9fcd09d757401684bcc28eaec005ed82718e836f','4be18eaaf0aa53f224b4ff8aeaf47d44ba854260','8e743c4f0ab5783b8973533640f669c92acb3797','201737ac5662941cdf6ece5d6721ea8b0647f0ce',];
+      var order = ['86a267778d1960b41f887b7bd2cd3ebf691d2e42','b6c1142484570bb90c36e454ee193cca17bb618a','7c507b825650f9721ea9656b1e844752a2424271','d10316cac9d03820ecfbc85ab373632e12d70c75','331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30','6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f','9d01d4a7d7519e410e10493c8b108298b6733c31','b4615709ab72b6aa6cbf836582bd40fd93c0deb5','24132334bffa9eea4c8e29c940a8201f4253baf5','103784c31b8e3280b19e30f3b26f467585fbc304','0787e31440ae020f6f6e6207c364e9a2daec1c6f','1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c','aea3c063f853938a36184825893e0820b700e241','6595dc192b10c479a543dbe25e67e6e0b6923ea8','9fcd09d757401684bcc28eaec005ed82718e836f','4be18eaaf0aa53f224b4ff8aeaf47d44ba854260','8e743c4f0ab5783b8973533640f669c92acb3797','201737ac5662941cdf6ece5d6721ea8b0647f0ce','9e7ce39b2b0c14d2cad5039047947000b0310f36',];
       var tests = {
-          "86a267778d1960b41f887b7bd2cd3ebf691d2e42":[async_test('html5lib_tables01.html 86a267778d1960b41f887b7bd2cd3ebf691d2e42'), "%3Ctable%3E%3Cth%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Cth%3E"],"b6c1142484570bb90c36e454ee193cca17bb618a":[async_test('html5lib_tables01.html b6c1142484570bb90c36e454ee193cca17bb618a'), "%3Ctable%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"7c507b825650f9721ea9656b1e844752a2424271":[async_test('html5lib_tables01.html 7c507b825650f9721ea9656b1e844752a2424271'), "%3Ctable%3E%3Ccol%20foo%3D%27bar%27%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccolgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ccol%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20foo%3D%22bar%22"],"d10316cac9d03820ecfbc85ab373632e12d70c75":[async_test('html5lib_tables01.html d10316cac9d03820ecfbc85ab373632e12d70c75'), "%3Ctable%3E%3Ccolgroup%3E%3C/html%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22foo%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccolgroup%3E"],"331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30":[async_test('html5lib_tables01.html 331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30'), "%3Ctable%3E%3C/table%3E%3Cp%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%22foo%22"],"6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f":[async_test('html5lib_tables01.html 6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f'), "%3Ctable%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3E%3C/tbody%3E%3C/td%3E%3C/tfoot%3E%3C/th%3E%3C/thead%3E%3C/tr%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"9d01d4a7d7519e410e10493c8b108298b6733c31":[async_test('html5lib_tables01.html 9d01d4a7d7519e410e10493c8b108298b6733c31'), "%3Ctable%3E%3Cselect%3E%3Coption%3E3%3C/select%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%223%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"b4615709ab72b6aa6cbf836582bd40fd93c0deb5":[async_test('html5lib_tables01.html b4615709ab72b6aa6cbf836582bd40fd93c0deb5'), "%3Ctable%3E%3Cselect%3E%3Ctable%3E%3C/table%3E%3C/select%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"24132334bffa9eea4c8e29c940a8201f4253baf5":[async_test('html5lib_tables01.html 24132334bffa9eea4c8e29c940a8201f4253baf5'), "%3Ctable%3E%3Cselect%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"103784c31b8e3280b19e30f3b26f467585fbc304":[async_test('html5lib_tables01.html 103784c31b8e3280b19e30f3b26f467585fbc304'), "%3Ctable%3E%3Cselect%3E%3Coption%3EA%3Ctr%3E%3Ctd%3EB%3C/td%3E%3C/tr%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22A%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22B%22"],"0787e31440ae020f6f6e6207c364e9a2daec1c6f":[async_test('html5lib_tables01.html 0787e31440ae020f6f6e6207c364e9a2daec1c6f'), "%3Ctable%3E%3Ctd%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22foo%22"],"1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c":[async_test('html5lib_tables01.html 1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c'), "%3Ctable%3E%3Ctd%3EA%3C/table%3EB", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22A%22%0A%7C%20%20%20%20%20%22B%22"],"aea3c063f853938a36184825893e0820b700e241":[async_test('html5lib_tables01.html aea3c063f853938a36184825893e0820b700e241'), "%3Ctable%3E%3Ctr%3E%3Ccaption%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%3Ccaption%3E"],"6595dc192b10c479a543dbe25e67e6e0b6923ea8":[async_test('html5lib_tables01.html 6595dc192b10c479a543dbe25e67e6e0b6923ea8'), "%3Ctable%3E%3Ctr%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3E%3C/td%3E%3C/th%3E%3Ctd%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22foo%22"],"9fcd09d757401684bcc28eaec005ed82718e836f":[async_test('html5lib_tables01.html 9fcd09d757401684bcc28eaec005ed82718e836f'), "%3Ctable%3E%3Ctd%3E%3Ctr%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"4be18eaaf0aa53f224b4ff8aeaf47d44ba854260":[async_test('html5lib_tables01.html 4be18eaaf0aa53f224b4ff8aeaf47d44ba854260'), "%3Ctable%3E%3Ctd%3E%3Cbutton%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cbutton%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"8e743c4f0ab5783b8973533640f669c92acb3797":[async_test('html5lib_tables01.html 8e743c4f0ab5783b8973533640f669c92acb3797'), "%3Ctable%3E%3Ctr%3E%3Ctd%3E%3Csvg%3E%3Cdesc%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Csvg%20svg%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Csvg%20desc%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"201737ac5662941cdf6ece5d6721ea8b0647f0ce":[async_test('html5lib_tables01.html 201737ac5662941cdf6ece5d6721ea8b0647f0ce'), "%3Cdiv%3E%3Ctable%3E%3Csvg%3E%3CforeignObject%3E%3Cselect%3E%3Ctable%3E%3Cs%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Csvg%20svg%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Csvg%20foreignObject%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cs%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E"],
+          "86a267778d1960b41f887b7bd2cd3ebf691d2e42":[async_test('html5lib_tables01.html 86a267778d1960b41f887b7bd2cd3ebf691d2e42'), "%3Ctable%3E%3Cth%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Cth%3E"],"b6c1142484570bb90c36e454ee193cca17bb618a":[async_test('html5lib_tables01.html b6c1142484570bb90c36e454ee193cca17bb618a'), "%3Ctable%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"7c507b825650f9721ea9656b1e844752a2424271":[async_test('html5lib_tables01.html 7c507b825650f9721ea9656b1e844752a2424271'), "%3Ctable%3E%3Ccol%20foo%3D%27bar%27%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccolgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ccol%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20foo%3D%22bar%22"],"d10316cac9d03820ecfbc85ab373632e12d70c75":[async_test('html5lib_tables01.html d10316cac9d03820ecfbc85ab373632e12d70c75'), "%3Ctable%3E%3Ccolgroup%3E%3C/html%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22foo%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccolgroup%3E"],"331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30":[async_test('html5lib_tables01.html 331a8c15a2f1dd3a9a1c31f5c65b99d356a65f30'), "%3Ctable%3E%3C/table%3E%3Cp%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%22foo%22"],"6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f":[async_test('html5lib_tables01.html 6cdb83f12cb37a56f5ebad018ec3b07c2ad5b89f'), "%3Ctable%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3E%3C/tbody%3E%3C/td%3E%3C/tfoot%3E%3C/th%3E%3C/thead%3E%3C/tr%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"9d01d4a7d7519e410e10493c8b108298b6733c31":[async_test('html5lib_tables01.html 9d01d4a7d7519e410e10493c8b108298b6733c31'), "%3Ctable%3E%3Cselect%3E%3Coption%3E3%3C/select%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%223%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"b4615709ab72b6aa6cbf836582bd40fd93c0deb5":[async_test('html5lib_tables01.html b4615709ab72b6aa6cbf836582bd40fd93c0deb5'), "%3Ctable%3E%3Cselect%3E%3Ctable%3E%3C/table%3E%3C/select%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"24132334bffa9eea4c8e29c940a8201f4253baf5":[async_test('html5lib_tables01.html 24132334bffa9eea4c8e29c940a8201f4253baf5'), "%3Ctable%3E%3Cselect%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"103784c31b8e3280b19e30f3b26f467585fbc304":[async_test('html5lib_tables01.html 103784c31b8e3280b19e30f3b26f467585fbc304'), "%3Ctable%3E%3Cselect%3E%3Coption%3EA%3Ctr%3E%3Ctd%3EB%3C/td%3E%3C/tr%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22A%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22B%22"],"0787e31440ae020f6f6e6207c364e9a2daec1c6f":[async_test('html5lib_tables01.html 0787e31440ae020f6f6e6207c364e9a2daec1c6f'), "%3Ctable%3E%3Ctd%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22foo%22"],"1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c":[async_test('html5lib_tables01.html 1c40461886d4fdfca6ac5ef1d766b6fbf360ff9c'), "%3Ctable%3E%3Ctd%3EA%3C/table%3EB", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22A%22%0A%7C%20%20%20%20%20%22B%22"],"aea3c063f853938a36184825893e0820b700e241":[async_test('html5lib_tables01.html aea3c063f853938a36184825893e0820b700e241'), "%3Ctable%3E%3Ctr%3E%3Ccaption%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%3Ccaption%3E"],"6595dc192b10c479a543dbe25e67e6e0b6923ea8":[async_test('html5lib_tables01.html 6595dc192b10c479a543dbe25e67e6e0b6923ea8'), "%3Ctable%3E%3Ctr%3E%3C/body%3E%3C/caption%3E%3C/col%3E%3C/colgroup%3E%3C/html%3E%3C/td%3E%3C/th%3E%3Ctd%3Efoo", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22foo%22"],"9fcd09d757401684bcc28eaec005ed82718e836f":[async_test('html5lib_tables01.html 9fcd09d757401684bcc28eaec005ed82718e836f'), "%3Ctable%3E%3Ctd%3E%3Ctr%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"4be18eaaf0aa53f224b4ff8aeaf47d44ba854260":[async_test('html5lib_tables01.html 4be18eaaf0aa53f224b4ff8aeaf47d44ba854260'), "%3Ctable%3E%3Ctd%3E%3Cbutton%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cbutton%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"8e743c4f0ab5783b8973533640f669c92acb3797":[async_test('html5lib_tables01.html 8e743c4f0ab5783b8973533640f669c92acb3797'), "%3Ctable%3E%3Ctr%3E%3Ctd%3E%3Csvg%3E%3Cdesc%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Csvg%20svg%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Csvg%20desc%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"201737ac5662941cdf6ece5d6721ea8b0647f0ce":[async_test('html5lib_tables01.html 201737ac5662941cdf6ece5d6721ea8b0647f0ce'), "%3Cdiv%3E%3Ctable%3E%3Csvg%3E%3CforeignObject%3E%3Cselect%3E%3Ctable%3E%3Cs%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Csvg%20svg%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Csvg%20foreignObject%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cs%3E%0A%7C%20%20%20%20%20%20%20%3Ctable%3E"],"9e7ce39b2b0c14d2cad5039047947000b0310f36":[async_test('html5lib_tables01.html 9e7ce39b2b0c14d2cad5039047947000b0310f36'), "%3Ctable%3Ea%3C%21doctype%20html%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22a%22%0A%7C%20%20%20%20%20%3Ctable%3E"],
       }
       init_tests(get_type());
     </script>
diff --git a/tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html
index 3f7b72a2b10..eddf34c2ff0 100644
--- a/tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html
+++ b/tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html
@@ -18,9 +18,9 @@
     <script src="/resources/testharnessreport.js"></script>
     <script>
       var num_iframes = 8;
-      var order = ['e070301fb578bd639ecbc7ec720fa60222d05826','aaf24dabcb42470e447d241a40def0d136c12b93','b6c1142484570bb90c36e454ee193cca17bb618a','1977644a94de1a04245dfef3f3db69c7ac41aa6f','fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3','d662798ca6dd95a205069658396d0f3d78237233','1ec72d53c4c68f9ca56f037ec53a7dc261886131','2d58ae67534b42e52e34c6b2a275fcb30a878008','14836de42a7fb86b75fef03f08823f90d389b7f3','8ced679aed45a123b97a574f24fba909b65f94dd','932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4','c863d867f843bd66c5303db1634931a36afd3ea9','2221f89de75008a31506b22756a5499bc6bda9bd','7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45','47b9eaef1b5aad0e3963a8d415236fed12702d65','decb4ad6eac317f262b4b87c86b33d2d9d700e75','ffcb1856faa7e09cc892c0f5a4d3353716830784','a259db8ee062d858027148f92811ba0f5796e4b9','bf369032d1e6ebb52ab133e4c4b8c2e872349843','73b97cd984a62703ec54ec4a876ec32aa5fd3b8c','2db9616ed62fc2a26056f3395459869cf556974d','b59aa1c714892618eaccd51696658887fcbd2045','98818e7fda2506603bd208662613edb40297c2d3','e0c43080cf61c0696031bdb097bea4f2a647cfc2','f7753d80a422c40b5fa04d99e52d8ae83369757a','7cbd584aef9508a90c98f80040078149a92ec869','e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa','4fb9b13eeb5d8a201884c572764a70477822f2d4','7ec82c93064966931ce76618a0cce4f275aafdaf','a8fb1cffc8683f0c47fdf9963e0d52c627343ff0','8dc47e70b94f2bea514ceaa51153ec1beeeda7ef','571719c0f9e1dae32ef993917b02c57f698be3d9','7f3afa5785d4b7ea37f8bae17226528f2a30e818','37918d1876724d3a8980920cf4cf2cbef2c3ac06','5da4e202a8962cacf567ce864873ddbff73f8217','4ca566310edc49450571677e8ef195883919ec2f','8a559c045c3a880e555d31de4dd3aa0b06930b73','3067a820b0195f9c08b8d0fe1dd7f8d800e10779','e1011849d36ebf9d1577c53d940a75c462dcb1e7','c9938e14b139e9c2af300bacd38f2f3cfca3fe58','0582a2e2c0eb00e0ba60b280187006c5e7de6991','478db7eafb3ac4a6abb8dbe083664c8d3ada35d8','c6abe422542794d7e8196d73283e562c309fe2e3','9fd0577023d0eb3662569333f5f231090439a217','0c917166dc089cb23a100af2f07cbf95f164533a','60f3ef7971b3259c3d800da672d886b2db778276','341bdf232d96b774988ee3163c953f2581752335','84570bfd25f23f0f40e31ba0c6a08906a2676b6d','4dbef924230e654860aa288a28f6304a062b3faf','2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71','06e43760aeadae330ad5ba80c4b93952ba568b29','4e58f3f3c581dec50f939a660fd5b5828396dac4','693974a6cb0defd3e0b2d63b31d420f39c83d262','3e03ddf29af0af9c9ece091251f0c1c5e08a5e41','9a5211623fcdd9fc3ad2ea4addc608d7c2574b90','39f31f0fbfcc91157104d64ca081d4271bc7e838','86d793db69ce071e78a18c85f8345316f09e1790','182036d2ef28f86873aee09b15125c828179c1b4','2a818d5fd74c60ac2bb369fb2355b84edab31777','9f88d21c8b77696f7238064a4ee87931cc16a03f','1d00919bf0b2493dfee7422a24acee9026de5fff','0c48a9e7584ede9d13d606057202883c5cff3eab',];
+      var order = ['e070301fb578bd639ecbc7ec720fa60222d05826','aaf24dabcb42470e447d241a40def0d136c12b93','b6c1142484570bb90c36e454ee193cca17bb618a','1977644a94de1a04245dfef3f3db69c7ac41aa6f','fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3','d662798ca6dd95a205069658396d0f3d78237233','1ec72d53c4c68f9ca56f037ec53a7dc261886131','2d58ae67534b42e52e34c6b2a275fcb30a878008','14836de42a7fb86b75fef03f08823f90d389b7f3','8ced679aed45a123b97a574f24fba909b65f94dd','932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4','c863d867f843bd66c5303db1634931a36afd3ea9','2221f89de75008a31506b22756a5499bc6bda9bd','7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45','47b9eaef1b5aad0e3963a8d415236fed12702d65','decb4ad6eac317f262b4b87c86b33d2d9d700e75','ffcb1856faa7e09cc892c0f5a4d3353716830784','a259db8ee062d858027148f92811ba0f5796e4b9','bf369032d1e6ebb52ab133e4c4b8c2e872349843','73b97cd984a62703ec54ec4a876ec32aa5fd3b8c','2db9616ed62fc2a26056f3395459869cf556974d','b59aa1c714892618eaccd51696658887fcbd2045','98818e7fda2506603bd208662613edb40297c2d3','e0c43080cf61c0696031bdb097bea4f2a647cfc2','f7753d80a422c40b5fa04d99e52d8ae83369757a','7cbd584aef9508a90c98f80040078149a92ec869','e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa','4fb9b13eeb5d8a201884c572764a70477822f2d4','7ec82c93064966931ce76618a0cce4f275aafdaf','a8fb1cffc8683f0c47fdf9963e0d52c627343ff0','8dc47e70b94f2bea514ceaa51153ec1beeeda7ef','571719c0f9e1dae32ef993917b02c57f698be3d9','7f3afa5785d4b7ea37f8bae17226528f2a30e818','37918d1876724d3a8980920cf4cf2cbef2c3ac06','5da4e202a8962cacf567ce864873ddbff73f8217','4ca566310edc49450571677e8ef195883919ec2f','8a559c045c3a880e555d31de4dd3aa0b06930b73','3067a820b0195f9c08b8d0fe1dd7f8d800e10779','e1011849d36ebf9d1577c53d940a75c462dcb1e7','c9938e14b139e9c2af300bacd38f2f3cfca3fe58','0582a2e2c0eb00e0ba60b280187006c5e7de6991','478db7eafb3ac4a6abb8dbe083664c8d3ada35d8','c6abe422542794d7e8196d73283e562c309fe2e3','9fd0577023d0eb3662569333f5f231090439a217','54033c6b90b549fabfc15ad346ce9b985fa45fdc','0c917166dc089cb23a100af2f07cbf95f164533a','60f3ef7971b3259c3d800da672d886b2db778276','341bdf232d96b774988ee3163c953f2581752335','84570bfd25f23f0f40e31ba0c6a08906a2676b6d','4dbef924230e654860aa288a28f6304a062b3faf','2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71','06e43760aeadae330ad5ba80c4b93952ba568b29','4e58f3f3c581dec50f939a660fd5b5828396dac4','693974a6cb0defd3e0b2d63b31d420f39c83d262','3e03ddf29af0af9c9ece091251f0c1c5e08a5e41','9a5211623fcdd9fc3ad2ea4addc608d7c2574b90','39f31f0fbfcc91157104d64ca081d4271bc7e838','86d793db69ce071e78a18c85f8345316f09e1790','182036d2ef28f86873aee09b15125c828179c1b4','2a818d5fd74c60ac2bb369fb2355b84edab31777','9f88d21c8b77696f7238064a4ee87931cc16a03f','1d00919bf0b2493dfee7422a24acee9026de5fff','0c48a9e7584ede9d13d606057202883c5cff3eab',];
       var tests = {
-          "e070301fb578bd639ecbc7ec720fa60222d05826":[async_test('html5lib_tests2.html e070301fb578bd639ecbc7ec720fa60222d05826'), "%3C%21DOCTYPE%20html%3ETest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22Test%22"],"aaf24dabcb42470e447d241a40def0d136c12b93":[async_test('html5lib_tests2.html aaf24dabcb42470e447d241a40def0d136c12b93'), "%3Ctextarea%3Etest%3C/div%3Etest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctextarea%3E%0A%7C%20%20%20%20%20%20%20%22test%3C/div%3Etest%22"],"b6c1142484570bb90c36e454ee193cca17bb618a":[async_test('html5lib_tests2.html b6c1142484570bb90c36e454ee193cca17bb618a'), "%3Ctable%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"1977644a94de1a04245dfef3f3db69c7ac41aa6f":[async_test('html5lib_tests2.html 1977644a94de1a04245dfef3f3db69c7ac41aa6f'), "%3Ctable%3E%3Ctd%3Etest%3C/tbody%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3":[async_test('html5lib_tests2.html fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3'), "%3Cframe%3Etest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22test%22"],"d662798ca6dd95a205069658396d0f3d78237233":[async_test('html5lib_tests2.html d662798ca6dd95a205069658396d0f3d78237233'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3Etest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E"],"1ec72d53c4c68f9ca56f037ec53a7dc261886131":[async_test('html5lib_tests2.html 1ec72d53c4c68f9ca56f037ec53a7dc261886131'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%20te%20st", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E%0A%7C%20%20%20%20%20%22%20%20%22"],"2d58ae67534b42e52e34c6b2a275fcb30a878008":[async_test('html5lib_tests2.html 2d58ae67534b42e52e34c6b2a275fcb30a878008'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%3C/frameset%3E%20te%20st", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E%0A%7C%20%20%20%22%20%20%22"],"14836de42a7fb86b75fef03f08823f90d389b7f3":[async_test('html5lib_tests2.html 14836de42a7fb86b75fef03f08823f90d389b7f3'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%3C%21DOCTYPE%20html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E"],"8ced679aed45a123b97a574f24fba909b65f94dd":[async_test('html5lib_tests2.html 8ced679aed45a123b97a574f24fba909b65f94dd'), "%3C%21DOCTYPE%20html%3E%3Cfont%3E%3Cp%3E%3Cb%3Etest%3C/font%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4":[async_test('html5lib_tests2.html 932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4'), "%3C%21DOCTYPE%20html%3E%3Cdt%3E%3Cdiv%3E%3Cdd%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdt%3E%0A%7C%20%20%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%3Cdd%3E"],"c863d867f843bd66c5303db1634931a36afd3ea9":[async_test('html5lib_tests2.html c863d867f843bd66c5303db1634931a36afd3ea9'), "%3Cscript%3E%3C/x", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%22%3C/x%22%0A%7C%20%20%20%3Cbody%3E"],"2221f89de75008a31506b22756a5499bc6bda9bd":[async_test('html5lib_tests2.html 2221f89de75008a31506b22756a5499bc6bda9bd'), "%3Ctable%3E%3Cplaintext%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cplaintext%3E%0A%7C%20%20%20%20%20%20%20%22%3Ctd%3E%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45":[async_test('html5lib_tests2.html 7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45'), "%3Cplaintext%3E%3C/plaintext%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cplaintext%3E%0A%7C%20%20%20%20%20%20%20%22%3C/plaintext%3E%22"],"47b9eaef1b5aad0e3963a8d415236fed12702d65":[async_test('html5lib_tests2.html 47b9eaef1b5aad0e3963a8d415236fed12702d65'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ctr%3ETEST", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22TEST%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"decb4ad6eac317f262b4b87c86b33d2d9d700e75":[async_test('html5lib_tests2.html decb4ad6eac317f262b4b87c86b33d2d9d700e75'), "%3C%21DOCTYPE%20html%3E%3Cbody%20t1%3D1%3E%3Cbody%20t2%3D2%3E%3Cbody%20t3%3D3%20t4%3D4%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20t1%3D%221%22%0A%7C%20%20%20%20%20t2%3D%222%22%0A%7C%20%20%20%20%20t3%3D%223%22%0A%7C%20%20%20%20%20t4%3D%224%22"],"ffcb1856faa7e09cc892c0f5a4d3353716830784":[async_test('html5lib_tests2.html ffcb1856faa7e09cc892c0f5a4d3353716830784'), "%3C/b%20test", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"a259db8ee062d858027148f92811ba0f5796e4b9":[async_test('html5lib_tests2.html a259db8ee062d858027148f92811ba0f5796e4b9'), "%3C%21DOCTYPE%20html%3E%3C/b%20test%3Cb%20%26%3D%26amp%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"bf369032d1e6ebb52ab133e4c4b8c2e872349843":[async_test('html5lib_tests2.html bf369032d1e6ebb52ab133e4c4b8c2e872349843'), "%3C%21doctypehtml%3E%3CscrIPt%20type%3Dtext/x-foobar%3Bbaz%3EX%3C/SCRipt", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20type%3D%22text/x-foobar%3Bbaz%22%0A%7C%20%20%20%20%20%20%20%22X%3C/SCRipt%22%0A%7C%20%20%20%3Cbody%3E"],"73b97cd984a62703ec54ec4a876ec32aa5fd3b8c":[async_test('html5lib_tests2.html 73b97cd984a62703ec54ec4a876ec32aa5fd3b8c'), "%26", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%22"],"2db9616ed62fc2a26056f3395459869cf556974d":[async_test('html5lib_tests2.html 2db9616ed62fc2a26056f3395459869cf556974d'), "%26%23", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23%22"],"b59aa1c714892618eaccd51696658887fcbd2045":[async_test('html5lib_tests2.html b59aa1c714892618eaccd51696658887fcbd2045'), "%26%23X", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23X%22"],"98818e7fda2506603bd208662613edb40297c2d3":[async_test('html5lib_tests2.html 98818e7fda2506603bd208662613edb40297c2d3'), "%26%23x", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23x%22"],"e0c43080cf61c0696031bdb097bea4f2a647cfc2":[async_test('html5lib_tests2.html e0c43080cf61c0696031bdb097bea4f2a647cfc2'), "%26%2345", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22-%22"],"f7753d80a422c40b5fa04d99e52d8ae83369757a":[async_test('html5lib_tests2.html f7753d80a422c40b5fa04d99e52d8ae83369757a'), "%26x-test", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26x-test%22"],"7cbd584aef9508a90c98f80040078149a92ec869":[async_test('html5lib_tests2.html 7cbd584aef9508a90c98f80040078149a92ec869'), "%3C%21doctypehtml%3E%3Cp%3E%3Cli%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cli%3E"],"e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa":[async_test('html5lib_tests2.html e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa'), "%3C%21doctypehtml%3E%3Cp%3E%3Cdt%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cdt%3E"],"4fb9b13eeb5d8a201884c572764a70477822f2d4":[async_test('html5lib_tests2.html 4fb9b13eeb5d8a201884c572764a70477822f2d4'), "%3C%21doctypehtml%3E%3Cp%3E%3Cdd%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cdd%3E"],"7ec82c93064966931ce76618a0cce4f275aafdaf":[async_test('html5lib_tests2.html 7ec82c93064966931ce76618a0cce4f275aafdaf'), "%3C%21doctypehtml%3E%3Cp%3E%3Cform%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cform%3E"],"a8fb1cffc8683f0c47fdf9963e0d52c627343ff0":[async_test('html5lib_tests2.html a8fb1cffc8683f0c47fdf9963e0d52c627343ff0'), "%3C%21DOCTYPE%20html%3E%3Cp%3E%3C/P%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%22X%22"],"8dc47e70b94f2bea514ceaa51153ec1beeeda7ef":[async_test('html5lib_tests2.html 8dc47e70b94f2bea514ceaa51153ec1beeeda7ef'), "%26AMP", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%22"],"571719c0f9e1dae32ef993917b02c57f698be3d9":[async_test('html5lib_tests2.html 571719c0f9e1dae32ef993917b02c57f698be3d9'), "%26AMp%3B", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26AMp%3B%22"],"7f3afa5785d4b7ea37f8bae17226528f2a30e818":[async_test('html5lib_tests2.html 7f3afa5785d4b7ea37f8bae17226528f2a30e818'), "%3C%21DOCTYPE%20html%3E%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody%3E%3CthisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cthisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly%3E"],"37918d1876724d3a8980920cf4cf2cbef2c3ac06":[async_test('html5lib_tests2.html 37918d1876724d3a8980920cf4cf2cbef2c3ac06'), "%3C%21DOCTYPE%20html%3EX%3C/body%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22XX%22"],"5da4e202a8962cacf567ce864873ddbff73f8217":[async_test('html5lib_tests2.html 5da4e202a8962cacf567ce864873ddbff73f8217'), "%3C%21DOCTYPE%20html%3E%3C%21--%20X", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20X%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"4ca566310edc49450571677e8ef195883919ec2f":[async_test('html5lib_tests2.html 4ca566310edc49450571677e8ef195883919ec2f'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ccaption%3Etest%20TEST%3C/caption%3E%3Ctd%3Etest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccaption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22test%20TEST%22%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"8a559c045c3a880e555d31de4dd3aa0b06930b73":[async_test('html5lib_tests2.html 8a559c045c3a880e555d31de4dd3aa0b06930b73'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coption%3E%3Coptgroup%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"3067a820b0195f9c08b8d0fe1dd7f8d800e10779":[async_test('html5lib_tests2.html 3067a820b0195f9c08b8d0fe1dd7f8d800e10779'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3Coption%3E%3C/optgroup%3E%3Coption%3E%3Cselect%3E%3Coption%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%3Coption%3E"],"e1011849d36ebf9d1577c53d940a75c462dcb1e7":[async_test('html5lib_tests2.html e1011849d36ebf9d1577c53d940a75c462dcb1e7'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3Coption%3E%3Coptgroup%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"c9938e14b139e9c2af300bacd38f2f3cfca3fe58":[async_test('html5lib_tests2.html c9938e14b139e9c2af300bacd38f2f3cfca3fe58'), "%3C%21DOCTYPE%20html%3E%3Cdatalist%3E%3Coption%3Efoo%3C/datalist%3Ebar", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdatalist%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22foo%22%0A%7C%20%20%20%20%20%22bar%22"],"0582a2e2c0eb00e0ba60b280187006c5e7de6991":[async_test('html5lib_tests2.html 0582a2e2c0eb00e0ba60b280187006c5e7de6991'), "%3C%21DOCTYPE%20html%3E%3Cfont%3E%3Cinput%3E%3Cinput%3E%3C/font%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E"],"478db7eafb3ac4a6abb8dbe083664c8d3ada35d8":[async_test('html5lib_tests2.html 478db7eafb3ac4a6abb8dbe083664c8d3ada35d8'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX%20--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"c6abe422542794d7e8196d73283e562c309fe2e3":[async_test('html5lib_tests2.html c6abe422542794d7e8196d73283e562c309fe2e3'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9fd0577023d0eb3662569333f5f231090439a217":[async_test('html5lib_tests2.html 9fd0577023d0eb3662569333f5f231090439a217'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX%20-%20XXX%20--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20-%20XXX%20%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"0c917166dc089cb23a100af2f07cbf95f164533a":[async_test('html5lib_tests2.html 0c917166dc089cb23a100af2f07cbf95f164533a'), "test%0Atest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22test%0Atest%22"],"60f3ef7971b3259c3d800da672d886b2db778276":[async_test('html5lib_tests2.html 60f3ef7971b3259c3d800da672d886b2db778276'), "%3C%21DOCTYPE%20html%3E%3Cbody%3E%3Ctitle%3Etest%3C/body%3E%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22test%3C/body%3E%22"],"341bdf232d96b774988ee3163c953f2581752335":[async_test('html5lib_tests2.html 341bdf232d96b774988ee3163c953f2581752335'), "%3C%21DOCTYPE%20html%3E%3Cbody%3E%3Ctitle%3EX%3C/title%3E%3Cmeta%20name%3Dz%3E%3Clink%20rel%3Dfoo%3E%3Cstyle%3E%0Ax%20%7B%20content%3A%22%3C/style%22%20%7D%20%3C/style%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%20%20name%3D%22z%22%0A%7C%20%20%20%20%20%3Clink%3E%0A%7C%20%20%20%20%20%20%20rel%3D%22foo%22%0A%7C%20%20%20%20%20%3Cstyle%3E%0A%7C%20%20%20%20%20%20%20%22%0Ax%20%7B%20content%3A%22%3C/style%22%20%7D%20%22"],"84570bfd25f23f0f40e31ba0c6a08906a2676b6d":[async_test('html5lib_tests2.html 84570bfd25f23f0f40e31ba0c6a08906a2676b6d'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3C/optgroup%3E%3C/select%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"4dbef924230e654860aa288a28f6304a062b3faf":[async_test('html5lib_tests2.html 4dbef924230e654860aa288a28f6304a062b3faf'), "%20%0A%20", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71":[async_test('html5lib_tests2.html 2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71'), "%3C%21DOCTYPE%20html%3E%20%20%3Chtml%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"06e43760aeadae330ad5ba80c4b93952ba568b29":[async_test('html5lib_tests2.html 06e43760aeadae330ad5ba80c4b93952ba568b29'), "%3C%21DOCTYPE%20html%3E%3Cscript%3E%0A%3C/script%3E%20%20%3Ctitle%3Ex%3C/title%3E%20%20%3C/head%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%22%0A%22%0A%7C%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22x%22%0A%7C%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%3Cbody%3E"],"4e58f3f3c581dec50f939a660fd5b5828396dac4":[async_test('html5lib_tests2.html 4e58f3f3c581dec50f939a660fd5b5828396dac4'), "%3C%21DOCTYPE%20html%3E%3Chtml%3E%3Cbody%3E%3Chtml%20id%3Dx%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"693974a6cb0defd3e0b2d63b31d420f39c83d262":[async_test('html5lib_tests2.html 693974a6cb0defd3e0b2d63b31d420f39c83d262'), "%3C%21DOCTYPE%20html%3EX%3C/body%3E%3Chtml%20id%3D%22x%22%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"3e03ddf29af0af9c9ece091251f0c1c5e08a5e41":[async_test('html5lib_tests2.html 3e03ddf29af0af9c9ece091251f0c1c5e08a5e41'), "%3C%21DOCTYPE%20html%3E%3Chead%3E%3Chtml%20id%3Dx%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9a5211623fcdd9fc3ad2ea4addc608d7c2574b90":[async_test('html5lib_tests2.html 9a5211623fcdd9fc3ad2ea4addc608d7c2574b90'), "%3C%21DOCTYPE%20html%3EX%3C/html%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22XX%22"],"39f31f0fbfcc91157104d64ca081d4271bc7e838":[async_test('html5lib_tests2.html 39f31f0fbfcc91157104d64ca081d4271bc7e838'), "%3C%21DOCTYPE%20html%3EX%3C/html%3E%20", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%20%22"],"86d793db69ce071e78a18c85f8345316f09e1790":[async_test('html5lib_tests2.html 86d793db69ce071e78a18c85f8345316f09e1790'), "%3C%21DOCTYPE%20html%3EX%3C/html%3E%3Cp%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"182036d2ef28f86873aee09b15125c828179c1b4":[async_test('html5lib_tests2.html 182036d2ef28f86873aee09b15125c828179c1b4'), "%3C%21DOCTYPE%20html%3EX%3Cp/x/y/z%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20x%3D%22%22%0A%7C%20%20%20%20%20%20%20y%3D%22%22%0A%7C%20%20%20%20%20%20%20z%3D%22%22"],"2a818d5fd74c60ac2bb369fb2355b84edab31777":[async_test('html5lib_tests2.html 2a818d5fd74c60ac2bb369fb2355b84edab31777'), "%3C%21DOCTYPE%20html%3E%3C%21--x--", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20x%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9f88d21c8b77696f7238064a4ee87931cc16a03f":[async_test('html5lib_tests2.html 9f88d21c8b77696f7238064a4ee87931cc16a03f'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ctr%3E%3Ctd%3E%3C/p%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cp%3E"],"1d00919bf0b2493dfee7422a24acee9026de5fff":[async_test('html5lib_tests2.html 1d00919bf0b2493dfee7422a24acee9026de5fff'), "%3C%21DOCTYPE%20%3C%21DOCTYPE%20HTML%3E%3E%3C%21--%3C%21--x--%3E--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20%3C%21doctype%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%3E%22%0A%7C%20%20%20%20%20%3C%21--%20%3C%21--x%20--%3E%0A%7C%20%20%20%20%20%22--%3E%22"],"0c48a9e7584ede9d13d606057202883c5cff3eab":[async_test('html5lib_tests2.html 0c48a9e7584ede9d13d606057202883c5cff3eab'), "%3C%21doctype%20html%3E%3Cdiv%3E%3Cform%3E%3C/form%3E%3Cdiv%3E%3C/div%3E%3C/div%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Cform%3E%0A%7C%20%20%20%20%20%20%20%3Cdiv%3E"],
+          "e070301fb578bd639ecbc7ec720fa60222d05826":[async_test('html5lib_tests2.html e070301fb578bd639ecbc7ec720fa60222d05826'), "%3C%21DOCTYPE%20html%3ETest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22Test%22"],"aaf24dabcb42470e447d241a40def0d136c12b93":[async_test('html5lib_tests2.html aaf24dabcb42470e447d241a40def0d136c12b93'), "%3Ctextarea%3Etest%3C/div%3Etest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctextarea%3E%0A%7C%20%20%20%20%20%20%20%22test%3C/div%3Etest%22"],"b6c1142484570bb90c36e454ee193cca17bb618a":[async_test('html5lib_tests2.html b6c1142484570bb90c36e454ee193cca17bb618a'), "%3Ctable%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E"],"1977644a94de1a04245dfef3f3db69c7ac41aa6f":[async_test('html5lib_tests2.html 1977644a94de1a04245dfef3f3db69c7ac41aa6f'), "%3Ctable%3E%3Ctd%3Etest%3C/tbody%3E%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3":[async_test('html5lib_tests2.html fb0d7207ed9fbc3fe5d1e0f85ad18c247dfb05a3'), "%3Cframe%3Etest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22test%22"],"d662798ca6dd95a205069658396d0f3d78237233":[async_test('html5lib_tests2.html d662798ca6dd95a205069658396d0f3d78237233'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3Etest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E"],"1ec72d53c4c68f9ca56f037ec53a7dc261886131":[async_test('html5lib_tests2.html 1ec72d53c4c68f9ca56f037ec53a7dc261886131'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%20te%20st", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E%0A%7C%20%20%20%20%20%22%20%20%22"],"2d58ae67534b42e52e34c6b2a275fcb30a878008":[async_test('html5lib_tests2.html 2d58ae67534b42e52e34c6b2a275fcb30a878008'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%3C/frameset%3E%20te%20st", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E%0A%7C%20%20%20%22%20%20%22"],"14836de42a7fb86b75fef03f08823f90d389b7f3":[async_test('html5lib_tests2.html 14836de42a7fb86b75fef03f08823f90d389b7f3'), "%3C%21DOCTYPE%20html%3E%3Cframeset%3E%3C%21DOCTYPE%20html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cframeset%3E"],"8ced679aed45a123b97a574f24fba909b65f94dd":[async_test('html5lib_tests2.html 8ced679aed45a123b97a574f24fba909b65f94dd'), "%3C%21DOCTYPE%20html%3E%3Cfont%3E%3Cp%3E%3Cb%3Etest%3C/font%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4":[async_test('html5lib_tests2.html 932ff3ff2c75f7b28ef562dfa9c7cb208f0712d4'), "%3C%21DOCTYPE%20html%3E%3Cdt%3E%3Cdiv%3E%3Cdd%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdt%3E%0A%7C%20%20%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%3Cdd%3E"],"c863d867f843bd66c5303db1634931a36afd3ea9":[async_test('html5lib_tests2.html c863d867f843bd66c5303db1634931a36afd3ea9'), "%3Cscript%3E%3C/x", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%22%3C/x%22%0A%7C%20%20%20%3Cbody%3E"],"2221f89de75008a31506b22756a5499bc6bda9bd":[async_test('html5lib_tests2.html 2221f89de75008a31506b22756a5499bc6bda9bd'), "%3Ctable%3E%3Cplaintext%3E%3Ctd%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cplaintext%3E%0A%7C%20%20%20%20%20%20%20%22%3Ctd%3E%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45":[async_test('html5lib_tests2.html 7471f6a45872ac6d70f69fc3f4e10b13c7c1ac45'), "%3Cplaintext%3E%3C/plaintext%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cplaintext%3E%0A%7C%20%20%20%20%20%20%20%22%3C/plaintext%3E%22"],"47b9eaef1b5aad0e3963a8d415236fed12702d65":[async_test('html5lib_tests2.html 47b9eaef1b5aad0e3963a8d415236fed12702d65'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ctr%3ETEST", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22TEST%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"decb4ad6eac317f262b4b87c86b33d2d9d700e75":[async_test('html5lib_tests2.html decb4ad6eac317f262b4b87c86b33d2d9d700e75'), "%3C%21DOCTYPE%20html%3E%3Cbody%20t1%3D1%3E%3Cbody%20t2%3D2%3E%3Cbody%20t3%3D3%20t4%3D4%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20t1%3D%221%22%0A%7C%20%20%20%20%20t2%3D%222%22%0A%7C%20%20%20%20%20t3%3D%223%22%0A%7C%20%20%20%20%20t4%3D%224%22"],"ffcb1856faa7e09cc892c0f5a4d3353716830784":[async_test('html5lib_tests2.html ffcb1856faa7e09cc892c0f5a4d3353716830784'), "%3C/b%20test", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"a259db8ee062d858027148f92811ba0f5796e4b9":[async_test('html5lib_tests2.html a259db8ee062d858027148f92811ba0f5796e4b9'), "%3C%21DOCTYPE%20html%3E%3C/b%20test%3Cb%20%26%3D%26amp%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"bf369032d1e6ebb52ab133e4c4b8c2e872349843":[async_test('html5lib_tests2.html bf369032d1e6ebb52ab133e4c4b8c2e872349843'), "%3C%21doctypehtml%3E%3CscrIPt%20type%3Dtext/x-foobar%3Bbaz%3EX%3C/SCRipt", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20type%3D%22text/x-foobar%3Bbaz%22%0A%7C%20%20%20%20%20%20%20%22X%3C/SCRipt%22%0A%7C%20%20%20%3Cbody%3E"],"73b97cd984a62703ec54ec4a876ec32aa5fd3b8c":[async_test('html5lib_tests2.html 73b97cd984a62703ec54ec4a876ec32aa5fd3b8c'), "%26", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%22"],"2db9616ed62fc2a26056f3395459869cf556974d":[async_test('html5lib_tests2.html 2db9616ed62fc2a26056f3395459869cf556974d'), "%26%23", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23%22"],"b59aa1c714892618eaccd51696658887fcbd2045":[async_test('html5lib_tests2.html b59aa1c714892618eaccd51696658887fcbd2045'), "%26%23X", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23X%22"],"98818e7fda2506603bd208662613edb40297c2d3":[async_test('html5lib_tests2.html 98818e7fda2506603bd208662613edb40297c2d3'), "%26%23x", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%23x%22"],"e0c43080cf61c0696031bdb097bea4f2a647cfc2":[async_test('html5lib_tests2.html e0c43080cf61c0696031bdb097bea4f2a647cfc2'), "%26%2345", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22-%22"],"f7753d80a422c40b5fa04d99e52d8ae83369757a":[async_test('html5lib_tests2.html f7753d80a422c40b5fa04d99e52d8ae83369757a'), "%26x-test", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26x-test%22"],"7cbd584aef9508a90c98f80040078149a92ec869":[async_test('html5lib_tests2.html 7cbd584aef9508a90c98f80040078149a92ec869'), "%3C%21doctypehtml%3E%3Cp%3E%3Cli%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cli%3E"],"e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa":[async_test('html5lib_tests2.html e0f7f130b1e3653dd06f10f3492e4f0bf4cd3cfa'), "%3C%21doctypehtml%3E%3Cp%3E%3Cdt%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cdt%3E"],"4fb9b13eeb5d8a201884c572764a70477822f2d4":[async_test('html5lib_tests2.html 4fb9b13eeb5d8a201884c572764a70477822f2d4'), "%3C%21doctypehtml%3E%3Cp%3E%3Cdd%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cdd%3E"],"7ec82c93064966931ce76618a0cce4f275aafdaf":[async_test('html5lib_tests2.html 7ec82c93064966931ce76618a0cce4f275aafdaf'), "%3C%21doctypehtml%3E%3Cp%3E%3Cform%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%3Cform%3E"],"a8fb1cffc8683f0c47fdf9963e0d52c627343ff0":[async_test('html5lib_tests2.html a8fb1cffc8683f0c47fdf9963e0d52c627343ff0'), "%3C%21DOCTYPE%20html%3E%3Cp%3E%3C/P%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%22X%22"],"8dc47e70b94f2bea514ceaa51153ec1beeeda7ef":[async_test('html5lib_tests2.html 8dc47e70b94f2bea514ceaa51153ec1beeeda7ef'), "%26AMP", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26%22"],"571719c0f9e1dae32ef993917b02c57f698be3d9":[async_test('html5lib_tests2.html 571719c0f9e1dae32ef993917b02c57f698be3d9'), "%26AMp%3B", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%26AMp%3B%22"],"7f3afa5785d4b7ea37f8bae17226528f2a30e818":[async_test('html5lib_tests2.html 7f3afa5785d4b7ea37f8bae17226528f2a30e818'), "%3C%21DOCTYPE%20html%3E%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody%3E%3CthisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cthisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly%3E"],"37918d1876724d3a8980920cf4cf2cbef2c3ac06":[async_test('html5lib_tests2.html 37918d1876724d3a8980920cf4cf2cbef2c3ac06'), "%3C%21DOCTYPE%20html%3EX%3C/body%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22XX%22"],"5da4e202a8962cacf567ce864873ddbff73f8217":[async_test('html5lib_tests2.html 5da4e202a8962cacf567ce864873ddbff73f8217'), "%3C%21DOCTYPE%20html%3E%3C%21--%20X", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20X%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"4ca566310edc49450571677e8ef195883919ec2f":[async_test('html5lib_tests2.html 4ca566310edc49450571677e8ef195883919ec2f'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ccaption%3Etest%20TEST%3C/caption%3E%3Ctd%3Etest", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ccaption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22test%20TEST%22%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22test%22"],"8a559c045c3a880e555d31de4dd3aa0b06930b73":[async_test('html5lib_tests2.html 8a559c045c3a880e555d31de4dd3aa0b06930b73'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coption%3E%3Coptgroup%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"3067a820b0195f9c08b8d0fe1dd7f8d800e10779":[async_test('html5lib_tests2.html 3067a820b0195f9c08b8d0fe1dd7f8d800e10779'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3Coption%3E%3C/optgroup%3E%3Coption%3E%3Cselect%3E%3Coption%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%3Coption%3E"],"e1011849d36ebf9d1577c53d940a75c462dcb1e7":[async_test('html5lib_tests2.html e1011849d36ebf9d1577c53d940a75c462dcb1e7'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3Coption%3E%3Coptgroup%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"c9938e14b139e9c2af300bacd38f2f3cfca3fe58":[async_test('html5lib_tests2.html c9938e14b139e9c2af300bacd38f2f3cfca3fe58'), "%3C%21DOCTYPE%20html%3E%3Cdatalist%3E%3Coption%3Efoo%3C/datalist%3Ebar", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdatalist%3E%0A%7C%20%20%20%20%20%20%20%3Coption%3E%0A%7C%20%20%20%20%20%20%20%20%20%22foo%22%0A%7C%20%20%20%20%20%22bar%22"],"0582a2e2c0eb00e0ba60b280187006c5e7de6991":[async_test('html5lib_tests2.html 0582a2e2c0eb00e0ba60b280187006c5e7de6991'), "%3C%21DOCTYPE%20html%3E%3Cfont%3E%3Cinput%3E%3Cinput%3E%3C/font%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cfont%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E"],"478db7eafb3ac4a6abb8dbe083664c8d3ada35d8":[async_test('html5lib_tests2.html 478db7eafb3ac4a6abb8dbe083664c8d3ada35d8'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX%20--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"c6abe422542794d7e8196d73283e562c309fe2e3":[async_test('html5lib_tests2.html c6abe422542794d7e8196d73283e562c309fe2e3'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9fd0577023d0eb3662569333f5f231090439a217":[async_test('html5lib_tests2.html 9fd0577023d0eb3662569333f5f231090439a217'), "%3C%21DOCTYPE%20html%3E%3C%21--%20XXX%20-%20XXX%20-%20XXX%20--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20%20XXX%20-%20XXX%20-%20XXX%20%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"54033c6b90b549fabfc15ad346ce9b985fa45fdc":[async_test('html5lib_tests2.html 54033c6b90b549fabfc15ad346ce9b985fa45fdc'), "%3C%21DOCTYPE%20html%3E%20%3C%21DOCTYPE%20html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"0c917166dc089cb23a100af2f07cbf95f164533a":[async_test('html5lib_tests2.html 0c917166dc089cb23a100af2f07cbf95f164533a'), "test%0Atest", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22test%0Atest%22"],"60f3ef7971b3259c3d800da672d886b2db778276":[async_test('html5lib_tests2.html 60f3ef7971b3259c3d800da672d886b2db778276'), "%3C%21DOCTYPE%20html%3E%3Cbody%3E%3Ctitle%3Etest%3C/body%3E%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22test%3C/body%3E%22"],"341bdf232d96b774988ee3163c953f2581752335":[async_test('html5lib_tests2.html 341bdf232d96b774988ee3163c953f2581752335'), "%3C%21DOCTYPE%20html%3E%3Cbody%3E%3Ctitle%3EX%3C/title%3E%3Cmeta%20name%3Dz%3E%3Clink%20rel%3Dfoo%3E%3Cstyle%3E%0Ax%20%7B%20content%3A%22%3C/style%22%20%7D%20%3C/style%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%20%20name%3D%22z%22%0A%7C%20%20%20%20%20%3Clink%3E%0A%7C%20%20%20%20%20%20%20rel%3D%22foo%22%0A%7C%20%20%20%20%20%3Cstyle%3E%0A%7C%20%20%20%20%20%20%20%22%0Ax%20%7B%20content%3A%22%3C/style%22%20%7D%20%22"],"84570bfd25f23f0f40e31ba0c6a08906a2676b6d":[async_test('html5lib_tests2.html 84570bfd25f23f0f40e31ba0c6a08906a2676b6d'), "%3C%21DOCTYPE%20html%3E%3Cselect%3E%3Coptgroup%3E%3C/optgroup%3E%3C/select%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%3Coptgroup%3E"],"4dbef924230e654860aa288a28f6304a062b3faf":[async_test('html5lib_tests2.html 4dbef924230e654860aa288a28f6304a062b3faf'), "%20%0A%20", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71":[async_test('html5lib_tests2.html 2e8a5d6aa8cb0011b6caa08a44cd8871e4b15b71'), "%3C%21DOCTYPE%20html%3E%20%20%3Chtml%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"06e43760aeadae330ad5ba80c4b93952ba568b29":[async_test('html5lib_tests2.html 06e43760aeadae330ad5ba80c4b93952ba568b29'), "%3C%21DOCTYPE%20html%3E%3Cscript%3E%0A%3C/script%3E%20%20%3Ctitle%3Ex%3C/title%3E%20%20%3C/head%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%22%0A%22%0A%7C%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22x%22%0A%7C%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%3Cbody%3E"],"4e58f3f3c581dec50f939a660fd5b5828396dac4":[async_test('html5lib_tests2.html 4e58f3f3c581dec50f939a660fd5b5828396dac4'), "%3C%21DOCTYPE%20html%3E%3Chtml%3E%3Cbody%3E%3Chtml%20id%3Dx%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"693974a6cb0defd3e0b2d63b31d420f39c83d262":[async_test('html5lib_tests2.html 693974a6cb0defd3e0b2d63b31d420f39c83d262'), "%3C%21DOCTYPE%20html%3EX%3C/body%3E%3Chtml%20id%3D%22x%22%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"3e03ddf29af0af9c9ece091251f0c1c5e08a5e41":[async_test('html5lib_tests2.html 3e03ddf29af0af9c9ece091251f0c1c5e08a5e41'), "%3C%21DOCTYPE%20html%3E%3Chead%3E%3Chtml%20id%3Dx%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20id%3D%22x%22%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9a5211623fcdd9fc3ad2ea4addc608d7c2574b90":[async_test('html5lib_tests2.html 9a5211623fcdd9fc3ad2ea4addc608d7c2574b90'), "%3C%21DOCTYPE%20html%3EX%3C/html%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22XX%22"],"39f31f0fbfcc91157104d64ca081d4271bc7e838":[async_test('html5lib_tests2.html 39f31f0fbfcc91157104d64ca081d4271bc7e838'), "%3C%21DOCTYPE%20html%3EX%3C/html%3E%20", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%20%22"],"86d793db69ce071e78a18c85f8345316f09e1790":[async_test('html5lib_tests2.html 86d793db69ce071e78a18c85f8345316f09e1790'), "%3C%21DOCTYPE%20html%3EX%3C/html%3E%3Cp%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"182036d2ef28f86873aee09b15125c828179c1b4":[async_test('html5lib_tests2.html 182036d2ef28f86873aee09b15125c828179c1b4'), "%3C%21DOCTYPE%20html%3EX%3Cp/x/y/z%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20x%3D%22%22%0A%7C%20%20%20%20%20%20%20y%3D%22%22%0A%7C%20%20%20%20%20%20%20z%3D%22%22"],"2a818d5fd74c60ac2bb369fb2355b84edab31777":[async_test('html5lib_tests2.html 2a818d5fd74c60ac2bb369fb2355b84edab31777'), "%3C%21DOCTYPE%20html%3E%3C%21--x--", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3C%21--%20x%20--%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"9f88d21c8b77696f7238064a4ee87931cc16a03f":[async_test('html5lib_tests2.html 9f88d21c8b77696f7238064a4ee87931cc16a03f'), "%3C%21DOCTYPE%20html%3E%3Ctable%3E%3Ctr%3E%3Ctd%3E%3C/p%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cp%3E"],"1d00919bf0b2493dfee7422a24acee9026de5fff":[async_test('html5lib_tests2.html 1d00919bf0b2493dfee7422a24acee9026de5fff'), "%3C%21DOCTYPE%20%3C%21DOCTYPE%20HTML%3E%3E%3C%21--%3C%21--x--%3E--%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20%3C%21doctype%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22%3E%22%0A%7C%20%20%20%20%20%3C%21--%20%3C%21--x%20--%3E%0A%7C%20%20%20%20%20%22--%3E%22"],"0c48a9e7584ede9d13d606057202883c5cff3eab":[async_test('html5lib_tests2.html 0c48a9e7584ede9d13d606057202883c5cff3eab'), "%3C%21doctype%20html%3E%3Cdiv%3E%3Cform%3E%3C/form%3E%3Cdiv%3E%3C/div%3E%3C/div%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Cform%3E%0A%7C%20%20%20%20%20%20%20%3Cdiv%3E"],
       }
       init_tests(get_type());
     </script>
diff --git a/tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html
index 47cff7d3fbb..80101866f7a 100644
--- a/tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html
+++ b/tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html
@@ -18,9 +18,9 @@
     <script src="/resources/testharnessreport.js"></script>
     <script>
       var num_iframes = 8;
-      var order = ['7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd','c0cffec1e999db2aefb2f6beb679fd9620566dbd','7c644a6da21bfd551385b0a5044b82cf7be0a22f','52fde917ba333b89afeff0e31104421455f4bf1b','a8f53ca779c0e5fc484771c4ec2aa6fb6d609779','e4ce65a5fb6a3726b341ec94da583dee7c2c8232','8779e761986b4c724bfe73fee95b7972145fb4d3','620e44a8a55e82cec0d51e9d93025d8a5c4456fc','37b910b755c2df155a3129d5a1150f0c0fdd7934','868bff3a23219b836fdc702063d637f817ce65e1','a33a56f5571b4bcb23138ffb60df3824f5c53773','facf5e60205451cf740f64628b8608f0aee30f3a','8ba11b54fa74a1c229d079b2902d6e33e139f33b','84e2152c284f4dfee7d8d12846c08b2c025578a6','8e3432411baa59cbef731ab3ba2703cb5d518453','e2f6144290512430ad25bbf9598eae77288c7b7a','350ebd648764d585f4aa0c29b925e6276579e9d0','9120ef80d3ee017007f3510121ddf7eba31b79e0','2026cd3ed42e41c168dd37c8c2675584f4eef335','ff2e324237e22efc8430ad7137d50d6d3d311820','02c9eb822611b0c206b544e0f2e5044695195ba8','cb3d1a50dd56a85135a0856cfa1c23a091ef2af4','13847685cfff75642823a0e78c6ef232ecb9d94b','99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e','7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba','17dcea170bb74d18ed4776dbb98f0bac6a11364d','9457c10c9f987bbc95937b34763fe956d61d237b','0fa23bb5d8b2a591afb1842b8f4c00c490c127b4','f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b','5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8',];
+      var order = ['7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd','c0cffec1e999db2aefb2f6beb679fd9620566dbd','7c644a6da21bfd551385b0a5044b82cf7be0a22f','52fde917ba333b89afeff0e31104421455f4bf1b','b017906f7e2732092551b16ecd1b98df0983abcc','625cdec7c7d867748ac3b5be04e3e801a8c51fa5','6e8dd947155d1db292a0c289b3056891d89edaf5','a8f53ca779c0e5fc484771c4ec2aa6fb6d609779','e4ce65a5fb6a3726b341ec94da583dee7c2c8232','8779e761986b4c724bfe73fee95b7972145fb4d3','620e44a8a55e82cec0d51e9d93025d8a5c4456fc','37b910b755c2df155a3129d5a1150f0c0fdd7934','868bff3a23219b836fdc702063d637f817ce65e1','a33a56f5571b4bcb23138ffb60df3824f5c53773','facf5e60205451cf740f64628b8608f0aee30f3a','8ba11b54fa74a1c229d079b2902d6e33e139f33b','84e2152c284f4dfee7d8d12846c08b2c025578a6','8e3432411baa59cbef731ab3ba2703cb5d518453','e2f6144290512430ad25bbf9598eae77288c7b7a','350ebd648764d585f4aa0c29b925e6276579e9d0','9120ef80d3ee017007f3510121ddf7eba31b79e0','2026cd3ed42e41c168dd37c8c2675584f4eef335','ff2e324237e22efc8430ad7137d50d6d3d311820','02c9eb822611b0c206b544e0f2e5044695195ba8','cb3d1a50dd56a85135a0856cfa1c23a091ef2af4','13847685cfff75642823a0e78c6ef232ecb9d94b','99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e','7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba','17dcea170bb74d18ed4776dbb98f0bac6a11364d','9457c10c9f987bbc95937b34763fe956d61d237b','0fa23bb5d8b2a591afb1842b8f4c00c490c127b4','f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b','5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8',];
       var tests = {
-          "7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd":[async_test('html5lib_tests7.html 7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd'), "%3C%21doctype%20html%3E%3Cbody%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"c0cffec1e999db2aefb2f6beb679fd9620566dbd":[async_test('html5lib_tests7.html c0cffec1e999db2aefb2f6beb679fd9620566dbd'), "%3C%21doctype%20html%3E%3Ctable%3E%3Ctitle%3EX%3C/title%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"7c644a6da21bfd551385b0a5044b82cf7be0a22f":[async_test('html5lib_tests7.html 7c644a6da21bfd551385b0a5044b82cf7be0a22f'), "%3C%21doctype%20html%3E%3Chead%3E%3C/head%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%3Cbody%3E"],"52fde917ba333b89afeff0e31104421455f4bf1b":[async_test('html5lib_tests7.html 52fde917ba333b89afeff0e31104421455f4bf1b'), "%3C%21doctype%20html%3E%3C/head%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%3Cbody%3E"],"a8f53ca779c0e5fc484771c4ec2aa6fb6d609779":[async_test('html5lib_tests7.html a8f53ca779c0e5fc484771c4ec2aa6fb6d609779'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cmeta%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"e4ce65a5fb6a3726b341ec94da583dee7c2c8232":[async_test('html5lib_tests7.html e4ce65a5fb6a3726b341ec94da583dee7c2c8232'), "%3C%21doctype%20html%3E%3Ctable%3EX%3Ctr%3E%3Ctd%3E%3Ctable%3E%20%3Cmeta%3E%3C/table%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22%20%22"],"8779e761986b4c724bfe73fee95b7972145fb4d3":[async_test('html5lib_tests7.html 8779e761986b4c724bfe73fee95b7972145fb4d3'), "%3C%21doctype%20html%3E%3Chtml%3E%20%3Chead%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"620e44a8a55e82cec0d51e9d93025d8a5c4456fc":[async_test('html5lib_tests7.html 620e44a8a55e82cec0d51e9d93025d8a5c4456fc'), "%3C%21doctype%20html%3E%20%3Chead%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"37b910b755c2df155a3129d5a1150f0c0fdd7934":[async_test('html5lib_tests7.html 37b910b755c2df155a3129d5a1150f0c0fdd7934'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cstyle%3E%20%3Ctr%3Ex%20%3C/style%3E%20%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cstyle%3E%0A%7C%20%20%20%20%20%20%20%20%20%22%20%3Ctr%3Ex%20%22%0A%7C%20%20%20%20%20%20%20%22%20%22"],"868bff3a23219b836fdc702063d637f817ce65e1":[async_test('html5lib_tests7.html 868bff3a23219b836fdc702063d637f817ce65e1'), "%3C%21doctype%20html%3E%3Ctable%3E%3CTBODY%3E%3Cscript%3E%20%3Ctr%3Ex%20%3C/script%3E%20%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22%20%3Ctr%3Ex%20%22%0A%7C%20%20%20%20%20%20%20%20%20%22%20%22"],"a33a56f5571b4bcb23138ffb60df3824f5c53773":[async_test('html5lib_tests7.html a33a56f5571b4bcb23138ffb60df3824f5c53773'), "%3C%21doctype%20html%3E%3Cp%3E%3Capplet%3E%3Cp%3EX%3C/p%3E%3C/applet%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Capplet%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22X%22"],"facf5e60205451cf740f64628b8608f0aee30f3a":[async_test('html5lib_tests7.html facf5e60205451cf740f64628b8608f0aee30f3a'), "%3C%21doctype%20html%3E%3Cp%3E%3Cobject%20type%3D%22application/x-non-existant-plugin%22%3E%3Cp%3EX%3C/p%3E%3C/object%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Cobject%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22application/x-non-existant-plugin%22%0A%7C%20%20%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22X%22"],"8ba11b54fa74a1c229d079b2902d6e33e139f33b":[async_test('html5lib_tests7.html 8ba11b54fa74a1c229d079b2902d6e33e139f33b'), "%3C%21doctype%20html%3E%3Clisting%3E%0AX%3C/listing%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Clisting%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"84e2152c284f4dfee7d8d12846c08b2c025578a6":[async_test('html5lib_tests7.html 84e2152c284f4dfee7d8d12846c08b2c025578a6'), "%3C%21doctype%20html%3E%3Cselect%3E%3Cinput%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%22X%22"],"8e3432411baa59cbef731ab3ba2703cb5d518453":[async_test('html5lib_tests7.html 8e3432411baa59cbef731ab3ba2703cb5d518453'), "%3C%21doctype%20html%3E%3Cselect%3E%3Cselect%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%22X%22"],"e2f6144290512430ad25bbf9598eae77288c7b7a":[async_test('html5lib_tests7.html e2f6144290512430ad25bbf9598eae77288c7b7a'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"350ebd648764d585f4aa0c29b925e6276579e9d0":[async_test('html5lib_tests7.html 350ebd648764d585f4aa0c29b925e6276579e9d0'), "%3C%21doctype%20html%3E%3Ctable%3EX%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"9120ef80d3ee017007f3510121ddf7eba31b79e0":[async_test('html5lib_tests7.html 9120ef80d3ee017007f3510121ddf7eba31b79e0'), "%3C%21doctype%20html%3E%3Ctable%3E%20%20%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"2026cd3ed42e41c168dd37c8c2675584f4eef335":[async_test('html5lib_tests7.html 2026cd3ed42e41c168dd37c8c2675584f4eef335'), "%3C%21doctype%20html%3E%3Ctable%3E%20%20%3Cinput%20type%3D%27hidDEN%27%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"ff2e324237e22efc8430ad7137d50d6d3d311820":[async_test('html5lib_tests7.html ff2e324237e22efc8430ad7137d50d6d3d311820'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cinput%20type%3D%22%20hidden%22%3E%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20type%3D%22%20hidden%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"02c9eb822611b0c206b544e0f2e5044695195ba8":[async_test('html5lib_tests7.html 02c9eb822611b0c206b544e0f2e5044695195ba8'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cselect%3EX%3Ctr%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"cb3d1a50dd56a85135a0856cfa1c23a091ef2af4":[async_test('html5lib_tests7.html cb3d1a50dd56a85135a0856cfa1c23a091ef2af4'), "%3C%21doctype%20html%3E%3Cselect%3EX%3C/select%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"13847685cfff75642823a0e78c6ef232ecb9d94b":[async_test('html5lib_tests7.html 13847685cfff75642823a0e78c6ef232ecb9d94b'), "%3C%21DOCTYPE%20hTmL%3E%3Chtml%3E%3C/html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e":[async_test('html5lib_tests7.html 99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e'), "%3C%21DOCTYPE%20HTML%3E%3Chtml%3E%3C/html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba":[async_test('html5lib_tests7.html 7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba'), "%3Cdiv%3E%3Cp%3Ea%3C/x%3E%20b", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%22a%20b%22"],"17dcea170bb74d18ed4776dbb98f0bac6a11364d":[async_test('html5lib_tests7.html 17dcea170bb74d18ed4776dbb98f0bac6a11364d'), "%3Ctable%3E%3Ctr%3E%3Ctd%3E%3Ccode%3E%3C/code%3E%20%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Ccode%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22%20%22"],"9457c10c9f987bbc95937b34763fe956d61d237b":[async_test('html5lib_tests7.html 9457c10c9f987bbc95937b34763fe956d61d237b'), "%3Ctable%3E%3Cb%3E%3Ctr%3E%3Ctd%3Eaaa%3C/td%3E%3C/tr%3Ebbb%3C/table%3Eccc", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%22bbb%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22aaa%22%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%22ccc%22"],"0fa23bb5d8b2a591afb1842b8f4c00c490c127b4":[async_test('html5lib_tests7.html 0fa23bb5d8b2a591afb1842b8f4c00c490c127b4'), "A%3Ctable%3E%3Ctr%3E%20B%3C/tr%3E%20B%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22A%20B%20B%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b":[async_test('html5lib_tests7.html f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b'), "A%3Ctable%3E%3Ctr%3E%20B%3C/tr%3E%20%3C/em%3EC%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22A%20BC%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%22%20%22"],"5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8":[async_test('html5lib_tests7.html 5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8'), "%3Cselect%3E%3Ckeygen%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ckeygen%3E"],
+          "7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd":[async_test('html5lib_tests7.html 7cb496e242a4dc9aed321252b5ca6ebf4f02ebcd'), "%3C%21doctype%20html%3E%3Cbody%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"c0cffec1e999db2aefb2f6beb679fd9620566dbd":[async_test('html5lib_tests7.html c0cffec1e999db2aefb2f6beb679fd9620566dbd'), "%3C%21doctype%20html%3E%3Ctable%3E%3Ctitle%3EX%3C/title%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E"],"7c644a6da21bfd551385b0a5044b82cf7be0a22f":[async_test('html5lib_tests7.html 7c644a6da21bfd551385b0a5044b82cf7be0a22f'), "%3C%21doctype%20html%3E%3Chead%3E%3C/head%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%3Cbody%3E"],"52fde917ba333b89afeff0e31104421455f4bf1b":[async_test('html5lib_tests7.html 52fde917ba333b89afeff0e31104421455f4bf1b'), "%3C%21doctype%20html%3E%3C/head%3E%3Ctitle%3EX%3C/title%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Ctitle%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%3Cbody%3E"],"b017906f7e2732092551b16ecd1b98df0983abcc":[async_test('html5lib_tests7.html b017906f7e2732092551b16ecd1b98df0983abcc'), "%3C%21doctype%20html%3E%3C/head%3E%3Cbase%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cbase%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"625cdec7c7d867748ac3b5be04e3e801a8c51fa5":[async_test('html5lib_tests7.html 625cdec7c7d867748ac3b5be04e3e801a8c51fa5'), "%3C%21doctype%20html%3E%3C/head%3E%3Cbasefont%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cbasefont%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"6e8dd947155d1db292a0c289b3056891d89edaf5":[async_test('html5lib_tests7.html 6e8dd947155d1db292a0c289b3056891d89edaf5'), "%3C%21doctype%20html%3E%3C/head%3E%3Cbgsound%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%20%20%3Cbgsound%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22"],"a8f53ca779c0e5fc484771c4ec2aa6fb6d609779":[async_test('html5lib_tests7.html a8f53ca779c0e5fc484771c4ec2aa6fb6d609779'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cmeta%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%3Ctable%3E"],"e4ce65a5fb6a3726b341ec94da583dee7c2c8232":[async_test('html5lib_tests7.html e4ce65a5fb6a3726b341ec94da583dee7c2c8232'), "%3C%21doctype%20html%3E%3Ctable%3EX%3Ctr%3E%3Ctd%3E%3Ctable%3E%20%3Cmeta%3E%3C/table%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmeta%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22%20%22"],"8779e761986b4c724bfe73fee95b7972145fb4d3":[async_test('html5lib_tests7.html 8779e761986b4c724bfe73fee95b7972145fb4d3'), "%3C%21doctype%20html%3E%3Chtml%3E%20%3Chead%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"620e44a8a55e82cec0d51e9d93025d8a5c4456fc":[async_test('html5lib_tests7.html 620e44a8a55e82cec0d51e9d93025d8a5c4456fc'), "%3C%21doctype%20html%3E%20%3Chead%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"37b910b755c2df155a3129d5a1150f0c0fdd7934":[async_test('html5lib_tests7.html 37b910b755c2df155a3129d5a1150f0c0fdd7934'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cstyle%3E%20%3Ctr%3Ex%20%3C/style%3E%20%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cstyle%3E%0A%7C%20%20%20%20%20%20%20%20%20%22%20%3Ctr%3Ex%20%22%0A%7C%20%20%20%20%20%20%20%22%20%22"],"868bff3a23219b836fdc702063d637f817ce65e1":[async_test('html5lib_tests7.html 868bff3a23219b836fdc702063d637f817ce65e1'), "%3C%21doctype%20html%3E%3Ctable%3E%3CTBODY%3E%3Cscript%3E%20%3Ctr%3Ex%20%3C/script%3E%20%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cscript%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22%20%3Ctr%3Ex%20%22%0A%7C%20%20%20%20%20%20%20%20%20%22%20%22"],"a33a56f5571b4bcb23138ffb60df3824f5c53773":[async_test('html5lib_tests7.html a33a56f5571b4bcb23138ffb60df3824f5c53773'), "%3C%21doctype%20html%3E%3Cp%3E%3Capplet%3E%3Cp%3EX%3C/p%3E%3C/applet%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Capplet%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22X%22"],"facf5e60205451cf740f64628b8608f0aee30f3a":[async_test('html5lib_tests7.html facf5e60205451cf740f64628b8608f0aee30f3a'), "%3C%21doctype%20html%3E%3Cp%3E%3Cobject%20type%3D%22application/x-non-existant-plugin%22%3E%3Cp%3EX%3C/p%3E%3C/object%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%3Cobject%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22application/x-non-existant-plugin%22%0A%7C%20%20%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%22X%22"],"8ba11b54fa74a1c229d079b2902d6e33e139f33b":[async_test('html5lib_tests7.html 8ba11b54fa74a1c229d079b2902d6e33e139f33b'), "%3C%21doctype%20html%3E%3Clisting%3E%0AX%3C/listing%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Clisting%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"84e2152c284f4dfee7d8d12846c08b2c025578a6":[async_test('html5lib_tests7.html 84e2152c284f4dfee7d8d12846c08b2c025578a6'), "%3C%21doctype%20html%3E%3Cselect%3E%3Cinput%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%22X%22"],"8e3432411baa59cbef731ab3ba2703cb5d518453":[async_test('html5lib_tests7.html 8e3432411baa59cbef731ab3ba2703cb5d518453'), "%3C%21doctype%20html%3E%3Cselect%3E%3Cselect%3EX", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%22X%22"],"e2f6144290512430ad25bbf9598eae77288c7b7a":[async_test('html5lib_tests7.html e2f6144290512430ad25bbf9598eae77288c7b7a'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"350ebd648764d585f4aa0c29b925e6276579e9d0":[async_test('html5lib_tests7.html 350ebd648764d585f4aa0c29b925e6276579e9d0'), "%3C%21doctype%20html%3E%3Ctable%3EX%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"9120ef80d3ee017007f3510121ddf7eba31b79e0":[async_test('html5lib_tests7.html 9120ef80d3ee017007f3510121ddf7eba31b79e0'), "%3C%21doctype%20html%3E%3Ctable%3E%20%20%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"2026cd3ed42e41c168dd37c8c2675584f4eef335":[async_test('html5lib_tests7.html 2026cd3ed42e41c168dd37c8c2675584f4eef335'), "%3C%21doctype%20html%3E%3Ctable%3E%20%20%3Cinput%20type%3D%27hidDEN%27%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%22%20%20%22%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"ff2e324237e22efc8430ad7137d50d6d3d311820":[async_test('html5lib_tests7.html ff2e324237e22efc8430ad7137d50d6d3d311820'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cinput%20type%3D%22%20hidden%22%3E%3Cinput%20type%3DhidDEN%3E%3C/table%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20type%3D%22%20hidden%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Cinput%3E%0A%7C%20%20%20%20%20%20%20%20%20type%3D%22hidDEN%22"],"02c9eb822611b0c206b544e0f2e5044695195ba8":[async_test('html5lib_tests7.html 02c9eb822611b0c206b544e0f2e5044695195ba8'), "%3C%21doctype%20html%3E%3Ctable%3E%3Cselect%3EX%3Ctr%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%22X%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"cb3d1a50dd56a85135a0856cfa1c23a091ef2af4":[async_test('html5lib_tests7.html cb3d1a50dd56a85135a0856cfa1c23a091ef2af4'), "%3C%21doctype%20html%3E%3Cselect%3EX%3C/select%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%20%20%22X%22"],"13847685cfff75642823a0e78c6ef232ecb9d94b":[async_test('html5lib_tests7.html 13847685cfff75642823a0e78c6ef232ecb9d94b'), "%3C%21DOCTYPE%20hTmL%3E%3Chtml%3E%3C/html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e":[async_test('html5lib_tests7.html 99bb5e9a6e0daf62ba418dd97b5e8e3925f4137e'), "%3C%21DOCTYPE%20HTML%3E%3Chtml%3E%3C/html%3E", "%23document%0A%7C%20%3C%21DOCTYPE%20html%3E%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E"],"7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba":[async_test('html5lib_tests7.html 7a8e5ec2c95e725717c564dd49bfa86c2e1a88ba'), "%3Cdiv%3E%3Cp%3Ea%3C/x%3E%20b", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cdiv%3E%0A%7C%20%20%20%20%20%20%20%3Cp%3E%0A%7C%20%20%20%20%20%20%20%20%20%22a%20b%22"],"17dcea170bb74d18ed4776dbb98f0bac6a11364d":[async_test('html5lib_tests7.html 17dcea170bb74d18ed4776dbb98f0bac6a11364d'), "%3Ctable%3E%3Ctr%3E%3Ctd%3E%3Ccode%3E%3C/code%3E%20%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%3Ccode%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22%20%22"],"9457c10c9f987bbc95937b34763fe956d61d237b":[async_test('html5lib_tests7.html 9457c10c9f987bbc95937b34763fe956d61d237b'), "%3Ctable%3E%3Cb%3E%3Ctr%3E%3Ctd%3Eaaa%3C/td%3E%3C/tr%3Ebbb%3C/table%3Eccc", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%22bbb%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%3Ctd%3E%0A%7C%20%20%20%20%20%20%20%20%20%20%20%20%20%22aaa%22%0A%7C%20%20%20%20%20%3Cb%3E%0A%7C%20%20%20%20%20%20%20%22ccc%22"],"0fa23bb5d8b2a591afb1842b8f4c00c490c127b4":[async_test('html5lib_tests7.html 0fa23bb5d8b2a591afb1842b8f4c00c490c127b4'), "A%3Ctable%3E%3Ctr%3E%20B%3C/tr%3E%20B%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22A%20B%20B%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E"],"f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b":[async_test('html5lib_tests7.html f6d60b3ae48e2b69b4c25125f9b5a3ab4867521b'), "A%3Ctable%3E%3Ctr%3E%20B%3C/tr%3E%20%3C/em%3EC%3C/table%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%22A%20BC%22%0A%7C%20%20%20%20%20%3Ctable%3E%0A%7C%20%20%20%20%20%20%20%3Ctbody%3E%0A%7C%20%20%20%20%20%20%20%20%20%3Ctr%3E%0A%7C%20%20%20%20%20%20%20%20%20%22%20%22"],"5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8":[async_test('html5lib_tests7.html 5b0b3edcc3ce9fdc9f58eb62d326865ca0aab8c8'), "%3Cselect%3E%3Ckeygen%3E", "%23document%0A%7C%20%3Chtml%3E%0A%7C%20%20%20%3Chead%3E%0A%7C%20%20%20%3Cbody%3E%0A%7C%20%20%20%20%20%3Cselect%3E%0A%7C%20%20%20%20%20%3Ckeygen%3E"],
       }
       init_tests(get_type());
     </script>
diff --git a/tests/wpt/tests/html/tools/html5lib_tests_revision b/tests/wpt/tests/html/tools/html5lib_tests_revision
index 4af32678e53..3ea6d572fd8 100644
--- a/tests/wpt/tests/html/tools/html5lib_tests_revision
+++ b/tests/wpt/tests/html/tools/html5lib_tests_revision
@@ -1 +1 @@
-c67f90eacac14e022b1f2c2e5ac559879581e9ff
+a9f44960a9fedf265093d22b2aa3c7ca123727b9
diff --git a/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html b/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html
new file mode 100644
index 00000000000..bc378d71b25
--- /dev/null
+++ b/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html
@@ -0,0 +1,278 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+'use strict';
+
+async function getFrameStatsUntil(track, condition) {
+  while (true) {
+    const stats = await track.getFrameStats();
+    if (condition(stats)) {
+      return stats;
+    }
+  }
+}
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  const firstStats =
+      await getFrameStatsUntil(track, stats => stats.totalFrames > 0);
+  await getFrameStatsUntil(track,
+                      stats => stats.totalFrames > firstStats.totalFrames);
+}, `totalFrames increases over time`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // `deliveredFrames` increments for each deliverable frame, even if the
+  // `track` does not have any sink.
+  const firstStats = await getFrameStatsUntil(
+      track, stats => stats.deliveredFrames > 0);
+  await getFrameStatsUntil(
+      track, stats => stats.deliveredFrames > firstStats.deliveredFrames);
+}, `deliveredFrames increases, even without sinks`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // No frames should be discarded initially.
+  const firstStats = await getFrameStatsUntil(
+      track, stats => stats.deliveredFrames > 0);
+  assert_equals(firstStats.discardedFrames, 0);
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(track.getSettings().frameRate, 10);
+  await track.applyConstraints({frameRate:{ideal:10}});
+
+  await getFrameStatsUntil(track, stats => stats.discardedFrames > 0);
+}, `discardedFrames increases when frameRate decimation is happening`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(track.getSettings().frameRate, 10);
+  await track.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait until we have both delivered and discarded frames.
+  const stats = await getFrameStatsUntil(track, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // This test assumes that no frames are dropped, otherwise `totalFrames` can
+  // be greater than the sum of `deliveredFrames` and `discardedFrames`.
+  assert_equals(stats.totalFrames,
+                stats.deliveredFrames + stats.discardedFrames);
+}, `totalFrames is the sum of deliveredFrames and discardedFrames`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(track.getSettings().frameRate, 10);
+  await track.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait for media to flow before disabling the `track`.
+  const startTimeMs = performance.now();
+  const initialStats = await getFrameStatsUntil(track, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0 &&
+      stats.totalFrames > 10);
+  const elapsedTimeMs = performance.now() - startTimeMs;
+  track.enabled = false;
+  // Upon disabling, the counters are not reset.
+  const disabledSnapshot = await track.getFrameStats();
+  assert_greater_than_equal(disabledSnapshot.deliveredFrames,
+                            initialStats.deliveredFrames);
+  assert_greater_than_equal(disabledSnapshot.discardedFrames,
+                            initialStats.discardedFrames);
+  assert_greater_than_equal(disabledSnapshot.totalFrames,
+                            initialStats.totalFrames);
+
+  // Wait enough time that frames should have been produced.
+  // `elapsedTimeMs` should be enough to produce ~10 frames.
+  await new Promise(r => t.step_timeout(r, elapsedTimeMs));
+
+  // Frame metrics should be frozen.
+  const stats = await track.getFrameStats();
+  assert_equals(stats.deliveredFrames, disabledSnapshot.deliveredFrames);
+  assert_equals(stats.discardedFrames, disabledSnapshot.discardedFrames);
+  assert_equals(stats.totalFrames, disabledSnapshot.totalFrames);
+}, `Stats are frozen while disabled`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(track.getSettings().frameRate, 10);
+  await track.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait for media to flow before disabling the `track`.
+  const initialStats = await getFrameStatsUntil(track, stats =>
+      stats.deliveredFrames > 10 && stats.discardedFrames > 10);
+  track.enabled = false;
+
+  // Re-enable the track. The stats counters should be greater than or equal to
+  // what they were previously.
+  track.enabled = true;
+  const stats = await track.getFrameStats();
+  assert_greater_than_equal(stats.deliveredFrames,
+                            initialStats.deliveredFrames);
+  assert_greater_than_equal(stats.discardedFrames,
+                            initialStats.discardedFrames);
+  assert_greater_than_equal(stats.totalFrames,
+                            initialStats.totalFrames);
+}, `Disabling and re-enabling does not reset the counters`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [originalTrack] = stream.getTracks();
+  t.add_cleanup(() => originalTrack.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(originalTrack.getSettings().frameRate, 10);
+  await originalTrack.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait for media to flow before disabling the `track`.
+  await getFrameStatsUntil(originalTrack, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+  originalTrack.enabled = false;
+  const originalTrackInitialStats = await originalTrack.getFrameStats();
+
+  // Clone the track, its counters should be zero initially.
+  // This is not racy because the cloned track is also disabled.
+  const clonedTrack = originalTrack.clone();
+  t.add_cleanup(() => clonedTrack.stop());
+  const clonedTrackStats = await clonedTrack.getFrameStats();
+  assert_equals(clonedTrackStats.deliveredFrames, 0);
+  assert_equals(clonedTrackStats.discardedFrames, 0);
+  assert_equals(clonedTrackStats.totalFrames, 0);
+
+  // Enabled the cloned track and wait for media to flow.
+  clonedTrack.enabled = true;
+  await getFrameStatsUntil(clonedTrack, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // This does not affect the original track's stats, which are still frozen due
+  // to the original track being disabled.
+  const originalTrackSecondStats = await originalTrack.getFrameStats();
+  assert_equals(originalTrackSecondStats.deliveredFrames,
+                originalTrackInitialStats.deliveredFrames);
+  assert_equals(originalTrackSecondStats.discardedFrames,
+                originalTrackInitialStats.discardedFrames);
+  assert_equals(originalTrackSecondStats.totalFrames,
+                originalTrackInitialStats.totalFrames);
+}, `New stats baselines when a track is cloned from a disabled track`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [originalTrack] = stream.getTracks();
+  t.add_cleanup(() => originalTrack.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(originalTrack.getSettings().frameRate, 10);
+  await originalTrack.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait for media to flow.
+  await getFrameStatsUntil(originalTrack, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // Clone the track. While its counters should initially be zero, it would be
+  // racy to assert that they are exactly zero because media is flowing.
+  const clonedTrack = originalTrack.clone();
+  t.add_cleanup(() => clonedTrack.stop());
+
+  // Ensure that as media continues to flow, the cloned track will necessarily
+  // have less frames than the original track on all accounts since its counters
+  // will have started from zero.
+  const clonedTrackStats = await getFrameStatsUntil(clonedTrack, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+  const originalTrackStats = await originalTrack.getFrameStats();
+  assert_less_than(clonedTrackStats.deliveredFrames,
+                   originalTrackStats.deliveredFrames);
+  assert_less_than(clonedTrackStats.discardedFrames,
+                   originalTrackStats.discardedFrames);
+  assert_less_than(clonedTrackStats.totalFrames,
+                   originalTrackStats.totalFrames);
+}, `New stats baselines when a track is cloned from an enabled track`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({
+          video:{frameRate:{ideal:20}}
+      });
+  const [originalTrack] = stream.getTracks();
+  t.add_cleanup(() => originalTrack.stop());
+
+  // Assert test prerequisite is met: frames will be discarded if the track is
+  // opened with a higher frame rate than we apply after it is opened.
+  assert_greater_than(originalTrack.getSettings().frameRate, 10);
+  await originalTrack.applyConstraints({frameRate:{ideal:10}});
+
+  // Wait for media to flow.
+  await getFrameStatsUntil(originalTrack, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // Clone and wait for media to flow.
+  const cloneA = originalTrack.clone();
+  t.add_cleanup(() => cloneA.stop());
+  await getFrameStatsUntil(cloneA, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // Clone the clone and wait for media to flow.
+  const cloneB = cloneA.clone();
+  t.add_cleanup(() => cloneB.stop());
+  await getFrameStatsUntil(cloneB, stats =>
+      stats.deliveredFrames > 0 && stats.discardedFrames > 0);
+
+  // Because every clone reset its counters and every waits for media before
+  // cloning, this must be true: originalStats > cloneAStats > cloneBStats.
+  const originalStats = await originalTrack.getFrameStats();
+  const cloneAStats = await cloneA.getFrameStats();
+  const cloneBStats = await cloneB.getFrameStats();
+  assert_greater_than(originalStats.totalFrames, cloneAStats.totalFrames);
+  assert_greater_than(cloneAStats.totalFrames, cloneBStats.totalFrames);
+}, `New stats baselines for the clone of a clone`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  try {
+    await track.getFrameStats();
+    assert_not_reached();
+  } catch (e) {
+    assert_equals(e.name, 'NotSupportedError');
+  }
+}, `getFrameStats throws on audio tracks`);
+</script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
index 5ec1bab1649..b32bee9e8fa 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
@@ -2,6 +2,7 @@
 <title>auxclick is a PointerEvent</title>
 <meta name="variant" content="?mouse">
 <meta name="variant" content="?pen">
+<!-- TODO: Does any platform support auxclick with touch? -->
 <link rel="help" href="https://github.com/w3c/pointerevents/pull/317">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -13,58 +14,61 @@
 <input id="target" style="margin: 20px">
 
 <script>
-'use strict';
-let target = document.getElementById("target");
-let pointerId = 0;
-let pointerType = "";
-let inputSource = location.search.substring(1);
+  'use strict';
+  const target = document.getElementById("target");
+  const pointer_type = location.search.substring(1);
+  const test_pointer = pointer_type + "TestPointer";
 
-target.addEventListener("pointerdown", (e)=>{
-  pointerId = e.pointerId;
-  pointerType = e.pointerType;
-});
-
-function testFunction(test){
-  return test.step_func(e=>{
-    assert_equals(e.constructor, window.PointerEvent,
+  function assertAuxclickProperties(auxclick_event, pointerdown_event) {
+    assert_equals(auxclick_event.constructor, window.PointerEvent,
         "auxclick should use a PointerEvent constructor");
-    assert_true(e instanceof PointerEvent,
+    assert_true(auxclick_event instanceof PointerEvent,
         "auxclick should be a PointerEvent");
-    assert_equals(e.pointerId, pointerId,
-        "auxclick's pointerId should match the pointerId of the pointer event that triggers it");
-    assert_equals(e.pointerType, pointerType,
-        "auxclick's pointerType should match the pointerType of the pointer event that triggers it");
-    assert_equals(e.composed, true, "auxclick.composed should be true");
-  });
-}
+    assert_not_equals(auxclick_event.pointerId, -1,
+        "auxclick.pointerId should not be -1");
+    assert_equals(auxclick_event.pointerType, pointer_type,
+        "auxclick.pointerType should match test action pointerType");
+    assert_equals(auxclick_event.composed, true,
+        "auxclick.composed should be true");
 
-function run_test(pointerType){
-  promise_test((test) => new Promise((resolve, reject) => {
-    const testPointer = pointerType + "TestPointer";
-    let auxclickFunc = testFunction(test);
-    test.add_cleanup(() => {
-      target.removeEventListener("auxclick", auxclickFunc);
-      pointerId = 0;
-      pointerType = "";
-    });
-    let pointerDownPrevented = preventDefaultPointerdownOnce(target);
-    target.addEventListener("auxclick", auxclickFunc);
-    let eventWatcher = new EventWatcher(test, target, ["auxclick"]);
+    if (pointerdown_event) {
+      assert_equals(auxclick_event.pointerId, pointerdown_event.pointerId,
+          "auxclick.pointerId should match pointerdown.pointerId");
+    }
+  }
+
+  promise_test(async test => {
     let actions = new test_driver.Actions();
     actions = actions
-      .addPointer(testPointer, pointerType)
-      .pointerMove(0,0, {origin:target, sourceName:testPointer})
-      .pointerDown({button:actions.ButtonType.MIDDLE, sourceName:testPointer})
-      .pointerUp({button:actions.ButtonType.MIDDLE, sourceName:testPointer});
-    Promise.all([
-      pointerDownPrevented,
-      eventWatcher.wait_for("auxclick"),
-      actions.send()
-    ]).then(()=>resolve());
-  }), "auxclick using " + pointerType + " is a PointerEvent");
-}
+      .addPointer(test_pointer, pointer_type)
+      .pointerMove(0,0, {origin:target, sourceName:test_pointer})
+      .pointerDown({button:actions.ButtonType.MIDDLE, sourceName:test_pointer})
+      .pointerUp({button:actions.ButtonType.MIDDLE, sourceName:test_pointer});
+    let pointerdown_prevented = preventDefaultPointerdownOnce(target, test);
+    let pointerdown_promise = getEvent("pointerdown", target, test);
+    let auxclick_promise = getEvent("auxclick", target, test);
 
-run_test(inputSource);
-// TODO(crbug.com/1150441): Add test for auxclick from touch.  Note: Calling
-// run_test("touch") here times out.
+    await actions.send();
+    await pointerdown_prevented;
+    let pointerdown_event = await pointerdown_promise;
+    let auxclick_event = await auxclick_promise;
+
+    assertAuxclickProperties(auxclick_event, pointerdown_event);
+  }, "auxclick using " + pointer_type + " is a PointerEvent with correct properties");
+
+  promise_test(async test => {
+    let actions = new test_driver.Actions();
+    actions = actions
+      .addPointer(test_pointer, pointer_type)
+      .pointerMove(0,0, {origin:target, sourceName:test_pointer})
+      .pointerDown({button:actions.ButtonType.MIDDLE, sourceName:test_pointer})
+      .pointerUp({button:actions.ButtonType.MIDDLE, sourceName:test_pointer});
+    let auxclick_promise = getEvent("auxclick", target, test);
+
+    await actions.send();
+    let auxclick_event = await auxclick_promise;
+
+    assertAuxclickProperties(auxclick_event);
+  }, "auxclick using " + pointer_type + " is a PointerEvent with correct properties"
+      + " when no other PointerEvent listeners are present");
 </script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html
index 36b80b66f57..ceaae68db21 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html
@@ -20,55 +20,69 @@
 const pointer_type = location.search.substring(1);
 let subframe_loaded = getMessageData("subframe-loaded", frames[0]);
 
-function assert_click_construction(click_event, window_object) {
+function assertClickProperties(
+    click_event, window_object, pointerdown_event, pointerup_event) {
   assert_equals(click_event.constructor, window_object.PointerEvent,
       "click should use a PointerEvent constructor");
   assert_true(click_event instanceof window_object.PointerEvent,
       "click should be a PointerEvent instance");
   assert_equals(click_event.composed, true, "click.composed should be true");
+
+  if (pointerdown_event) {
+    assert_equals(click_event.pointerId, pointerdown_event.pointerId,
+        "click.pointerId should match pointerdown.pointerId");
+    assert_equals(click_event.pointerType, pointerdown_event.pointerType,
+        "click.pointerType should match pointerdown.pointerType");
+  }
+
+  if (pointerup_event) {
+    assert_equals(click_event.pointerId, pointerup_event.pointerId,
+        "click.pointerId should match pointerup.pointerId");
+    assert_equals(click_event.pointerType, pointerup_event.pointerType,
+        "click.pointerType should match pointerup.pointerType");
+  }
 }
 
-function assert_click_attributes(click_event, pointerdown_event, pointerup_event) {
-  assert_equals(click_event.pointerId, pointerdown_event.pointerId,
-      "click.pointerId should match the pointerId of the triggering pointerdown");
-  assert_equals(click_event.pointerType, pointerdown_event.pointerType,
-      "click.pointerType should match the pointerType of the triggering pointerdown");
-
-  assert_equals(click_event.pointerId, pointerup_event.pointerId,
-      "click.pointerId should match the pointerId of the triggering pointerup");
-  assert_equals(click_event.pointerType, pointerup_event.pointerType,
-      "click.pointerType should match the pointerType of the triggering pointerup");
-}
-
-promise_test(async () => {
+promise_test(async test => {
   const target = document.getElementById("target");
 
-  let pointerDownPrevented = preventDefaultPointerdownOnce(target);
+  let pointerdown_prevented = preventDefaultPointerdownOnce(target, test);
 
-  let pointerdown_promise = getEvent("pointerdown", target);
-  let pointerup_promise = getEvent("pointerup", target);
-  let click_promise = getEvent("click", target);
+  let pointerdown_promise = getEvent("pointerdown", target, test);
+  let pointerup_promise = getEvent("pointerup", target, test);
+  let click_promise = getEvent("click", target, test);
 
   await clickInTarget(pointer_type, target);
 
-  await pointerDownPrevented;
+  await pointerdown_prevented;
   let pointerdown_event = await pointerdown_promise;
   let pointerup_event = await pointerup_promise;
   let click_event = await click_promise;
 
-  assert_click_construction(click_event, this);
-  assert_click_attributes(click_event, pointerdown_event, pointerup_event);
-  assert_not_equals(click_event.pointerId, -1,
-                    "Click event triggered by a pointing device should not have -1 as the pointerId");
-}, "click using " + pointer_type + " is a PointerEvent");
+  assertClickProperties(click_event, this, pointerdown_event, pointerup_event);
+}, "click using " + pointer_type + " is a PointerEvent with correct properties");
 
-promise_test(async () => {
+promise_test(async test => {
+  const target = document.getElementById("target");
+
+  let click_promise = getEvent("click", target, test);
+  await clickInTarget(pointer_type, target);
+
+  let click_event = await click_promise;
+
+  assertClickProperties(click_event, this);
+  assert_not_equals(click_event.pointerId, -1,
+                    "click.pointerId should not be -1");
+}, "click using " + pointer_type + " is a PointerEvent with correct properties"
+    + " when no other PointerEvent listeners are present");
+
+promise_test(async test => {
   await subframe_loaded;
 
   const target = frames[0];
-  let pointerdown_promise = getEvent("pointerdown", target);
-  let pointerup_promise = getEvent("pointerup", target);
-  let click_promise = getEvent("click", target);
+  let pointerdown_promise = getEvent("pointerdown", target, test);
+  let pointerup_promise = getEvent("pointerup", target, test);
+  let click_promise = getEvent("click", target, test);
 
   await clickInTarget(pointer_type, frames[0].document.body);
 
@@ -76,31 +90,34 @@ promise_test(async () => {
   let pointerup_event = await pointerup_promise;
   let click_event = await click_promise;
 
-  assert_click_construction(click_event, frames[0]);
-  assert_click_attributes(click_event, pointerdown_event, pointerup_event);
-}, "click in a subframe using " + pointer_type + " is a PointerEvent");
+  assertClickProperties(click_event, frames[0], pointerdown_event, pointerup_event);
+}, "click using " + pointer_type + " is a PointerEvent with correct properties"
+    + " in a subframe");
+
 
 // Run this part of the test only once, since it doesn't rely on the pointer_type.
 if (pointer_type == "mouse") {
-  promise_test(async () => {
+  promise_test(async test => {
     const target = document.getElementById("target");
-    let click_promise = getEvent("click", target);
+    let click_promise = getEvent("click", target, test);
     target.click();
     let click_event = await click_promise;
     assert_equals(click_event.pointerId, -1,
-                  "Click event triggered by a non-pointing device should have -1 as the pointerId");
+                    "click.pointerId should be -1");
 
     target.type = "button";
     target.focus();
-    click_promise = getEvent("click", target);
+    click_promise = getEvent("click", target, test);
     // Press enter
     let actions = new test_driver.Actions()
                                  .keyDown("\uE007")
                                  .keyUp("\uE007");
     await actions.send();
     click_event = await click_promise;
+    assertClickProperties(click_event, this);
     assert_equals(click_event.pointerId, -1,
-                  "Click event triggered by a non-pointing device should have -1 as the pointerId");
-  }, "Click event triggered by a non-pointing device should have -1 as the pointerId");
+                    "click.pointerId should be -1");
+  }, "click using " + pointer_type + " is a PointerEvent with correct properties"
+      + " using non-pointing device");
 }
 </script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html
index d951be542a3..88ec1903ab8 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html
@@ -2,6 +2,7 @@
 <title>contexmenu is a PointerEvent</title>
 <meta name="variant" content="?mouse">
 <meta name="variant" content="?touch">
+<!-- TODO: Can we test "pen" just like "touch"? -->
 <link rel="help" href="https://github.com/w3c/pointerevents/pull/317">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -13,37 +14,64 @@
 <input id="target" style="margin: 20px">
 
 <script>
-'use strict';
-let contextmenuTest = async_test("contextmenu is a PointerEvent");
-let target = document.getElementById("target");
-let pointerdownPointerId, pointerdownPointerType;
-let inputSource = location.search.substring(1);
+  'use strict';
+  const target = document.getElementById("target");
+  const pointer_type = location.search.substring(1);
 
-target.addEventListener("contextmenu", contextmenuTest.step_func((e)=>{
-  assert_equals(e.constructor, window.PointerEvent,
-      "contextmenu should use a PointerEvent constructor");
-  assert_true(e instanceof PointerEvent,
-      "contextmenu should be a PointerEvent");
-  assert_equals(e.pointerId, pointerdownPointerId,
-      "contextmenu's pointerId should match the pointerId of the pointer event that triggers it");
-  assert_equals(e.pointerType, pointerdownPointerType,
-      "contextmenu's pointerType should match the pointerType of the pointer event that triggers it");
-  assert_equals(e.composed, true, "contextmenu.composed should be true");
-}));
-target.addEventListener("pointerdown", e=>{
-  pointerdownPointerId = e.pointerId;
-  pointerdownPointerType = e.pointerType;
-});
+  function assertContextmenuProperties(contextmenu_event, pointerdown_event) {
+    assert_equals(contextmenu_event.constructor, window.PointerEvent,
+        "contextmenu should use a PointerEvent constructor");
+    assert_true(contextmenu_event instanceof PointerEvent,
+        "contextmenu should be a PointerEvent");
+    assert_not_equals(contextmenu_event.pointerId, -1,
+        "contextmenu.pointerId should not be -1");
+    assert_equals(contextmenu_event.pointerType, pointer_type,
+        "contextmenu.pointerType should match test action pointerType");
+    assert_equals(contextmenu_event.composed, true,
+        "contextmenu.composed should be true");
 
-let pointerDownPrevented = preventDefaultPointerdownOnce(target);
-let eventWatcher = new EventWatcher(contextmenuTest, target, ["contextmenu"]);
-let actions = new test_driver.Actions();
-// TODO: We might be able to test "pen" just like "touch".
-let testPointer = inputSource + "TestPointer";
-actions = actions.addPointer(testPointer, inputSource)
-  .pointerMove(0,0, {sourceName:testPointer, origin:target})
-  .pointerDown({sourceName:testPointer, button:actions.ButtonType.RIGHT})
-  .pause(inputSource === "touch" ? 1500 : 0, "pointer", {sourceName:testPointer})
-  .pointerUp({sourceName:testPointer, button:actions.ButtonType.RIGHT});
-Promise.all([pointerDownPrevented, eventWatcher.wait_for("contextmenu"), actions.send()]).then(()=>contextmenuTest.done());
+    if (pointerdown_event) {
+      assert_equals(contextmenu_event.pointerId, pointerdown_event.pointerId,
+          "contextmenu.pointerId should match pointerdown.pointerId");
+    }
+  }
+
+  promise_test(async test => {
+    const test_pointer = pointer_type + "TestPointer";
+
+    let actions = new test_driver.Actions();
+    actions = actions.addPointer(test_pointer, pointer_type)
+      .pointerMove(0,0, {sourceName:test_pointer, origin:target})
+      .pointerDown({sourceName:test_pointer, button:actions.ButtonType.RIGHT})
+      .pause(pointer_type === "touch" ? 1500 : 0, "pointer", {sourceName:test_pointer})
+      .pointerUp({sourceName:test_pointer, button:actions.ButtonType.RIGHT});
+    let pointerdown_prevented = preventDefaultPointerdownOnce(target, test);
+    let pointerdown_promise = getEvent("pointerdown", target, test);
+    let contextmenu_promise = getEvent("contextmenu", target, test);
+
+    await actions.send();
+    await pointerdown_prevented;
+    let pointerdown_event = await pointerdown_promise;
+    let contextmenu_event = await contextmenu_promise;
+
+    assertContextmenuProperties(contextmenu_event, pointerdown_event);
+  }, "contextmenu using " + pointer_type + " is a PointerEvent with correct properties");
+
+  promise_test(async test => {
+    const test_pointer = pointer_type + "TestPointer";
+
+    let actions = new test_driver.Actions();
+    actions = actions.addPointer(test_pointer, pointer_type)
+      .pointerMove(0,0, {sourceName:test_pointer, origin:target})
+      .pointerDown({sourceName:test_pointer, button:actions.ButtonType.RIGHT})
+      .pause(pointer_type === "touch" ? 1500 : 0, "pointer", {sourceName:test_pointer})
+      .pointerUp({sourceName:test_pointer, button:actions.ButtonType.RIGHT});
+    let contextmenu_promise = getEvent("contextmenu", target, test);
+
+    await actions.send();
+    let contextmenu_event = await contextmenu_promise;
+
+    assertContextmenuProperties(contextmenu_event);
+  }, "contextmenu using " + pointer_type + " is a PointerEvent with correct properties"
+      + " when no other PointerEvent listeners are present");
 </script>
diff --git a/tests/wpt/tests/preload/reflected-as-value.html b/tests/wpt/tests/preload/reflected-as-value.html
index 5aeb5b3b3ca..93f411742de 100644
--- a/tests/wpt/tests/preload/reflected-as-value.html
+++ b/tests/wpt/tests/preload/reflected-as-value.html
@@ -2,8 +2,6 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-test(function() {
-  var link = document.createElement("link");
   var values = {
     "Image": "image",
     "images": "",
@@ -17,10 +15,12 @@ test(function() {
     "track": "track",
     "fetch": "fetch",
   };
+  var link = document.createElement("link");
   var keys = Object.keys(values);
   for (var i = 0; i < keys.length; ++i) {
-    link.as = keys[i];
-    assert_equals(link.as, values[keys[i]]);
+    test(function() {
+      link.as = keys[i];
+      assert_equals(link.as, values[keys[i]]);
+    }, `Link preload "as" value for "${keys[i]}" should be "${values[keys[i]]}".`);
   }
-}, "Make sure that the `as` value reflects only known values");
 </script>
diff --git a/tests/wpt/tests/requestidlecallback/deadline-max-rAF.html b/tests/wpt/tests/requestidlecallback/deadline-max-rAF.html
index 314f250254f..ce5f504ed37 100644
--- a/tests/wpt/tests/requestidlecallback/deadline-max-rAF.html
+++ b/tests/wpt/tests/requestidlecallback/deadline-max-rAF.html
@@ -7,12 +7,16 @@
 <script src="resources/ric-utils.js"></script>
 <script>
 
+function runRAFLoop()
+{
+  requestAnimationFrame(runRAFLoop);
+}
+
 promise_test(async done => {
+  runRAFLoop();
   for (let i = 0; i < getRICRetryCount(); ++i) {
-    requestAnimationFrame(() => {})
     assert_less_than_equal(await getDeadlineForNextIdleCallback(), getPendingRenderDeadlineCap())
   }
-
 }, 'Check that the deadline is less than 16ms when there is a pending animation frame.');
 </script>
 <h1>Test of requestIdleCallback deadline behavior</h1>
diff --git a/tests/wpt/tests/shared-storage/resources/delete-key.https.html b/tests/wpt/tests/shared-storage/resources/delete-key.https.html
new file mode 100644
index 00000000000..41595f3ee38
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/delete-key.https.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<script src=/resources/testharness.js></script>
+<script src=/shared-storage/resources/util.js></script>
+<script src=/fenced-frame/resources/utils.js></script>
+<body>
+<script>
+
+async function init() {
+    const [outerKey] = parseKeylist();
+    const parsedData = parseExpectedKeyData();
+    await sharedStorage.delete(parsedData['expectedKey']);
+    await writeValueToServer(outerKey, "delete_key_loaded");
+}
+
+init();
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png
new file mode 100644
index 00000000000..818c71d03f4
Binary files /dev/null and b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png differ
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png.sub.headers b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png.sub.headers
new file mode 100644
index 00000000000..8b541e7b13b
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-pixel.png.sub.headers
@@ -0,0 +1,3 @@
+Timing-Allow-Origin: *
+Access-Control-Allow-Origin: *
+Shared-Storage-Write: set;key={{GET[key]}};value={{GET[value]}}
diff --git a/tests/wpt/tests/shared-storage/resources/util.js b/tests/wpt/tests/shared-storage/resources/util.js
index b8997e080dd..b829864c625 100644
--- a/tests/wpt/tests/shared-storage/resources/util.js
+++ b/tests/wpt/tests/shared-storage/resources/util.js
@@ -184,3 +184,15 @@ async function setKeyValueForOrigin(key, value, origin) {
   const result = await nextValueFromServer(outerKey);
   assert_equals(result, 'set_key_value_loaded');
 }
+
+async function deleteKeyForOrigin(key, origin) {
+  const outerKey = token();
+  let deleteIframeUrl = generateURL(
+      '/shared-storage/resources/delete-key.https.html', [outerKey]);
+  deleteIframeUrl = updateUrlToUseNewOrigin(deleteIframeUrl, origin);
+  appendExpectedKey(deleteIframeUrl, key);
+
+  attachIFrame(deleteIframeUrl);
+  const result = await nextValueFromServer(outerKey);
+  assert_equals(result, 'delete_key_loaded');
+}
diff --git a/tests/wpt/tests/shared-storage/resources/util.sub.js b/tests/wpt/tests/shared-storage/resources/util.sub.js
new file mode 100644
index 00000000000..d92dbf539c3
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/util.sub.js
@@ -0,0 +1,25 @@
+function loadSharedStorageImage(data) {
+  let {key, value, hasSharedStorageWritableAttribute, isSameOrigin} = data;
+  const sameOriginSrc = `/shared-storage/resources/` +
+      `shared-storage-writable-pixel.png?key=${key}&value=${value}`;
+  const crossOriginSrc =
+      'https://{{domains[www]}}:{{ports[https][0]}}' + sameOriginSrc;
+
+  let image = document.createElement('img');
+  image.src = isSameOrigin ? sameOriginSrc : crossOriginSrc;
+  if (hasSharedStorageWritableAttribute) {
+    image.sharedStorageWritable = true;
+  }
+
+  const promise = new Promise((resolve, reject) => {
+    image.addEventListener('load', () => {
+      resolve(image);
+    });
+    image.addEventListener('error', () => {
+      reject(new Error('Image load failed'));
+    });
+  });
+
+  document.body.appendChild(image);
+  return promise;
+}
diff --git a/tests/wpt/tests/shared-storage/resources/verify-shared-storage.https.html b/tests/wpt/tests/shared-storage/resources/verify-shared-storage.https.html
new file mode 100644
index 00000000000..52c79e7e85a
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/verify-shared-storage.https.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script>
+  try {
+    window.sharedStorage;
+    window.parent.postMessage({ accessSharedStorageResult: 'success'}, "*");
+  } catch (error) {
+    window.parent.postMessage({ accessSharedStorageResult: 'failure'}, "*");
+  }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-in-sandboxed-iframe.tentative.https.html b/tests/wpt/tests/shared-storage/shared-storage-in-sandboxed-iframe.tentative.https.html
new file mode 100644
index 00000000000..44512706bd6
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-in-sandboxed-iframe.tentative.https.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/browsing-topics/resources/header-util.sub.js></script>
+  <script>
+    function test_shared_storage_in_sandboxed_iframe(test, sandbox_flags, expect_success) {
+      let frame = document.createElement('iframe');
+      frame.sandbox = sandbox_flags;
+      frame.src = '/shared-storage/resources/verify-shared-storage.https.html';
+
+      window.addEventListener('message', test.step_func(function handler(evt) {
+        if (evt.source === frame.contentWindow) {
+          if (expect_success) {
+            assert_equals(evt.data.accessSharedStorageResult, 'success');
+          } else {
+            assert_equals(evt.data.accessSharedStorageResult, 'failure');
+          }
+
+          document.body.removeChild(frame);
+          window.removeEventListener('message', handler);
+          test.done();
+        }
+      }));
+
+      document.body.appendChild(frame);
+    }
+
+    async_test(t => {
+      test_shared_storage_in_sandboxed_iframe(t,
+        /*sandbox_flags=*/'allow-scripts allow-same-origin',
+        /*expect_success=*/true);
+    }, 'test shared storage in sandboxed iframe with "allow-same-origin"');
+
+    async_test(t => {
+      test_shared_storage_in_sandboxed_iframe(t,
+        /*sandbox_flags=*/'allow-scripts',
+        /*expect_success=*/false);
+    }, 'test shared storage in sandboxed iframe without "allow-same-origin"');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-img-content-attribute.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-img-content-attribute.tentative.https.sub.html
new file mode 100644
index 00000000000..5bce34d91a9
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-img-content-attribute.tentative.https.sub.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <img src="/shared-storage/resources/shared-storage-writable-pixel.png?key=hello&value=world" sharedstoragewritable></img>
+  <img src="/shared-storage/resources/shared-storage-writable-pixel.png?key=wont&value=set"></img>
+  <img src="/shared-storage/resources/shared-storage-writable-pixel.png?key=goodnight&value=moon" sharedstoragewritable></img>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+
+    promise_test(async t => {
+      await verifyKeyValueForOrigin('hello', 'world', sameOrigin);
+      await verifyKeyNotFoundForOrigin('wont', sameOrigin);
+      await verifyKeyValueForOrigin('goodnight', 'moon', sameOrigin);
+      await deleteKeyForOrigin('hello', sameOrigin);
+      await deleteKeyForOrigin('goodnight', sameOrigin);
+    }, 'test <img sharedstoragewritable src=[url]> for same origin img');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included-bytes.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included-bytes.tentative.https.sub.html
new file mode 100644
index 00000000000..b358e87e5cd
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included-bytes.tentative.https.sub.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+    const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: ':8J+YgA==:', value: ':4p2k:',
+        hasSharedStorageWritableAttribute: true,
+        isSameOrigin: true,
+      });
+      promise.then((img) => {
+        verifyKeyValueForOrigin('😀', '❤', sameOrigin);
+        deleteKeyForOrigin('😀', sameOrigin);
+        t.done();
+      });
+    }, 'test <img sharedstoragewritable src=[url]> via JS for same origin img with bytestring');
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: ':8J+MjQ==:', value: ':8J+PgQ==:',
+        hasSharedStorageWritableAttribute: true,
+        isSameOrigin: false,
+      });
+      promise.then((img) => {
+        verifyKeyValueForOrigin('🌍', '🏁', crossOrigin);
+        deleteKeyForOrigin('🌍', crossOrigin);
+        t.done();
+      });
+    }, 'test <img sharedstoragewritable src=[url]> via JS for cross origin img with bytestring');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included.tentative.https.sub.html
new file mode 100644
index 00000000000..3e054146de8
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-included.tentative.https.sub.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+    const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: 'a', value: 'b',
+        hasSharedStorageWritableAttribute: true,
+        isSameOrigin: true,
+      });
+      promise.then((img) => {
+        verifyKeyValueForOrigin('a', 'b', sameOrigin);
+        deleteKeyForOrigin('a', sameOrigin);
+        t.done();
+      });
+    }, 'test <img sharedstoragewritable src=[url]> via JS for same origin img');
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: 'c', value: 'd',
+        hasSharedStorageWritableAttribute: true,
+        isSameOrigin: false,
+      });
+      promise.then((img) => {
+        verifyKeyValueForOrigin('c', 'd', crossOrigin);
+        deleteKeyForOrigin('d', crossOrigin);
+        t.done();
+      });
+    }, 'test <img sharedstoragewritable src=[url]> via JS for cross origin img');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-not-included.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-not-included.tentative.https.sub.html
new file mode 100644
index 00000000000..56badca311b
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-img-idl-attribute-not-included.tentative.https.sub.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+    const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: 'f', value: 'g',
+        hasSharedStorageWritableAttribute: false,
+        isSameOrigin: true,
+      });
+      promise.then((img) => {
+        verifyKeyNotFoundForOrigin('f', sameOrigin);
+        t.done();
+      });
+    }, 'test <img src=[url]> via JS for same origin img');
+
+    promise_test(async t => {
+      const promise =  loadSharedStorageImage({
+        key: 'h', value: 'i',
+        hasSharedStorageWritableAttribute: false,
+        isSameOrigin: false,
+      });
+      promise.then((img) => {
+        verifyKeyNotFoundForOrigin('h', crossOrigin);
+        t.done();
+      });
+    }, 'test <img src=[url]> via JS for cross origin img');
+  </script>
+</body>
diff --git a/tests/wpt/tests/svg/linking/reftests/view-viewbox-override.html b/tests/wpt/tests/svg/linking/reftests/view-viewbox-override.html
new file mode 100644
index 00000000000..83976f4d136
--- /dev/null
+++ b/tests/wpt/tests/svg/linking/reftests/view-viewbox-override.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>'viewBox' from referenced &lt;view> element</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/linking.html#LinksIntoSVG">
+<link rel="help" href="https://svgwg.org/svg2-draft/linking.html#ViewElement">
+<link rel="match" href="../../struct/reftests/reference/green-100x100.html">
+<object style="height: 100px; background-color: red"
+        data="data:image/svg+xml,
+              <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 100'>
+                <rect width='100' height='100' fill='green'/>
+                <view id='aspect' viewBox='0 0 100 100'/>
+              </svg>#aspect"></object>
diff --git a/tests/wpt/tests/tools/certs/cacert.key b/tests/wpt/tests/tools/certs/cacert.key
index 39a1bf60a78..2bfd999b64a 100644
--- a/tests/wpt/tests/tools/certs/cacert.key
+++ b/tests/wpt/tests/tools/certs/cacert.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIjHFNizMFnigCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMHkdsnaSMH7BIIEyBv07wsA9kBS
-Y64dr+vX2SHx1yY1HsI0u39L9OnIGcjSjqnXxNTRsHom4hf/18SCeo9hEDjpOWO2
-3arTVWLf4xRgGlS7rvbZuQlBXjFoVhm0hpDugy20vU8PZO+aWg4Hc5b2bMQgX0Jx
-4Q2P+5V+CK/PfBCtmLqVWw7WzbFMObOH1wDKFJsfPZqfaTjJVz/FvTqwXTkvmdgv
-5jF/jD9HzOu70C0Mxo/cqciWatBvs4bevQZgdB+kLygrefoypsQTseQfnwHrdHfZ
-XEtlWY8Stvrxc5a/+yRJaF8PF6wbhIgKN7IvZO08Ph2Ay8ssiCS0iX8eMLqSpVVG
-3+Hd5EyyGGXVTUaSITACRgzJRg79dn4ij2mVCAgItsuDZJcZ4USnrTLDEj6hjz3j
-v0Ii/y2s6F3tq1ExrzPey3W49Cwvq1pZKHDxmaLD6qPVFbwAV76+gB4tNUyx47s6
-Iv9+1k+M1d40IFZ5/xfMb07JCyFMtfHuW4dNcrW8YFasu4hXPzgkTlN6YMzcZrr+
-8YgqbSaKMbBTaRow3KCOSbh7LBGmSztUeimB1aU2yUcKL9L4hMcv+gITl6tENzio
-npzxSqj2IuSPMsaHyzGXhFZKqU9jP8zDF2UVfEvA46Ny20XEr9xiEkVqNZVsL8M3
-9PGCIMeF5L38jHfKbc8eV/rIeQIYEOti+e0vT0jUhFX85S0Y7pRciUbL1EkjLXRh
-lndsOyw8cJrjvjSdRPnfZrCBjr+5PtEOdMzIhEj88pceoH3dskCfovabhJICUTgp
-Y/BoHbOPdV35cJgNy38zY9BJTA3jCqvNcjomoNQ7iX5HFAw7FA4AoolpaVGoJGzd
-oDbXFzYJJq5/x+9whY5xnesv3zUvVjM8e62mt30nnB9EJg6EtivwIV2Kwvz0Gs5m
-IeCDkaVicmQ0IY2MJkTQm0cxq78PC9Acji4krJHDkeh0F2tv7t9OEv6D69rqgY7Q
-hqIQSMEVJFvihTKD1oGxzngeCRpsrjvnrVK+oNFD43QRYU3/OoO0EMKHkuOMlexK
-l28IOHvrYogw6nBX5bUGqx3N8XXvT5WHxxH4/3UALyJYVc/Niox5PRb9FbP7OIkf
-+/8EEJQlh0jLqJvB6jRUTTusc4/S7bCLWqGuj9KeH4rYnfzDieNJc4w6n6fafas+
-hYTSqz08SJIz7Bj/lZvXkVZQWwlWpUq2PzTeflGazAkhmnBcisz7NkikwCkSHUem
-wykUwqiQDdeyZ8nOjOJYIrilYiAciNT/3M2OvKS3lX6lArkhlFPLrd5nSC/A34fC
-tA6g2LY81DK6EXLrvjV1J1Rk9/QnmpLLqXTR5bWtjFUL+OeYolju1dRjZMns1hws
-MLwympcF2QzCZRLPAom9QOpHEB1kcc5kpovJWFEKSx/vOKtbBb1SP+TdrwZmjuQe
-yRo67OEYZl8CU/0dRmdTBn8mDZ2JvUvGWE2cwt4Sr1OjrV3THvR53NubPW9cnl86
-fvxA9Z8i9woxm7145iHkQI9A2UDvwXJBYygObmf4w73kFog0uPZszEyjWxhwRHlI
-tALvx2eo8onz4w+Pv0WhpeAyPkUP9xNH53LzMKwhBheLIUmgXwuKksis+HDeKLSc
-UmIQjHnnIJBz35ME536TBQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIesNOadYpVBkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH8qbBfjkDSHBIIEyIsJK4OoIxiW
+sjNIuMr4mv0JNr5C2fPCodKQjm+iBFOAoWmkQ/tXATJdTkchmwRfG1ydaRwFLg0c
+u9YH01LD09JjGhOuCOvC2EuPMDEUN1zJTimZhk/HeEO0SIlHyq4L+ApYPtEQwQeZ
+sM8qWXyvSpjsoZJV29lwVmzOiO/9xhebvHLOMZKEugjuqDTuchHfX1guTuTIIg6T
+uj9CcmuUYPm6R8teZXkw9eSh+x8ztvn7q0SC/vcpGpyLqyu61MlbW5E33pKqMwiv
+urH87GyxkOZUrO/qhJkgy8SpT6aOQDTS5rnjCSGYpXpTXzdhZFuNtN5nkO6H3qQL
+Pk98EwTGxhH+eaKWqOd3rSGUJYGnqlV+YcK2R80ua6bhj0KoMNyLq9Ga/8eYaCVE
+VQjwBFzAr3NLx/kP2YYXEN34uOQyeuRnghAI0iToLhs7cL/+CVu6g9EEkCfREZ1a
+ipgdfraU4nbswSauc1NiaUX5l5myT/X19gwpxlVqQwG/UgExdI9VGqPDc+t9qSch
+FH2a0r/Ll98IPXHOdnlaPsTvI33V6cFfZwFdUnpH5ESSINQi5tjFH5iyIK9xDr5V
+S3Rm5d3CWaTabJx+hADilGzT77pruHji77Xug0blpbiA0Lp58G++U3cBwiOI5odO
+h/G7jaNE2Owrfla6p1fpWhfZhHUiQDoE6sBHuPA3t1gP8oQTLmSEY/0Kr7UZUGZk
+AHIyVymXFIhpn6spCnBzDgSrsQlFvJuQalbOQIfuCZ/5Gp6+IrJRSawzxzZaVvG0
+PYrB3cQ4w2fMJrtmHBHThebNOlXIXsgAyOr8lpzlrdhHfSJWPwaN+KftyMno9PFR
+J3K4Oay1SHJx7GfnZ7naD53YzekxxEfLFEFYg89Z+EMo2gDVX+v+tLqeQyX0/egz
+jk+EBQHBSaS+sZiw31+kebzZenbrvog9BhMFD0hhiSpA1zGOHND+zY5itxSWXUk7
+fm6FAKOGgQ7lJG0hCHUDoMPMQpXkp/txhcf7gV5WpO4WaCi3Scoo2EFqty/cBibK
+t0HU1yHqU6rAhab1QIsI2PtVL/Qfwx9dsTNKuOACRs9gA+RGZYncDnVv6nLLlUTd
+ARps6JK6dGL4owzkyXKjK7L7Gw7SrChfNHgYlsJ6ktLvlRPVYpHPH5VeLWgyYR4n
+uQiVgHfqGygd8abZEI3kFL+qI8HNIuXaGtRs9kZMfybUZJV9s5sS2XAw7bFlujqq
+XpC1EJZtZtwkKIWDtiFS7E/Q+uWzxLWUP5qF2io3Rs5gUhRB+ep4nqiSsdNu/Ijb
+tPNhpIwnLsFCriaIAMsQ/4hGbCBCCuZmY6917FIwEtZDTAb04ro2NYOhP7LvpiiH
+PRsFNom5aRyhEx/xXOO933rBuhNi7U5EbyDwviaUi7ETij6QGTXd/iI04Er29QDw
+hFemoi/gkW3j3/YMQE7ylbUoWgcEet1BJPeAGBTJ3JpAXdXBLfU7wLnJkhWUv8iS
+ZVn9Gub8Pu2vRqp9REU0jKJqW9F/1zZKi30BfWCs0yy5o2IfNEjlUQwokYb2nHDF
+ITy5LdUd2JqvpbBrPGgc6mTLfr7SpBY3+EA7RwDUFteNXPjnjr4T2rGiYykbsSr/
+a/aqz8EPgvjZOHDxcCBRiw==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/cacert.pem b/tests/wpt/tests/tools/certs/cacert.pem
index 79bf67fe512..f698a351d65 100644
--- a/tests/wpt/tests/tools/certs/cacert.pem
+++ b/tests/wpt/tests/tools/certs/cacert.pem
@@ -1,125 +1,125 @@
 -----BEGIN CERTIFICATE-----
-MIIW5zCCFc+gAwIBAgIDBwluMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA1MTIwMDU3MzFaFw0yNDA1MTEwMDU3MzFa
+MIIW5zCCFc+gAwIBAgIDBmgJMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA4MTIwMDQ1MzZaFw0yNDA4MTEwMDQ1MzZa
 MB0xGzAZBgNVBAMMEndlYi1wbGF0Zm9ybS10ZXN0czCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALGQERXCyZ4A9Ptm/ykUNcakBY1e02WQWcGjIQBEI15X
-HdGBoloXg+Nz1Q9yPNtJX4Iy+RUaOEQ+OROMeIytk3pLreNLT6U7b7aaLMYGNltO
-ldfwecpOTJpowt6npqXfGXfYZg87GQnft15eowH7RGC7MRS/6jtatqfHq3A3gq27
-u/R67V9YnnMhPd0JkFQ55Rwfaq/ekNlpH8zEHaz4Nm78ztUXEHbjemsMq78dt1QI
-hWFCxBUsaL7SQsSV9mXdhxTjsfMARWQKjAKVGudaBbCCQ53R+oTkItykW1n6oDAr
-AjBGz9j8LlxEAvpJKwEQegoPKLkKWiuYULJhMxtoZU0CAwEAAaOCFC4wghQqMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFPESRpt+4PjsmOP+jnFDhkkg+KTlMEcGA1Ud
-IwRAMD6AFPESRpt+4PjsmOP+jnFDhkkg+KTloSGkHzAdMRswGQYDVQQDDBJ3ZWIt
-cGxhdGZvcm0tdGVzdHOCAwcJbjALBgNVHQ8EBAMCAgQwggoFBgNVHR4Eggn8MIIJ
-+KCCCfQwE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVbm90LXdlYi1wbGF0Zm9ybS50
-ZXN0MBeCFXd3dy53ZWItcGxhdGZvcm0udGVzdDAYghZ3d3cxLndlYi1wbGF0Zm9y
-bS50ZXN0MBiCFnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwG4IZd3d3Lm5vdC13ZWIt
-cGxhdGZvcm0udGVzdDAbghl3d3cud3d3LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3
-dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cxLndlYi1wbGF0Zm9y
-bS50ZXN0MByCGnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzIud3d3
-LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0
-MByCGnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzEud3d3Mi53ZWIt
-cGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwHYIb
-d3d3Mi53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3MS53ZWItcGxh
+BQADggEPADCCAQoCggEBAM3mSDwW7plqJ78BOxRgptVkADl0EM2SvRTKGYDoBHLX
+grogviXHsAud4MzZdHa0WuQ7sWTyANLl7sinORE5yG+UWCU7p7DsLuAbn4X5gfDv
+AiQJ+4eZP3/GYS4czjSkX/1Gg7+nxIhKI0hRZdIzv2/etGm+1cBNxiQSf5GcyQrF
+y4iWNcQqBkBXKZalfF68n8uB77s+IlwEzJE+3Q1BXjOG6C3KcoBM6QVKS6iSQVsh
+0bFc/M6eqPn1r87LTIP35PewE8AgA/n9lDcV6ITFB/p8AypJFsY/v0BHP8t8Ua3y
+1/lg5/vXvC1ARIiDsJWirRfywRLTCX2cCIsUSIaqdM8CAwEAAaOCFC4wghQqMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFBPyid267eESVzsJ+HDXeY4gCT1wMEcGA1Ud
+IwRAMD6AFBPyid267eESVzsJ+HDXeY4gCT1woSGkHzAdMRswGQYDVQQDDBJ3ZWIt
+cGxhdGZvcm0tdGVzdHOCAwZoCTALBgNVHQ8EBAMCAgQwggoFBgNVHR4Eggn8MIIJ
++KCCCfQwE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVd3d3LndlYi1wbGF0Zm9ybS50
+ZXN0MBeCFW5vdC13ZWItcGxhdGZvcm0udGVzdDAYghZ3d3cyLndlYi1wbGF0Zm9y
+bS50ZXN0MBiCFnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwG4IZd3d3Lnd3dy53ZWIt
+cGxhdGZvcm0udGVzdDAbghl3d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3
+dzIud3d3LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEud3d3LndlYi1wbGF0Zm9y
+bS50ZXN0MByCGnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cx
+LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0
+MByCGnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3MS53ZWIt
+cGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwHYIb
+d3d3MS53d3cxLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3Mi53ZWItcGxh
 dGZvcm0udGVzdDAfgh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdDAggh53
-d3cud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3Lnd3dzEubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0MCCCHnd3dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
-dDAggh53d3cxLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIeeG4tLWx2ZS02
-bGFkLndlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRm
-b3JtLnRlc3QwIYIfd3d3MS53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAhgh93
-d3cyLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzIud3d3MS5ub3Qt
+d3cyLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIeeG4tLWx2ZS02bGFkLndl
+Yi1wbGF0Zm9ybS50ZXN0MCCCHnd3dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVz
+dDAggh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3MS53d3cu
+bm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRm
+b3JtLnRlc3QwIYIfd3d3Mi53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAhgh93
+d3cxLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzIud3d3MS5ub3Qt
 d2ViLXBsYXRmb3JtLnRlc3QwJIIieG4tLWx2ZS02bGFkLnd3dy53ZWItcGxhdGZv
 cm0udGVzdDAkgiJ4bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCSC
 Ind3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02
 bGFkLnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3MS54bi0tbHZlLTZsYWQu
-d2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRm
-b3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3Qw
+d2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBsYXRm
+b3JtLnRlc3QwJYIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3Qw
 KIImeG4tLWx2ZS02bGFkLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKIImd3d3
-LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYInd3d3Mi54bi0t
-bHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3d3dzEueG4tLWx2ZS02
-bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid4bi0tbHZlLTZsYWQud3d3Mi5u
-b3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02bGFkLnd3dzEubm90LXdl
+LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02
+bGFkLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3huLS1sdmUtNmxhZC53
+d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid3d3cxLnhuLS1sdmUtNmxhZC5u
+b3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYInd3d3Mi54bi0tbHZlLTZsYWQubm90LXdl
 Yi1wbGF0Zm9ybS50ZXN0MCuCKXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
 bGF0Zm9ybS50ZXN0MC2CK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBs
-YXRmb3JtLnRlc3QwL4IteG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3LndlYi1w
+YXRmb3JtLnRlc3QwL4IteG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1w
 bGF0Zm9ybS50ZXN0MC+CLXd3dy54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWIt
-cGxhdGZvcm0udGVzdDAvgi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2Vi
-LXBsYXRmb3JtLnRlc3QwMIIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3MS53
-ZWItcGxhdGZvcm0udGVzdDAwgi53d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
-LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3
-dzIud2ViLXBsYXRmb3JtLnRlc3QwMIIud3d3MS54bi0tbjhqNmRzNTNsd3drcnFo
+cGxhdGZvcm0udGVzdDAvgi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cud2Vi
+LXBsYXRmb3JtLnRlc3QwMIIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi53
+ZWItcGxhdGZvcm0udGVzdDAwgi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cx
+LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYy
+OGEud2ViLXBsYXRmb3JtLnRlc3QwMIIud3d3Mi54bi0tbjhqNmRzNTNsd3drcnFo
 djI4YS53ZWItcGxhdGZvcm0udGVzdDAxgi94bi0tbHZlLTZsYWQueG4tLWx2ZS02
-bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDAzgjF3d3cueG4tLW44ajZkczUzbHd3
-a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDOCMXhuLS1uOGo2ZHM1M2x3
-d2tycWh2MjhhLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyd3d3MS54bi0t
-bjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyd3d3
-Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3Qw
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDAzgjF4bi0tbjhqNmRzNTNsd3drcnFo
+djI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDOCMXd3dy54bi0tbjhqNmRz
+NTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyd3d3MS54bi0t
+bjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyeG4t
+LW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3Qw
 NIIyeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3MS5ub3Qtd2ViLXBsYXRmb3Jt
-LnRlc3QwNIIyeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3QwOII2eG4tLWx2ZS02bGFkLnhuLS1uOGo2ZHM1M2x3d2tycWh2
-MjhhLndlYi1wbGF0Zm9ybS50ZXN0MDiCNnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
-LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdDA8gjp4bi0tbjhqNmRzNTNs
+LnRlc3QwNIIyd3d3Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3QwOII2eG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2ZS02
+bGFkLndlYi1wbGF0Zm9ybS50ZXN0MDiCNnhuLS1sdmUtNmxhZC54bi0tbjhqNmRz
+NTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdDA8gjp4bi0tbjhqNmRzNTNs
 d3drcnFodjI4YS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDyC
 OnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
 YXRmb3JtLnRlc3QwQ4JBeG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLW44ajZk
 czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3QwR4JFeG4tLW44ajZkczUz
 bHd3a3JxaHYyOGEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0
 Zm9ybS50ZXN0MBMGA1UdJQQMMAoGCCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiC
-EXdlYi1wbGF0Zm9ybS50ZXN0ghVub3Qtd2ViLXBsYXRmb3JtLnRlc3SCFXd3dy53
-ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53
-ZWItcGxhdGZvcm0udGVzdIIZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3
-Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRl
-c3SCGnd3dy53d3cxLndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxh
-dGZvcm0udGVzdIIad3d3Mi53d3cud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3
-LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIb
-d3d3MS53d3cyLndlYi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRm
-b3JtLnRlc3SCG3d3dzIud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cx
+EXdlYi1wbGF0Zm9ybS50ZXN0ghV3d3cud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13
+ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53
+ZWItcGxhdGZvcm0udGVzdIIZd3d3Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Mi53d3cud2ViLXBsYXRmb3JtLnRl
+c3SCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxh
+dGZvcm0udGVzdIIad3d3Lnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCGnd3dy53d3cy
+LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIb
+d3d3Mi53d3cxLndlYi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzIud2ViLXBsYXRm
+b3JtLnRlc3SCG3d3dzEud3d3MS53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cy
 LndlYi1wbGF0Zm9ybS50ZXN0gh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
-dIIed3d3Lnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cud3d3MS5ub3Qt
-d2ViLXBsYXRmb3JtLnRlc3SCHnd3dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
-dIIed3d3MS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQu
+dIIed3d3Mi53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQu
+d2ViLXBsYXRmb3JtLnRlc3SCHnd3dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVz
+dIIed3d3Lnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qt
 d2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRl
-c3SCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5u
+c3SCH3d3dzIud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5u
 b3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3Jt
 LnRlc3SCInhuLS1sdmUtNmxhZC53d3cud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1s
 dmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInd3dy54bi0tbHZlLTZsYWQu
 d2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9y
-bS50ZXN0giN3d3cxLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIIjd3d3
-Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53
-d3cxLndlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWIt
+bS50ZXN0giN3d3cxLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIIjeG4t
+LWx2ZS02bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCI3d3dzIueG4tLWx2ZS02
+bGFkLndlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWIt
 cGxhdGZvcm0udGVzdIImd3d3LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3Jt
-LnRlc3SCJ3d3dzIueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIn
-d3d3MS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid4bi0tbHZl
-LTZsYWQud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53
-d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYy
+LnRlc3SCJ3huLS1sdmUtNmxhZC53d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIn
+eG4tLWx2ZS02bGFkLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhu
+LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYy
 OGEud2ViLXBsYXRmb3JtLnRlc3SCK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQu
-d2ViLXBsYXRmb3JtLnRlc3SCLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53
+d2ViLXBsYXRmb3JtLnRlc3SCLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
 ZWItcGxhdGZvcm0udGVzdIItd3d3LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndl
-Yi1wbGF0Zm9ybS50ZXN0gi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2Vi
-LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2Vi
-LXBsYXRmb3JtLnRlc3SCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
+Yi1wbGF0Zm9ybS50ZXN0gi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cud2Vi
 LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2Vi
+LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2Vi
 LXBsYXRmb3JtLnRlc3SCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
+LXBsYXRmb3JtLnRlc3SCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
 LXBsYXRmb3JtLnRlc3SCL3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0gjF3d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90
-LXdlYi1wbGF0Zm9ybS50ZXN0gjF4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cu
+Yi1wbGF0Zm9ybS50ZXN0gjF4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0gjF3d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEu
 bm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ3d3cxLnhuLS1uOGo2ZHM1M2x3d2tycWh2
-MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIIyd3d3Mi54bi0tbjhqNmRzNTNsd3dr
-cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2ty
-cWh2MjhhLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ4bi0tbjhqNmRzNTNs
-d3drcnFodjI4YS53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdII2eG4tLWx2ZS02
-bGFkLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gjZ4
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3Jt
+MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIIyeG4tLW44ajZkczUzbHd3a3JxaHYy
+OGEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2ty
+cWh2MjhhLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2
+ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdII2eG4tLW44ajZk
+czUzbHd3a3JxaHYyOGEueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gjZ4
+bi0tbHZlLTZsYWQueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3Jt
 LnRlc3SCOnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qt
 d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3dr
 cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
 cWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0
 gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBAHmWNJCj
-6J8HohdpZBK9UsU8Fs615djgKGi0s474l+2A2Ul2WxONz7XzuIRMc5qt3gbiXh7w
-ypk2BhAayyw0viUDh1AVenvUC/GD6HAW7zz7f9p02/rc4K6Jyt/5Oo8PNFzesWSs
-Mw8eTg4Y6AupFp9fKRXNkEQ7gDbqWP4UYKj1YWESRH85OsaAuyBTOnl7CdCYJHtI
-Exz3dd72SK1lq86b6IoGiW2jEY1/1GMK10Gid349qYapkYizYyaRZO16O++FXWC+
-dWH3p8FO4jgixV8aTwfgrLmx0RPNrWk6u11ePE1K2n4naruqJAONugmZG3LWGLHO
-lwo3HjEOzXXqD2Y=
+YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBADRLq9/7
+cf51ebjreSdMGetCUq2IRBsM4zVSq0TFEV0r4wSjL8snqRK98iyw/KHBwGS6XJhy
+OeIPAfkogUUliyvgj7Xy2n0CzbyLlCH8e1lqJYER9DtGVtXa6+K2dMzlWCh6kHz+
+i6axsgF4cQoPgirR3XAxM8VyJ+0GWynJ5piFhLKVG0oEOZywBofmicemAfb1R62u
+fAYLSqzizfYXBkvVSISEf4UjzK7O3P31F3IXhHhyIfZ9aZn0EyUvBauuMWeUMKQB
+G4M2A74WpWFOGBKhCCmmR5q6lZt+mAVQMdBAOXpTkOPByWilzitXruh3tLDkS3B6
+vGgUAnQOM955NiY=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.key b/tests/wpt/tests/tools/certs/web-platform.test.key
index f1eb177cad2..ae07ef896c1 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.key
+++ b/tests/wpt/tests/tools/certs/web-platform.test.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC2skGFCv8b3v+p
-KSbn/2RpcWzUab1/gbRgydfidP762Ltsj5L+tuaHtdzvqt7a1ySc3fwDr49qJtxc
-WZrFKl7xecKA847isx1WoPm+fmAwaLQPqQlH+hgTrAfrofN22FPewaKz+XCeGIIR
-bnipZssv0Td3o1C5sYVmhdsoKRWnF90RNXUCtJ1GcrtnDxuaYY/l++n3Hx37nUQt
-iw2IC7fqfCPMsFOGiPefskVuNoUDXyBhTd0rZWEXqU/qrxhljkRFUVq8ILWw6Ie1
-Bgst+HUW8Sp0Dir2VRcpYoIMWF4NY7TyeC39xWz4FGoCGiM3NdWNCDyfOqzDKFeu
-a1Dr3AjhAgMBAAECggEBAKxK7Uk3tqAlLHvuSDev/ZUHF7g2RDR0MJS6pXJ2HWSZ
-ch+OQvUdrcg8NTB8txAwpuGc4ybisOBN57Db+/6G1+TojAqqJo0al8dzpjME4Vel
-1nGSWyNa8svSh+Gq6HyixG2ltPf/fDpMKJWh1f8D5wigSKv2A5IrnP+zqpt0K2xY
-ltDiuMCjLO86TMeQDBA/KDL2fw4VObDjuA7H1IBRWJvC/n1Js/Am/y+FKOUA/aMW
-x4lgDhx2ISoti9uS6EfKxMb5Tj4FEXVDgmqETW7k4mhZN/LynBKeJ+Cl/2VpyqnO
-1+EFVqcHnaZSttqoUQlSiR2E37Qry9PV4tm4vUkMsAECgYEA6Y/l/52dHpe8A4AE
-t3lT0RxHypJtN36L30f7xPXSYGu8q/2QpPHESgSEsEa9OxAgHHPjj/F0SMu+BXBo
-MeO57gbTEidqRbS1zOdnzWtFNECwZV0T80rXt8awuGH+hbzDUcjHW50s9Wh1jaMW
-5xeuEKU5YuxPFx7qu8acG5jWCmECgYEAyD9kNBkUxWotofqpiOWfXJZjjiuaj48E
-l1t8DxuXhjRlPIB8Z7k3+rEgGkeBOw4UsX3SUbbVCLRe4Qye/G6sFg0xtEgJpkHW
-uCTVohrzGhQmPA+7Cu0pQOvmlh60bFh1ATU1ePxrMyWZUFn2d1XdD4ZERdCUWC/2
-OM7wIzyfjoECgYEA3vWxV/y8GpI6txSkbAl0S/C1T9nMTOeO2s06uOD5vXXbnEvo
-oqzw9r+tcyF0T0erf73ZhHW4zi1A7qxJqyZ7PZBiObhKqNRDoKFe5Cf83k7KlVjv
-TJcrqpIP7VQOxthVlGMYfIpkerkHTvhbSqu+TMGNMLPpJGctKagFKgsSeMECgYAz
-OBuuQ7gPYsA3TUEt9eXULddbFwYasC8xc8IAr0MLnb1DQ24Orc6GveWDM0T30Ps0
-BwXTxtsotdIK6EqGMNyta0SKY16seuyr/yfxpckGo57AABoMimrh4zUAsuvdRqbu
-3yhFQPM+iuBzL/+duIWpoeM2pEo9YE8vaqb7rFb3gQKBgQCYRw+PH0k1Lp0Z2Z4H
-2Nb2C25GoNHc5QA4au2ST3mKhlaqLYZqrg9yR58jR2IgD55xBQrmhxm6CyL/6Owa
-26G2LRzj55FHIPVssnfgtVGUEEmiGxdpL6Q7nEue+2kvoAsdYql1JPavTCuTJCmj
-pXFkinopUTpVFlVtXF5asrvU1w==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCo+KBRak1wDwph
+yImIneMMr/QDWXuBxIQlvlDVczGR3/p73qcT3UNBe+bKDNFcOujJ/S8oRdDswnPA
+Fw8zBgmq9+7md5KSawX6ehLPaubPgOrdvZ4h7Fyzg0C0X3Erjq6ZZdqsKBlDKO2s
+rxvB36+FfgsZNqeYnwhUwUKGQihPbZehdM0elcYpT9fLQSU/wXkVSuitOTevUQMF
+aX/mvEhHgYcPUywf3zzqEaJbl4swet4JmcfNZYpiaLozwWJA64BDBEzt6pjssQMx
+FAdKoU6BEfDUvIphXAwmX5DIb6ZolR8To/abPIEgmMhkmRpMhHs37+TRxOWacBbN
+1VSu43lrAgMBAAECggEBAJcckrN87/gRW2WLpIQLP2yvRvhf5DZvewcOJthdhq1A
+s5Bn1N/M90Lu/b0grXNgM6PAy5WmqmuykzXs6WjmM2s1A/AUa36KO/R/i6b3oadd
+Ua4wz+TirxzTeuBUoq8jkT4aeu+PhNgtGDFhAN/nnd8yk9ZerI+vWhICK+5J6Cbv
+FbPFF9uL/OKxNQPD/f1ScDKOdcvNwcYkZIRbTYiO/WaQqhQ+N3EG1eR6QHA8Xj29
+FZxgbH0GZysZ9D2/u3nTZ9u+n7D2rGmjPOJ6nRWsju6fQJZP7RFlfLu1C2MLlpdN
+ewEVriSRfJqYEx9tWAMUi6X5bEkz1zeu8HLMP1LvDNECgYEA0QF1fnludQckpuMY
+itX4ALyG5rE4deSWy4g544B6/N1xx4kQfL1iE7Fyfqv75YliexoY4XBiGh06bDaH
+gtaLn/NhD0GgBfBozTuXBNemFk4e6rChSBHHVenQ0WUcPusQ8J4WFSyfLbZ81Yj3
+8+kpNdHOwyoItNeYVKvbTdi6f+cCgYEAzva/h4d/G+Lnf9IvE9D/Xx0ZDp11VAK7
+N+5mzbsIaGa93ZJDFpvzgidZuuzZvQmpyVaBkZgq8wdNCizV9z1ffkPi0mZ5Ulk9
+hBelqt9U97K3jgJrWcljpI8aMOQEGmKQ/Jfh8GC3uFQ9oEXPXUOVEnVwPa04eLpc
+GFRBof6+md0CgYBZcGNkLPi8scLYe8QL3YaUYhjkbaA4qwpwrKoBFgELZoQDHD9m
+8fAfd0cEt/pCfqka/s744gvJGwreNfOFZOQ5HYBCdBXTlM50TPTSSKo1T1bhnZZW
+7ey8ciM/CCKvNg54uV2/z+mKOVZwVn2s7fEJq+/sCnfRU5VHXoepZ35frwKBgHAN
+4pcjgmt7x7FKAFkvUASUQYvLLsokjG708c4zlJLKBcRgO1iTaR0v5wIw2JbkE3xC
+DPbiN2bLridzLQmmvfwkDzuxZcBzNr48+2JvdpaBuaX2o17CjeN740dTPPF4Kl3I
+cfjutKnlWlRbV7F8NMsAsJuEHM4owFIf1EU8IsA1AoGAMN2S5kcmdMXGTrKk1EU0
+eFaFvVnXkqSFcZ+jAzeIutG9HpywpOhcIki5KveLSu6Cq4k4Y3RjnTbzfm+jlFoq
+0Q95PMTLdrHA3+EPR1GZHG0N08C/SyNpKiSuOYfSWjc1+qDZ1K6PSoRseCjkL45c
+ByqDG0VTRllPB/tjcyEinrk=
 -----END PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.pem b/tests/wpt/tests/tools/certs/web-platform.test.pem
index 7063a254dd6..6f843553160 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.pem
+++ b/tests/wpt/tests/tools/certs/web-platform.test.pem
@@ -1,133 +1,133 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 461167 (0x7096f)
+        Serial Number: 419850 (0x6680a)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=web-platform-tests
         Validity
-            Not Before: May 12 00:57:31 2023 GMT
-            Not After : May 11 00:57:31 2024 GMT
+            Not Before: Aug 12 00:45:36 2023 GMT
+            Not After : Aug 11 00:45:36 2024 GMT
         Subject: CN=web-platform.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:b6:b2:41:85:0a:ff:1b:de:ff:a9:29:26:e7:ff:
-                    64:69:71:6c:d4:69:bd:7f:81:b4:60:c9:d7:e2:74:
-                    fe:fa:d8:bb:6c:8f:92:fe:b6:e6:87:b5:dc:ef:aa:
-                    de:da:d7:24:9c:dd:fc:03:af:8f:6a:26:dc:5c:59:
-                    9a:c5:2a:5e:f1:79:c2:80:f3:8e:e2:b3:1d:56:a0:
-                    f9:be:7e:60:30:68:b4:0f:a9:09:47:fa:18:13:ac:
-                    07:eb:a1:f3:76:d8:53:de:c1:a2:b3:f9:70:9e:18:
-                    82:11:6e:78:a9:66:cb:2f:d1:37:77:a3:50:b9:b1:
-                    85:66:85:db:28:29:15:a7:17:dd:11:35:75:02:b4:
-                    9d:46:72:bb:67:0f:1b:9a:61:8f:e5:fb:e9:f7:1f:
-                    1d:fb:9d:44:2d:8b:0d:88:0b:b7:ea:7c:23:cc:b0:
-                    53:86:88:f7:9f:b2:45:6e:36:85:03:5f:20:61:4d:
-                    dd:2b:65:61:17:a9:4f:ea:af:18:65:8e:44:45:51:
-                    5a:bc:20:b5:b0:e8:87:b5:06:0b:2d:f8:75:16:f1:
-                    2a:74:0e:2a:f6:55:17:29:62:82:0c:58:5e:0d:63:
-                    b4:f2:78:2d:fd:c5:6c:f8:14:6a:02:1a:23:37:35:
-                    d5:8d:08:3c:9f:3a:ac:c3:28:57:ae:6b:50:eb:dc:
-                    08:e1
+                    00:a8:f8:a0:51:6a:4d:70:0f:0a:61:c8:89:88:9d:
+                    e3:0c:af:f4:03:59:7b:81:c4:84:25:be:50:d5:73:
+                    31:91:df:fa:7b:de:a7:13:dd:43:41:7b:e6:ca:0c:
+                    d1:5c:3a:e8:c9:fd:2f:28:45:d0:ec:c2:73:c0:17:
+                    0f:33:06:09:aa:f7:ee:e6:77:92:92:6b:05:fa:7a:
+                    12:cf:6a:e6:cf:80:ea:dd:bd:9e:21:ec:5c:b3:83:
+                    40:b4:5f:71:2b:8e:ae:99:65:da:ac:28:19:43:28:
+                    ed:ac:af:1b:c1:df:af:85:7e:0b:19:36:a7:98:9f:
+                    08:54:c1:42:86:42:28:4f:6d:97:a1:74:cd:1e:95:
+                    c6:29:4f:d7:cb:41:25:3f:c1:79:15:4a:e8:ad:39:
+                    37:af:51:03:05:69:7f:e6:bc:48:47:81:87:0f:53:
+                    2c:1f:df:3c:ea:11:a2:5b:97:8b:30:7a:de:09:99:
+                    c7:cd:65:8a:62:68:ba:33:c1:62:40:eb:80:43:04:
+                    4c:ed:ea:98:ec:b1:03:31:14:07:4a:a1:4e:81:11:
+                    f0:d4:bc:8a:61:5c:0c:26:5f:90:c8:6f:a6:68:95:
+                    1f:13:a3:f6:9b:3c:81:20:98:c8:64:99:1a:4c:84:
+                    7b:37:ef:e4:d1:c4:e5:9a:70:16:cd:d5:54:ae:e3:
+                    79:6b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                55:E3:89:23:FF:B4:2F:9B:59:D4:B8:B7:E4:0D:C2:9A:61:86:2D:A6
+                3F:99:A2:8E:CA:F2:40:25:E7:B8:79:FA:B2:6D:09:FF:51:B9:A5:8F
             X509v3 Authority Key Identifier: 
-                keyid:F1:12:46:9B:7E:E0:F8:EC:98:E3:FE:8E:71:43:86:49:20:F8:A4:E5
+                keyid:13:F2:89:DD:BA:ED:E1:12:57:3B:09:F8:70:D7:79:8E:20:09:3D:70
 
             X509v3 Key Usage: 
                 Digital Signature, Non Repudiation, Key Encipherment
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
             X509v3 Subject Alternative Name: 
-                DNS:web-platform.test, DNS:not-web-platform.test, DNS:www.web-platform.test, DNS:www1.web-platform.test, DNS:www2.web-platform.test, DNS:www.not-web-platform.test, DNS:www.www.web-platform.test, DNS:www.www2.web-platform.test, DNS:www.www1.web-platform.test, DNS:www2.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:www1.www.web-platform.test, DNS:www1.not-web-platform.test, DNS:www1.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www.www.not-web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www1.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
+                DNS:web-platform.test, DNS:www.web-platform.test, DNS:not-web-platform.test, DNS:www2.web-platform.test, DNS:www1.web-platform.test, DNS:www.www.web-platform.test, DNS:www.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:www1.www.web-platform.test, DNS:www1.not-web-platform.test, DNS:www.www1.web-platform.test, DNS:www.www2.web-platform.test, DNS:www2.not-web-platform.test, DNS:www2.www1.web-platform.test, DNS:www1.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www.www.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
     Signature Algorithm: sha256WithRSAEncryption
-         a7:2c:41:42:13:d2:c0:0a:e5:f4:84:9e:b9:47:50:ed:b4:a8:
-         09:41:c8:8c:3b:cc:a9:03:9f:6d:f8:7b:d2:e5:d9:87:55:a1:
-         7a:00:9b:2c:5a:3a:c7:46:4d:02:9b:16:10:02:4c:0d:a5:68:
-         e2:79:07:21:a4:8e:42:51:ae:80:ab:f8:f8:34:5f:02:0b:72:
-         66:18:3c:e3:da:98:f9:4c:70:19:5f:61:c2:49:9b:86:46:8c:
-         5f:92:b4:3e:49:ef:d4:a7:f7:7c:0b:fc:b0:fb:7d:ec:73:5d:
-         a9:5a:58:47:b8:11:60:1b:43:2c:47:da:15:9e:6c:db:35:cc:
-         d8:f4:f4:99:11:94:e6:8e:bf:06:66:81:28:99:25:5e:e6:01:
-         2b:16:c0:50:43:8a:12:04:c4:5d:6b:fa:8b:dd:ca:98:bc:7a:
-         85:3a:c2:10:74:f2:e9:e6:b1:a7:bd:a7:d5:99:33:3b:15:e7:
-         24:e4:d7:d8:9b:9d:84:60:e8:fd:17:4a:63:01:33:ad:30:e6:
-         ec:b0:aa:7b:31:f2:83:3c:6e:d9:3b:7c:02:e6:64:a3:c2:ee:
-         88:1c:4b:43:bc:de:0b:94:2a:cb:7e:1b:ba:10:01:01:e0:a7:
-         d2:19:fd:1b:fe:43:df:0e:7b:e4:2f:25:12:99:b4:d5:c7:63:
-         fa:d1:de:cf
+         5f:75:75:27:16:7c:d4:f8:7d:8d:09:54:98:3d:92:8f:a4:2f:
+         e4:69:cc:ae:a8:af:88:e9:d2:53:29:35:78:f8:38:a0:f9:7a:
+         19:65:01:ad:b4:83:2f:c5:4f:5e:a3:08:5a:fb:52:f1:a7:79:
+         8d:cc:18:42:4d:df:1f:e1:8a:8e:c3:75:ec:cc:66:40:1f:c5:
+         15:be:03:79:d2:7e:93:80:ef:75:5c:7f:71:eb:c5:45:0f:08:
+         82:5f:ca:ba:7b:56:98:b4:64:ff:54:43:9c:99:cb:31:5c:21:
+         9e:88:37:2e:41:59:e4:59:1a:0f:6d:05:58:84:e4:b9:c7:ed:
+         6c:f7:b3:75:bf:18:31:00:d6:9a:cf:60:07:74:cb:81:ec:d8:
+         a3:91:96:77:36:04:aa:93:2f:4d:28:6f:20:94:43:57:0c:83:
+         b5:26:e5:68:c0:2b:b9:20:49:34:10:bf:71:6d:78:ef:35:a0:
+         bf:df:1c:d7:29:ec:af:d8:ac:9b:f0:14:80:1b:03:dc:9c:d6:
+         25:29:ff:86:31:b5:55:c0:7b:6d:a7:73:02:74:06:ea:83:64:
+         f6:7f:3b:83:9b:08:36:cc:77:58:75:e5:4c:73:e5:bf:0e:fb:
+         f1:65:83:e9:a9:2b:db:71:93:61:a5:ce:46:aa:c8:34:01:e9:
+         a8:20:1d:09
 -----BEGIN CERTIFICATE-----
-MIIMsjCCC5qgAwIBAgIDBwlvMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA1MTIwMDU3MzFaFw0yNDA1MTEwMDU3MzFa
+MIIMsjCCC5qgAwIBAgIDBmgKMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA4MTIwMDQ1MzZaFw0yNDA4MTEwMDQ1MzZa
 MBwxGjAYBgNVBAMMEXdlYi1wbGF0Zm9ybS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtrJBhQr/G97/qSkm5/9kaXFs1Gm9f4G0YMnX4nT++ti7
-bI+S/rbmh7Xc76re2tcknN38A6+PaibcXFmaxSpe8XnCgPOO4rMdVqD5vn5gMGi0
-D6kJR/oYE6wH66HzdthT3sGis/lwnhiCEW54qWbLL9E3d6NQubGFZoXbKCkVpxfd
-ETV1ArSdRnK7Zw8bmmGP5fvp9x8d+51ELYsNiAu36nwjzLBThoj3n7JFbjaFA18g
-YU3dK2VhF6lP6q8YZY5ERVFavCC1sOiHtQYLLfh1FvEqdA4q9lUXKWKCDFheDWO0
-8ngt/cVs+BRqAhojNzXVjQg8nzqswyhXrmtQ69wI4QIDAQABo4IJ+jCCCfYwCQYD
-VR0TBAIwADAdBgNVHQ4EFgQUVeOJI/+0L5tZ1Li35A3CmmGGLaYwHwYDVR0jBBgw
-FoAU8RJGm37g+OyY4/6OcUOGSSD4pOUwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiCEXdlYi1wbGF0Zm9ybS50ZXN0ghVu
-b3Qtd2ViLXBsYXRmb3JtLnRlc3SCFXd3dy53ZWItcGxhdGZvcm0udGVzdIIWd3d3
-MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53ZWItcGxhdGZvcm0udGVzdIIZd3d3
-Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3Lnd3dy53ZWItcGxhdGZvcm0udGVz
-dIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCGnd3dy53d3cxLndlYi1wbGF0
-Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Mi53d3cu
-d2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3
-d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIbd3d3MS53d3cyLndlYi1wbGF0Zm9y
-bS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzIud3d3Mi53
-ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndlYi1wbGF0Zm9ybS50ZXN0gh13
-d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Lnd3dzIubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCHnd3
-dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3MS53d3cubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCH3d3
-dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5ub3Qtd2Vi
-LXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
+AAOCAQ8AMIIBCgKCAQEAqPigUWpNcA8KYciJiJ3jDK/0A1l7gcSEJb5Q1XMxkd/6
+e96nE91DQXvmygzRXDroyf0vKEXQ7MJzwBcPMwYJqvfu5neSkmsF+noSz2rmz4Dq
+3b2eIexcs4NAtF9xK46umWXarCgZQyjtrK8bwd+vhX4LGTanmJ8IVMFChkIoT22X
+oXTNHpXGKU/Xy0ElP8F5FUrorTk3r1EDBWl/5rxIR4GHD1MsH9886hGiW5eLMHre
+CZnHzWWKYmi6M8FiQOuAQwRM7eqY7LEDMRQHSqFOgRHw1LyKYVwMJl+QyG+maJUf
+E6P2mzyBIJjIZJkaTIR7N+/k0cTlmnAWzdVUruN5awIDAQABo4IJ+jCCCfYwCQYD
+VR0TBAIwADAdBgNVHQ4EFgQUP5mijsryQCXnuHn6sm0J/1G5pY8wHwYDVR0jBBgw
+FoAUE/KJ3brt4RJXOwn4cNd5jiAJPXAwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiCEXdlYi1wbGF0Zm9ybS50ZXN0ghV3
+d3cud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13ZWItcGxhdGZvcm0udGVzdIIWd3d3
+Mi53ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
+dIIad3d3Mi53d3cud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3LndlYi1wbGF0
+Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzEu
+d2ViLXBsYXRmb3JtLnRlc3SCGnd3dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0ghp3
+d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndlYi1wbGF0Zm9y
+bS50ZXN0ght3d3cxLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzEud3d3MS53
+ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cyLndlYi1wbGF0Zm9ybS50ZXN0gh13
+d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Mi53d3cubm90LXdlYi1w
+bGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCHnd3
+dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Lnd3dzEubm90LXdlYi1w
+bGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3
+dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5ub3Qtd2Vi
+LXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
 H3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC53
 d3cud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRm
 b3JtLnRlc3SCInd3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3hu
 LS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9ybS50ZXN0giN3d3cxLnhuLS1sdmUt
-NmxhZC53ZWItcGxhdGZvcm0udGVzdIIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBs
-YXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cxLndlYi1wbGF0Zm9ybS50ZXN0
+NmxhZC53ZWItcGxhdGZvcm0udGVzdIIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBs
+YXRmb3JtLnRlc3SCI3d3dzIueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0
 giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIImd3d3Lnhu
-LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02
-bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIInd3d3MS54bi0tbHZlLTZsYWQubm90
-LXdlYi1wbGF0Zm9ybS50ZXN0gid4bi0tbHZlLTZsYWQud3d3Mi5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53d3cxLm5vdC13ZWItcGxhdGZvcm0u
+LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53
+d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIneG4tLWx2ZS02bGFkLnd3dzIubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0u
 dGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SC
 K3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCLXhu
-LS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53ZWItcGxhdGZvcm0udGVzdIItd3d3
+LS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIItd3d3
 LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gi14bi0t
-bjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
-OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzIu
-eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
-OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzEu
+bjhqNmRzNTNsd3drcnFodjI4YS53d3cud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
+OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
+OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzEu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzIu
 eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCL3huLS1s
-dmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF3d3cu
-eG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF4
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0
+dmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF4bi0t
+bjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF3
+d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0
 gjJ3d3cxLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0u
-dGVzdIIyd3d3Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRm
+dGVzdIIyeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi5ub3Qtd2ViLXBsYXRm
 b3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gjJ4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cyLm5vdC13
-ZWItcGxhdGZvcm0udGVzdII2eG4tLWx2ZS02bGFkLnhuLS1uOGo2ZHM1M2x3d2ty
-cWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gjZ4bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1uOGo2ZHM1M2x3
+bGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
+ZWItcGxhdGZvcm0udGVzdII2eG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2
+ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gjZ4bi0tbHZlLTZsYWQueG4tLW44ajZk
+czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1uOGo2ZHM1M2x3
 d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCOnhu
 LS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRm
 b3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3
 d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gkV4bi0tbjhqNmRzNTNsd3drcnFo
 djI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRl
-c3QwDQYJKoZIhvcNAQELBQADggEBAKcsQUIT0sAK5fSEnrlHUO20qAlByIw7zKkD
-n234e9Ll2YdVoXoAmyxaOsdGTQKbFhACTA2laOJ5ByGkjkJRroCr+Pg0XwILcmYY
-POPamPlMcBlfYcJJm4ZGjF+StD5J79Sn93wL/LD7fexzXalaWEe4EWAbQyxH2hWe
-bNs1zNj09JkRlOaOvwZmgSiZJV7mASsWwFBDihIExF1r+ovdypi8eoU6whB08unm
-sae9p9WZMzsV5yTk19ibnYRg6P0XSmMBM60w5uywqnsx8oM8btk7fALmZKPC7ogc
-S0O83guUKst+G7oQAQHgp9IZ/Rv+Q98Oe+QvJRKZtNXHY/rR3s8=
+c3QwDQYJKoZIhvcNAQELBQADggEBAF91dScWfNT4fY0JVJg9ko+kL+RpzK6or4jp
+0lMpNXj4OKD5ehllAa20gy/FT16jCFr7UvGneY3MGEJN3x/hio7DdezMZkAfxRW+
+A3nSfpOA73Vcf3HrxUUPCIJfyrp7Vpi0ZP9UQ5yZyzFcIZ6INy5BWeRZGg9tBViE
+5LnH7Wz3s3W/GDEA1prPYAd0y4Hs2KORlnc2BKqTL00obyCUQ1cMg7Um5WjAK7kg
+STQQv3FteO81oL/fHNcp7K/YrJvwFIAbA9yc1iUp/4YxtVXAe22ncwJ0BuqDZPZ/
+O4ObCDbMd1h15Uxz5b8O+/Flg+mpK9txk2GlzkaqyDQB6aggHQk=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/ci/requirements_tc.txt b/tests/wpt/tests/tools/ci/requirements_tc.txt
index bb9b3f7232d..0506dbb0086 100644
--- a/tests/wpt/tests/tools/ci/requirements_tc.txt
+++ b/tests/wpt/tests/tools/ci/requirements_tc.txt
@@ -1,4 +1,4 @@
 pygithub==1.59.1
 pyyaml==6.0.1
 requests==2.31.0
-taskcluster==54.4.1
+taskcluster==54.4.2
diff --git a/tests/wpt/tests/tools/localpaths.py b/tests/wpt/tests/tools/localpaths.py
index 5a2d0be00de..280f4bf2a3d 100644
--- a/tests/wpt/tests/tools/localpaths.py
+++ b/tests/wpt/tests/tools/localpaths.py
@@ -34,3 +34,4 @@ if sys.version_info < (3, 8):
 sys.path.insert(0, os.path.join(here, "webdriver"))
 sys.path.insert(0, os.path.join(here, "wptrunner"))
 sys.path.insert(0, os.path.join(here, "webtransport"))
+sys.path.insert(0, os.path.join(here, "third_party_modified", "mozlog"))
diff --git a/tests/wpt/tests/tools/mypy.ini b/tests/wpt/tests/tools/mypy.ini
index 5dc55c5b747..1e58e9625e6 100644
--- a/tests/wpt/tests/tools/mypy.ini
+++ b/tests/wpt/tests/tools/mypy.ini
@@ -6,7 +6,7 @@
 # - All setup.py files (avoiding duplicate module named "setup")
 # - tools/wptserve/docs/conf.py (generated code)
 # - tools/wptserve/tests/ (deliberately invalid syntax)
-exclude = (^tools/third_party/|/setup\.py$|^tools/wptserve/docs/conf.py|^tools/wptserve/tests/)
+exclude = (^tools/third_party/|/setup\.py$|^tools/wptserve/docs/conf.py|^tools/wptserve/tests/|^tools/third_party_modified/mozlog/)
 mypy_path = tools/wptrunner:tools/wptserve:tools/webdriver:tools/webtransport
 #check_untyped_defs = True
 disallow_any_generics = True
diff --git a/tests/wpt/tests/tools/requirements_tests.txt b/tests/wpt/tests/tools/requirements_tests.txt
index 01b56839989..a0885683ef8 100644
--- a/tests/wpt/tests/tools/requirements_tests.txt
+++ b/tests/wpt/tests/tools/requirements_tests.txt
@@ -2,4 +2,5 @@ httpx[http2]==0.24.1
 json-e==4.5.3
 jsonschema==4.17.3
 pyyaml==6.0.1
-taskcluster==54.4.1
+taskcluster==54.4.2
+mozterm==1.0.0
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/__init__.py
new file mode 100644
index 00000000000..82d40b5c551
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/__init__.py
@@ -0,0 +1,34 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+"""
+Mozlog aims to standardize log handling and formatting within Mozilla.
+
+It implements a JSON-based structured logging protocol with convenience
+facilities for recording test results.
+
+The old unstructured module is deprecated. It simply wraps Python's
+logging_ module and adds a few convenience methods for logging test
+results and events.
+"""
+
+import sys
+
+from . import commandline, structuredlog, unstructured
+from .proxy import get_proxy_logger
+from .structuredlog import get_default_logger, set_default_logger
+
+# Backwards compatibility shim for consumers that use mozlog.structured
+structured = sys.modules[__name__]
+sys.modules["{}.structured".format(__name__)] = structured
+
+__all__ = [
+    "commandline",
+    "structuredlog",
+    "unstructured",
+    "get_default_logger",
+    "set_default_logger",
+    "get_proxy_logger",
+    "structured",
+]
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/capture.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/capture.py
new file mode 100644
index 00000000000..75717d62c8a
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/capture.py
@@ -0,0 +1,96 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import sys
+import threading
+from io import BytesIO
+
+
+class LogThread(threading.Thread):
+    def __init__(self, queue, logger, level):
+        self.queue = queue
+        self.log_func = getattr(logger, level)
+        threading.Thread.__init__(self, name="Thread-Log")
+        self.daemon = True
+
+    def run(self):
+        while True:
+            try:
+                msg = self.queue.get()
+            except (EOFError, IOError):
+                break
+            if msg is None:
+                break
+            else:
+                self.log_func(msg)
+
+
+class LoggingWrapper(BytesIO):
+    """Wrapper for file like objects to redirect output to logger
+    instead"""
+
+    def __init__(self, queue, prefix=None):
+        BytesIO.__init__(self)
+        self.queue = queue
+        self.prefix = prefix
+        self.buffer = self
+
+    def write(self, data):
+        if isinstance(data, bytes):
+            try:
+                data = data.decode("utf8")
+            except UnicodeDecodeError:
+                data = data.decode("unicode_escape")
+
+        if data.endswith("\n"):
+            data = data[:-1]
+        if data.endswith("\r"):
+            data = data[:-1]
+        if not data:
+            return
+        if self.prefix is not None:
+            data = "%s: %s" % (self.prefix, data)
+        self.queue.put(data)
+
+    def flush(self):
+        pass
+
+
+class CaptureIO(object):
+    def __init__(self, logger, do_capture, mp_context=None):
+        if mp_context is None:
+            import multiprocessing as mp_context
+        self.logger = logger
+        self.do_capture = do_capture
+        self.logging_queue = None
+        self.logging_thread = None
+        self.original_stdio = None
+        self.mp_context = mp_context
+
+    def __enter__(self):
+        if self.do_capture:
+            self.original_stdio = (sys.stdout, sys.stderr)
+            self.logging_queue = self.mp_context.Queue()
+            self.logging_thread = LogThread(self.logging_queue, self.logger, "info")
+            sys.stdout = LoggingWrapper(self.logging_queue, prefix="STDOUT")
+            sys.stderr = LoggingWrapper(self.logging_queue, prefix="STDERR")
+            self.logging_thread.start()
+
+    def __exit__(self, *args, **kwargs):
+        if self.do_capture:
+            sys.stdout, sys.stderr = self.original_stdio
+            if self.logging_queue is not None:
+                self.logger.info("Closing logging queue")
+                self.logging_queue.put(None)
+                if self.logging_thread is not None:
+                    self.logging_thread.join(10)
+                while not self.logging_queue.empty():
+                    try:
+                        self.logger.warning(
+                            "Dropping log message: %r", self.logging_queue.get()
+                        )
+                    except Exception:
+                        pass
+                self.logging_queue.close()
+                self.logger.info("queue closed")
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/commandline.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/commandline.py
new file mode 100644
index 00000000000..d512eb73959
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/commandline.py
@@ -0,0 +1,342 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import optparse
+import os
+import sys
+from collections import defaultdict
+
+from . import formatters, handlers
+from .structuredlog import StructuredLogger, set_default_logger
+
+log_formatters = {
+    "raw": (
+        formatters.JSONFormatter,
+        "Raw structured log messages " "(provided by mozlog)",
+    ),
+    "unittest": (
+        formatters.UnittestFormatter,
+        "Unittest style output " "(provided by mozlog)",
+    ),
+    "xunit": (
+        formatters.XUnitFormatter,
+        "xUnit compatible XML " "(provided by mozlog)",
+    ),
+    "html": (formatters.HTMLFormatter, "HTML report " "(provided by mozlog)"),
+    "mach": (formatters.MachFormatter, "Human-readable output " "(provided by mozlog)"),
+    "tbpl": (formatters.TbplFormatter, "TBPL style log format " "(provided by mozlog)"),
+    "grouped": (
+        formatters.GroupingFormatter,
+        "Grouped summary of test results " "(provided by mozlog)",
+    ),
+    "errorsummary": (formatters.ErrorSummaryFormatter, argparse.SUPPRESS),
+}
+
+TEXT_FORMATTERS = ("raw", "mach")
+"""a subset of formatters for non test harnesses related applications"""
+
+
+DOCS_URL = "https://firefox-source-docs.mozilla.org/mozbase/mozlog.html"
+
+
+def level_filter_wrapper(formatter, level):
+    return handlers.LogLevelFilter(formatter, level)
+
+
+def verbose_wrapper(formatter, verbose):
+    formatter.verbose = verbose
+    return formatter
+
+
+def compact_wrapper(formatter, compact):
+    formatter.compact = compact
+    return formatter
+
+
+def buffer_handler_wrapper(handler, buffer_limit):
+    if buffer_limit == "UNLIMITED":
+        buffer_limit = None
+    else:
+        buffer_limit = int(buffer_limit)
+    return handlers.BufferHandler(handler, buffer_limit)
+
+
+def screenshot_wrapper(formatter, enable_screenshot):
+    formatter.enable_screenshot = enable_screenshot
+    return formatter
+
+
+def valgrind_handler_wrapper(handler):
+    return handlers.ValgrindHandler(handler)
+
+
+def default_formatter_options(log_type, overrides):
+    formatter_option_defaults = {"raw": {"level": "debug"}}
+    rv = {"verbose": False, "level": "info"}
+    rv.update(formatter_option_defaults.get(log_type, {}))
+
+    if overrides is not None:
+        rv.update(overrides)
+
+    return rv
+
+
+fmt_options = {
+    # <option name>: (<wrapper function>, description, <applicable formatters>, action)
+    # "action" is used by the commandline parser in use.
+    "verbose": (
+        verbose_wrapper,
+        "Enables verbose mode for the given formatter.",
+        {"mach"},
+        "store_true",
+    ),
+    "compact": (
+        compact_wrapper,
+        "Enables compact mode for the given formatter.",
+        {"tbpl"},
+        "store_true",
+    ),
+    "level": (
+        level_filter_wrapper,
+        "A least log level to subscribe to for the given formatter "
+        "(debug, info, error, etc.)",
+        {"mach", "raw", "tbpl"},
+        "store",
+    ),
+    "buffer": (
+        buffer_handler_wrapper,
+        "If specified, enables message buffering at the given buffer size limit.",
+        ["mach", "tbpl"],
+        "store",
+    ),
+    "screenshot": (
+        screenshot_wrapper,
+        "Enable logging reftest-analyzer compatible screenshot data.",
+        {"mach"},
+        "store_true",
+    ),
+    "no-screenshot": (
+        screenshot_wrapper,
+        "Disable logging reftest-analyzer compatible screenshot data.",
+        {"mach"},
+        "store_false",
+    ),
+}
+
+
+def log_file(name):
+    if name == "-":
+        return sys.stdout
+    # ensure we have a correct dirpath by using realpath
+    dirpath = os.path.dirname(os.path.realpath(name))
+    if not os.path.exists(dirpath):
+        os.makedirs(dirpath)
+    return open(name, "w")
+
+
+def add_logging_group(parser, include_formatters=None):
+    """
+    Add logging options to an argparse ArgumentParser or
+    optparse OptionParser.
+
+    Each formatter has a corresponding option of the form --log-{name}
+    where {name} is the name of the formatter. The option takes a value
+    which is either a filename or "-" to indicate stdout.
+
+    :param parser: The ArgumentParser or OptionParser object that should have
+                   logging options added.
+    :param include_formatters: List of formatter names that should be included
+                               in the option group. Default to None, meaning
+                               all the formatters are included. A common use
+                               of this option is to specify
+                               :data:`TEXT_FORMATTERS` to include only the
+                               most useful formatters for a command line tool
+                               that is not related to test harnesses.
+    """
+    group_name = "Output Logging"
+    group_description = (
+        "Each option represents a possible logging format "
+        "and takes a filename to write that format to, "
+        "or '-' to write to stdout. Some options are "
+        "provided by the mozlog utility; see %s "
+        "for extended documentation." % DOCS_URL
+    )
+
+    if include_formatters is None:
+        include_formatters = list(log_formatters.keys())
+
+    if isinstance(parser, optparse.OptionParser):
+        group = optparse.OptionGroup(parser, group_name, group_description)
+        parser.add_option_group(group)
+        opt_log_type = "str"
+        group_add = group.add_option
+    else:
+        group = parser.add_argument_group(group_name, group_description)
+        opt_log_type = log_file
+        group_add = group.add_argument
+
+    for name, (cls, help_str) in log_formatters.items():
+        if name in include_formatters:
+            group_add(
+                "--log-" + name, action="append", type=opt_log_type, help=help_str
+            )
+
+    for fmt in include_formatters:
+        for optname, (cls, help_str, formatters_, action) in fmt_options.items():
+            if fmt not in formatters_:
+                continue
+            if optname.startswith("no-") and action == "store_false":
+                dest = optname.split("-", 1)[1]
+            else:
+                dest = optname
+            dest = dest.replace("-", "_")
+            group_add(
+                "--log-%s-%s" % (fmt, optname),
+                action=action,
+                help=help_str,
+                default=None,
+                dest="log_%s_%s" % (fmt, dest),
+            )
+
+
+def setup_handlers(logger, formatters, formatter_options, allow_unused_options=False):
+    """
+    Add handlers to the given logger according to the formatters and
+    options provided.
+
+    :param logger: The logger configured by this function.
+    :param formatters: A dict of {formatter, [streams]} to use in handlers.
+    :param formatter_options: a dict of {formatter: {option: value}} to
+                              to use when configuring formatters.
+    """
+    unused_options = set(formatter_options.keys()) - set(formatters.keys())
+    if unused_options and not allow_unused_options:
+        msg = "Options specified for unused formatter(s) (%s) have no effect" % list(
+            unused_options
+        )
+        raise ValueError(msg)
+
+    for fmt, streams in formatters.items():
+        formatter_cls = log_formatters[fmt][0]
+        formatter = formatter_cls()
+        handler_wrappers_and_options = []
+
+        for option, value in formatter_options[fmt].items():
+            wrapper, wrapper_args = None, ()
+            if option == "valgrind":
+                wrapper = valgrind_handler_wrapper
+            elif option == "buffer":
+                wrapper, wrapper_args = fmt_options[option][0], (value,)
+            else:
+                formatter = fmt_options[option][0](formatter, value)
+
+            if wrapper is not None:
+                handler_wrappers_and_options.append((wrapper, wrapper_args))
+
+        for value in streams:
+            handler = handlers.StreamHandler(stream=value, formatter=formatter)
+            for wrapper, wrapper_args in handler_wrappers_and_options:
+                handler = wrapper(handler, *wrapper_args)
+            logger.add_handler(handler)
+
+
+def setup_logging(
+    logger, args, defaults=None, formatter_defaults=None, allow_unused_options=False
+):
+    """
+    Configure a structuredlogger based on command line arguments.
+
+    The created structuredlogger will also be set as the default logger, and
+    can be retrieved with :py:func:`~mozlog.get_default_logger`.
+
+    :param logger: A StructuredLogger instance or string name. If a string, a
+                   new StructuredLogger instance will be created using
+                   `logger` as the name.
+    :param args: A dictionary of {argument_name:value} produced from
+                 parsing the command line arguments for the application
+    :param defaults: A dictionary of {formatter name: output stream} to apply
+                     when there is no logging supplied on the command line. If
+                     this isn't supplied, reasonable defaults are chosen
+                     (coloured mach formatting if stdout is a terminal, or raw
+                     logs otherwise).
+    :param formatter_defaults: A dictionary of {option_name: default_value} to provide
+                               to the formatters in the absence of command line overrides.
+    :rtype: StructuredLogger
+    """
+
+    if not isinstance(logger, StructuredLogger):
+        logger = StructuredLogger(logger)
+        # The likely intent when using this function is to get a brand new
+        # logger, so reset state in case it was previously initialized.
+        logger.reset_state()
+
+    # Keep track of any options passed for formatters.
+    formatter_options = {}
+    # Keep track of formatters and list of streams specified.
+    formatters = defaultdict(list)
+    found = False
+    found_stdout_logger = False
+    if args is None:
+        args = {}
+    if not isinstance(args, dict):
+        args = vars(args)
+
+    if defaults is None:
+        if sys.__stdout__.isatty():
+            defaults = {"mach": sys.stdout}
+        else:
+            defaults = {"raw": sys.stdout}
+
+    for name, values in args.items():
+        parts = name.split("_")
+        if len(parts) > 3:
+            continue
+        # Our args will be ['log', <formatter>]
+        #               or ['log', <formatter>, <option>]
+        #               or ['valgrind']
+        if parts[0] == "log" and values is not None:
+            if len(parts) == 1 or parts[1] not in log_formatters:
+                continue
+            if len(parts) == 2:
+                _, formatter = parts
+                for value in values:
+                    found = True
+                    if isinstance(value, str):
+                        value = log_file(value)
+                    if value == sys.stdout:
+                        found_stdout_logger = True
+                    formatters[formatter].append(value)
+            if len(parts) == 3:
+                _, formatter, opt = parts
+                if formatter not in formatter_options:
+                    formatter_options[formatter] = default_formatter_options(
+                        formatter, formatter_defaults
+                    )
+                formatter_options[formatter][opt] = values
+
+    # If there is no user-specified logging, go with the default options
+    if not found:
+        for name, value in defaults.items():
+            formatters[name].append(value)
+
+    elif not found_stdout_logger and sys.stdout in list(defaults.values()):
+        for name, value in defaults.items():
+            if value == sys.stdout:
+                formatters[name].append(value)
+
+    for name in formatters:
+        if name not in formatter_options:
+            formatter_options[name] = default_formatter_options(
+                name, formatter_defaults
+            )
+
+    # If the user specified --valgrind, add it as an option for all formatters
+    if args.get("valgrind", None) is not None:
+        for name in formatters:
+            formatter_options[name]["valgrind"] = True
+    setup_handlers(logger, formatters, formatter_options, allow_unused_options)
+    set_default_logger(logger)
+
+    return logger
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/__init__.py
new file mode 100644
index 00000000000..962fb92ca49
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/__init__.py
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .errorsummary import ErrorSummaryFormatter
+from .grouping import GroupingFormatter
+from .html import HTMLFormatter
+from .machformatter import MachFormatter
+from .tbplformatter import TbplFormatter
+from .unittest import UnittestFormatter
+from .xunit import XUnitFormatter
+
+try:
+    import ujson as json
+except ImportError:
+    import json
+
+
+def JSONFormatter():
+    return lambda x: json.dumps(x) + "\n"
+
+
+__all__ = [
+    "UnittestFormatter",
+    "XUnitFormatter",
+    "HTMLFormatter",
+    "MachFormatter",
+    "TbplFormatter",
+    "ErrorSummaryFormatter",
+    "JSONFormatter",
+    "GroupingFormatter",
+]
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/base.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/base.py
new file mode 100644
index 00000000000..407514b741f
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/base.py
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from mozlog.handlers.messagehandler import MessageHandler
+
+from ..reader import LogHandler
+
+
+class BaseFormatter(LogHandler):
+    """Base class for implementing non-trivial formatters.
+
+    Subclasses are expected to provide a method for each action type they
+    wish to handle, each taking a single argument for the test data.
+    For example a trivial subclass that just produces the id of each test as
+    it starts might be::
+
+      class StartIdFormatter(BaseFormatter);
+          def test_start(data):
+              #For simplicity in the example pretend the id is always a string
+              return data["test"]
+    """
+
+    def __init__(self):
+        self.message_handler = MessageHandler()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py
new file mode 100644
index 00000000000..848f15fe155
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py
@@ -0,0 +1,163 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import json
+from collections import defaultdict
+
+from .base import BaseFormatter
+
+
+class ErrorSummaryFormatter(BaseFormatter):
+    def __init__(self):
+        self.test_to_group = {}
+        self.groups = defaultdict(
+            lambda: {
+                "status": None,
+                "start": None,
+                "end": None,
+            }
+        )
+        self.line_count = 0
+
+    def __call__(self, data):
+        rv = BaseFormatter.__call__(self, data)
+        self.line_count += 1
+        return rv
+
+    def _output(self, data_type, data):
+        data["action"] = data_type
+        data["line"] = self.line_count
+        return "%s\n" % json.dumps(data)
+
+    def _output_test(self, test, subtest, item):
+        data = {
+            "test": test,
+            "subtest": subtest,
+            "group": self.test_to_group.get(test, ""),
+            "status": item["status"],
+            "expected": item["expected"],
+            "message": item.get("message"),
+            "stack": item.get("stack"),
+            "known_intermittent": item.get("known_intermittent", []),
+        }
+        return self._output("test_result", data)
+
+    def _update_group_result(self, group, item):
+        ginfo = self.groups[group]
+
+        if item["status"] == "SKIP":
+            if ginfo["status"] is None:
+                ginfo["status"] = "SKIP"
+        elif (
+            ("expected" not in item and item["status"] in ["OK", "PASS"]) or
+            ("expected" in item and item["status"] == item["expected"]) or
+            item["status"] in item.get("known_intermittent", [])
+        ):
+            if ginfo["status"] in (None, "SKIP"):
+                ginfo["status"] = "OK"
+        else:
+            ginfo["status"] = "ERROR"
+
+    def suite_start(self, item):
+        self.test_to_group = {v: k for k in item["tests"] for v in item["tests"][k]}
+        return self._output("test_groups", {"groups": list(item["tests"].keys())})
+
+    def suite_end(self, data):
+        output = []
+        for group, info in self.groups.items():
+            if info["start"] is None or info["end"] is None:
+                duration = None
+            else:
+                duration = info["end"] - info["start"]
+
+            output.append(
+                self._output(
+                    "group_result",
+                    {
+                        "group": group,
+                        "status": info["status"],
+                        "duration": duration,
+                    },
+                )
+            )
+
+        return "".join(output)
+
+    def test_start(self, item):
+        group = self.test_to_group.get(item["test"], None)
+        if group and self.groups[group]["start"] is None:
+            self.groups[group]["start"] = item["time"]
+
+    def test_status(self, item):
+        group = self.test_to_group.get(item["test"], None)
+        if group:
+            self._update_group_result(group, item)
+
+        if "expected" not in item:
+            return
+
+        return self._output_test(item["test"], item["subtest"], item)
+
+    def test_end(self, item):
+        group = self.test_to_group.get(item["test"], None)
+        if group:
+            self._update_group_result(group, item)
+            self.groups[group]["end"] = item["time"]
+
+        if "expected" not in item:
+            return
+
+        return self._output_test(item["test"], None, item)
+
+    def log(self, item):
+        if item["level"] not in ("ERROR", "CRITICAL"):
+            return
+
+        data = {"level": item["level"], "message": item["message"]}
+        return self._output("log", data)
+
+    def crash(self, item):
+        data = {
+            "test": item.get("test"),
+            "signature": item["signature"],
+            "stackwalk_stdout": item.get("stackwalk_stdout"),
+            "stackwalk_stderr": item.get("stackwalk_stderr"),
+        }
+
+        if item.get("test"):
+            data["group"] = self.test_to_group.get(item["test"], "")
+            if data["group"] == "":
+                # item['test'] could be the group name, not a test name
+                if item["test"] in self.groups:
+                    data["group"] = item["test"]
+
+            # unlike test group summary, if we crash expect error unless expected
+            if (
+                (
+                    "expected" in item and
+                    "status" in item and
+                    item["status"] in item["expected"]
+                ) or
+                ("expected" in item and "CRASH" == item["expected"]) or
+                "status" in item and
+                item["status"] in item.get("known_intermittent", [])
+            ):
+                self.groups[data["group"]]["status"] = "PASS"
+            else:
+                self.groups[data["group"]]["status"] = "ERROR"
+
+        return self._output("crash", data)
+
+    def lint(self, item):
+        data = {
+            "level": item["level"],
+            "path": item["path"],
+            "message": item["message"],
+            "lineno": item["lineno"],
+            "column": item.get("column"),
+            "rule": item.get("rule"),
+            "linter": item.get("linter"),
+        }
+        self._output("lint", data)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/grouping.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/grouping.py
new file mode 100644
index 00000000000..d81f9344e99
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/grouping.py
@@ -0,0 +1,400 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+import collections
+import os
+import platform
+import subprocess
+import sys
+
+from mozlog.formatters import base
+
+DEFAULT_MOVE_UP_CODE = u"\x1b[A"
+DEFAULT_CLEAR_EOL_CODE = u"\x1b[K"
+
+
+class GroupingFormatter(base.BaseFormatter):
+    """Formatter designed to produce unexpected test results grouped
+    together in a readable format."""
+
+    def __init__(self):
+        super(GroupingFormatter, self).__init__()
+        self.number_of_tests = 0
+        self.completed_tests = 0
+        self.need_to_erase_last_line = False
+        self.current_display = ""
+        self.running_tests = {}
+        self.test_output = collections.defaultdict(str)
+        self.subtest_failures = collections.defaultdict(list)
+        self.test_failure_text = ""
+        self.tests_with_failing_subtests = []
+        self.interactive = os.isatty(sys.stdout.fileno())
+        self.show_logs = False
+
+        self.message_handler.register_message_handlers(
+            "show_logs",
+            {
+                "on": self._enable_show_logs,
+                "off": self._disable_show_logs,
+            },
+        )
+
+        # TODO(mrobinson, 8313): We need to add support for Windows terminals here.
+        if self.interactive:
+            self.move_up, self.clear_eol = self.get_move_up_and_clear_eol_codes()
+            if platform.system() != "Windows":
+                self.line_width = int(
+                    subprocess.check_output(["stty", "size"]).split()[1]
+                )
+            else:
+                # Until we figure out proper Windows support,
+                # this makes things work well enough to run.
+                self.line_width = 80
+
+        self.expected = {
+            "OK": 0,
+            "PASS": 0,
+            "FAIL": 0,
+            "PRECONDITION_FAILED": 0,
+            "ERROR": 0,
+            "TIMEOUT": 0,
+            "SKIP": 0,
+            "CRASH": 0,
+        }
+
+        self.unexpected_tests = {
+            "OK": [],
+            "PASS": [],
+            "FAIL": [],
+            "PRECONDITION_FAILED": [],
+            "ERROR": [],
+            "TIMEOUT": [],
+            "CRASH": [],
+        }
+
+        # Follows the format of {(<subsuite>, <test>, <subtest>): <data>}, where
+        # (<subsuite>, <test>, None) represents a top level test.
+        self.known_intermittent_results = {}
+
+    def _enable_show_logs(self):
+        self.show_logs = True
+
+    def _disable_show_logs(self):
+        self.show_logs = False
+
+    def get_move_up_and_clear_eol_codes(self):
+        try:
+            import blessed
+        except ImportError:
+            return DEFAULT_MOVE_UP_CODE, DEFAULT_CLEAR_EOL_CODE
+
+        try:
+            self.terminal = blessed.Terminal()
+            return self.terminal.move_up, self.terminal.clear_eol
+        except Exception as exception:
+            sys.stderr.write(
+                "GroupingFormatter: Could not get terminal "
+                "control characters: %s\n" % exception
+            )
+            return DEFAULT_MOVE_UP_CODE, DEFAULT_CLEAR_EOL_CODE
+
+    def text_to_erase_display(self):
+        if not self.interactive or not self.current_display:
+            return ""
+        return (self.move_up + self.clear_eol) * self.current_display.count("\n")
+
+    def generate_output(self, text=None, new_display=None):
+        if not self.interactive:
+            return text
+
+        output = self.text_to_erase_display()
+        if text:
+            output += text
+        if new_display is not None:
+            self.current_display = new_display
+        return output + self.current_display
+
+    def build_status_line(self):
+        if self.number_of_tests == 0:
+            new_display = "  [%i] " % self.completed_tests
+        else:
+            new_display = "  [%i/%i] " % (self.completed_tests, self.number_of_tests)
+
+        if self.running_tests:
+            indent = " " * len(new_display)
+            if self.interactive:
+                max_width = self.line_width - len(new_display)
+            else:
+                max_width = sys.maxsize
+            return (
+                new_display +
+                ("\n%s" % indent).join(
+                    f"{self.get_test_name_output(subsuite, test_name)}"[:max_width]
+                    for subsuite, test_name in self.running_tests.values()
+                ) + "\n"
+            )
+        else:
+            return new_display + "No tests running.\n"
+
+    def suite_start(self, data):
+        self.number_of_tests = sum(
+            len(tests) for tests in data["tests"].values()
+        )
+        self.start_time = data["time"]
+
+        if self.number_of_tests == 0:
+            return "Running tests in %s\n\n" % data[u"source"]
+        else:
+            return "Running %i tests in %s\n\n" % (
+                self.number_of_tests,
+                data[u"source"],
+            )
+
+    def test_start(self, data):
+        self.running_tests[data["thread"]] = (data.get("subsuite"), data["test"])
+        return self.generate_output(text=None, new_display=self.build_status_line())
+
+    def wrap_and_indent_lines(self, lines, indent):
+        assert len(lines) > 0
+
+        output = indent + u"\u25B6 %s\n" % lines[0]
+        for line in lines[1:-1]:
+            output += indent + u"\u2502 %s\n" % line
+        if len(lines) > 1:
+            output += indent + u"\u2514 %s\n" % lines[-1]
+        return output
+
+    def get_lines_for_unexpected_result(
+        self, test_name, status, expected, message, stack
+    ):
+        # Test names sometimes contain control characters, which we want
+        # to be printed in their raw form, and not their interpreted form.
+        test_name = test_name.encode("unicode-escape").decode("utf-8")
+
+        if expected:
+            expected_text = u" [expected %s]" % expected
+        else:
+            expected_text = u""
+
+        lines = [u"%s%s %s" % (status, expected_text, test_name)]
+        if message:
+            lines.append(u"  \u2192 %s" % message)
+        if stack:
+            lines.append("")
+            lines += [stackline for stackline in stack.splitlines()]
+        return lines
+
+    def get_lines_for_known_intermittents(self, known_intermittent_results):
+        lines = []
+
+        for (subsuite, test, subtest), data in self.known_intermittent_results.items():
+            status = data["status"]
+            known_intermittent = ", ".join(data["known_intermittent"])
+            expected = " [expected %s, known intermittent [%s]" % (
+                data["expected"],
+                known_intermittent,
+            )
+            lines += [
+                u"%s%s %s%s"
+                % (
+                    status,
+                    expected,
+                    self.get_test_name_output(subsuite, test),
+                    (", %s" % subtest) if subtest is not None else "",
+                )
+            ]
+        output = self.wrap_and_indent_lines(lines, "  ") + "\n"
+        return output
+
+    def get_test_name_output(self, subsuite, test_name):
+        # Generate human readable test name from subsuite and test_name.
+        # Vendors can override this function to produce output in a different
+        # format that suites their need.
+        return f"{subsuite}:{test_name}" if subsuite else test_name
+
+    def get_output_for_unexpected_subtests(self, subsuite, test_name, unexpected_subtests):
+        if not unexpected_subtests:
+            return ""
+
+        def add_subtest_failure(lines, subtest, stack=None):
+            lines += self.get_lines_for_unexpected_result(
+                subtest.get("subtest", None),
+                subtest.get("status", None),
+                subtest.get("expected", None),
+                subtest.get("message", None),
+                stack,
+            )
+
+        def make_subtests_failure(subsuite, test_name, subtests, stack=None):
+            lines = [u"Unexpected subtest result in %s:"
+                     % self.get_test_name_output(subsuite, test_name)]
+            for subtest in subtests[:-1]:
+                add_subtest_failure(lines, subtest, None)
+            add_subtest_failure(lines, subtests[-1], stack)
+            return self.wrap_and_indent_lines(lines, "  ") + "\n"
+
+        # Organize the failures by stack trace so we don't print the same stack trace
+        # more than once. They are really tall and we don't want to flood the screen
+        # with duplicate information.
+        output = ""
+        failures_by_stack = collections.defaultdict(list)
+        for failure in unexpected_subtests:
+            # Print stackless results first. They are all separate.
+            if "stack" not in failure:
+                output += make_subtests_failure(subsuite, test_name, [failure], None)
+            else:
+                failures_by_stack[failure["stack"]].append(failure)
+
+        for (stack, failures) in failures_by_stack.items():
+            output += make_subtests_failure(subsuite, test_name, failures, stack)
+        return output
+
+    def test_end(self, data):
+        self.completed_tests += 1
+        test_status = data["status"]
+        test_name = data["test"]
+        subsuite = data.get("subsuite")
+        known_intermittent_statuses = data.get("known_intermittent", [])
+        subtest_failures = self.subtest_failures.pop((subsuite, test_name), [])
+        if "expected" in data and test_status not in known_intermittent_statuses:
+            had_unexpected_test_result = True
+        else:
+            had_unexpected_test_result = False
+
+        del self.running_tests[data["thread"]]
+        new_display = self.build_status_line()
+
+        if not had_unexpected_test_result and not subtest_failures:
+            self.expected[test_status] += 1
+            if self.interactive:
+                return self.generate_output(text=None, new_display=new_display)
+            else:
+                return self.generate_output(
+                    text="  %s\n" % self.get_test_name_output(subsuite, test_name),
+                    new_display=new_display
+                )
+
+        if test_status in known_intermittent_statuses:
+            self.known_intermittent_results[(subsuite, test_name, None)] = data
+
+        # If the test crashed or timed out, we also include any process output,
+        # because there is a good chance that the test produced a stack trace
+        # or other error messages.
+        if test_status in ("CRASH", "TIMEOUT"):
+            stack = self.test_output[(subsuite, test_name)] + data.get("stack", "")
+        else:
+            stack = data.get("stack", None)
+
+        output = ""
+        if had_unexpected_test_result:
+            self.unexpected_tests[test_status].append(data)
+            lines = self.get_lines_for_unexpected_result(
+                self.get_test_name_output(subsuite, test_name),
+                test_status,
+                data.get("expected", None),
+                data.get("message", None),
+                stack,
+            )
+            output += self.wrap_and_indent_lines(lines, "  ") + "\n"
+
+        if subtest_failures:
+            self.tests_with_failing_subtests.append((subsuite, test_name))
+            output += self.get_output_for_unexpected_subtests(
+                subsuite, test_name, subtest_failures
+            )
+        self.test_failure_text += output
+
+        return self.generate_output(text=output, new_display=new_display)
+
+    def test_status(self, data):
+        if "expected" in data and data["status"] not in data.get(
+            "known_intermittent", []
+        ):
+            key = (data.get("subsuite"), data["test"])
+            self.subtest_failures[key].append(data)
+        elif data["status"] in data.get("known_intermittent", []):
+            key = (data.get("subsuite"), data["test"], data["subtest"])
+            self.known_intermittent_results[key] = data
+
+    def suite_end(self, data):
+        self.end_time = data["time"]
+
+        if not self.interactive:
+            output = u"\n"
+        else:
+            output = ""
+
+        output += u"Ran %i tests finished in %.1f seconds.\n" % (
+            self.completed_tests,
+            (self.end_time - self.start_time) / 1000.0,
+        )
+        output += u"  \u2022 %i ran as expected. %i tests skipped.\n" % (
+            sum(self.expected.values()),
+            self.expected["SKIP"],
+        )
+        if self.known_intermittent_results:
+            output += u"  \u2022 %i known intermittent results.\n" % (
+                len(self.known_intermittent_results)
+            )
+
+        def text_for_unexpected_list(text, section):
+            tests = self.unexpected_tests[section]
+            if not tests:
+                return u""
+            return u"  \u2022 %i tests %s\n" % (len(tests), text)
+
+        output += text_for_unexpected_list(u"crashed unexpectedly", "CRASH")
+        output += text_for_unexpected_list(u"had errors unexpectedly", "ERROR")
+        output += text_for_unexpected_list(u"failed unexpectedly", "FAIL")
+        output += text_for_unexpected_list(
+            u"precondition failed unexpectedly", "PRECONDITION_FAILED"
+        )
+        output += text_for_unexpected_list(u"timed out unexpectedly", "TIMEOUT")
+        output += text_for_unexpected_list(u"passed unexpectedly", "PASS")
+        output += text_for_unexpected_list(u"unexpectedly okay", "OK")
+
+        num_with_failing_subtests = len(self.tests_with_failing_subtests)
+        if num_with_failing_subtests:
+            output += (
+                u"  \u2022 %i tests had unexpected subtest results\n"
+                % num_with_failing_subtests
+            )
+        output += "\n"
+
+        # Repeat failing test output, so that it is easier to find, since the
+        # non-interactive version prints all the test names.
+        if not self.interactive and self.test_failure_text:
+            output += u"Tests with unexpected results:\n" + self.test_failure_text
+
+        if self.known_intermittent_results:
+            results = self.get_lines_for_known_intermittents(
+                self.known_intermittent_results
+            )
+            output += u"Tests with known intermittent results:\n" + results
+
+        return self.generate_output(text=output, new_display="")
+
+    def process_output(self, data):
+        if data["thread"] not in self.running_tests:
+            return
+        test_key = self.running_tests[data["thread"]]
+        self.test_output[test_key] += data["data"] + "\n"
+
+    def log(self, data):
+        if data.get("component"):
+            message = "%s %s %s" % (data["component"], data["level"], data["message"])
+        else:
+            message = "%s %s" % (data["level"], data["message"])
+        if "stack" in data:
+            message += "\n%s" % data["stack"]
+
+        # We are logging messages that begin with STDERR, because that is how exceptions
+        # in this formatter are indicated.
+        if data["message"].startswith("STDERR"):
+            return self.generate_output(text=message + "\n")
+
+        if data["level"] in ("CRITICAL", "ERROR"):
+            return self.generate_output(text=message + "\n")
+        # Show all messages if show_logs switched on.
+        if self.show_logs:
+            return self.generate_output(text=message + "\n")
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/__init__.py
new file mode 100644
index 00000000000..01348f8dfc8
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/__init__.py
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .html import HTMLFormatter
+
+__all__ = ["HTMLFormatter"]
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/html.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/html.py
new file mode 100644
index 00000000000..040de1ae538
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/html.py
@@ -0,0 +1,336 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import base64
+import json
+import os
+from collections import defaultdict
+from datetime import datetime
+
+from .. import base
+
+html = None
+raw = None
+
+from html import escape
+
+base_path = os.path.split(__file__)[0]
+
+
+def do_defered_imports():
+    global html
+    global raw
+
+    from .xmlgen import html, raw
+
+
+class HTMLFormatter(base.BaseFormatter):
+    """Formatter that produces a simple HTML-formatted report."""
+
+    def __init__(self):
+        do_defered_imports()
+        self.suite_name = None
+        self.result_rows = []
+        self.test_count = defaultdict(int)
+        self.start_times = {}
+        self.suite_times = {"start": None, "end": None}
+        self.head = None
+        self.env = {}
+
+    def suite_start(self, data):
+        self.suite_times["start"] = data["time"]
+        self.suite_name = data["source"]
+        with open(os.path.join(base_path, "style.css")) as f:
+            self.head = html.head(
+                html.meta(charset="utf-8"),
+                html.title(data["source"]),
+                html.style(raw(f.read())),
+            )
+
+        date_format = "%d %b %Y %H:%M:%S"
+        version_info = data.get("version_info")
+        if version_info:
+            self.env["Device identifier"] = version_info.get("device_id")
+            self.env["Device firmware (base)"] = version_info.get(
+                "device_firmware_version_base"
+            )
+            self.env["Device firmware (date)"] = (
+                datetime.utcfromtimestamp(
+                    int(version_info.get("device_firmware_date"))
+                ).strftime(date_format)
+                if "device_firmware_date" in version_info
+                else None
+            )
+            self.env["Device firmware (incremental)"] = version_info.get(
+                "device_firmware_version_incremental"
+            )
+            self.env["Device firmware (release)"] = version_info.get(
+                "device_firmware_version_release"
+            )
+            self.env["Gaia date"] = (
+                datetime.utcfromtimestamp(int(version_info.get("gaia_date"))).strftime(
+                    date_format
+                )
+                if "gaia_date" in version_info
+                else None
+            )
+            self.env["Gecko version"] = version_info.get("application_version")
+            self.env["Gecko build"] = version_info.get("application_buildid")
+
+            if version_info.get("application_changeset"):
+                self.env["Gecko revision"] = version_info.get("application_changeset")
+                if version_info.get("application_repository"):
+                    self.env["Gecko revision"] = html.a(
+                        version_info.get("application_changeset"),
+                        href="/rev/".join(
+                            [
+                                version_info.get("application_repository"),
+                                version_info.get("application_changeset"),
+                            ]
+                        ),
+                        target="_blank",
+                    )
+
+            if version_info.get("gaia_changeset"):
+                self.env["Gaia revision"] = html.a(
+                    version_info.get("gaia_changeset")[:12],
+                    href="https://github.com/mozilla-b2g/gaia/commit/%s"
+                    % version_info.get("gaia_changeset"),
+                    target="_blank",
+                )
+
+        device_info = data.get("device_info")
+        if device_info:
+            self.env["Device uptime"] = device_info.get("uptime")
+            self.env["Device memory"] = device_info.get("memtotal")
+            self.env["Device serial"] = device_info.get("id")
+
+    def suite_end(self, data):
+        self.suite_times["end"] = data["time"]
+        return self.generate_html()
+
+    def test_start(self, data):
+        self.start_times[data["test"]] = data["time"]
+
+    def test_end(self, data):
+        self.make_result_html(data)
+
+    def make_result_html(self, data):
+        tc_time = (data["time"] - self.start_times.pop(data["test"])) / 1000.0
+        additional_html = []
+        debug = data.get("extra", {})
+        # Add support for log exported from wptrunner. The structure of
+        # reftest_screenshots is listed in wptrunner/executors/base.py.
+        if debug.get("reftest_screenshots"):
+            log_data = debug.get("reftest_screenshots", {})
+            debug = {
+                "image1": "data:image/png;base64," + log_data[0].get("screenshot", {}),
+                "image2": "data:image/png;base64," + log_data[2].get("screenshot", {}),
+                "differences": "Not Implemented",
+            }
+
+        links_html = []
+
+        status = status_name = data["status"]
+        expected = data.get("expected", status)
+        known_intermittent = data.get("known_intermittent", [])
+
+        if status != expected and status not in known_intermittent:
+            status_name = "UNEXPECTED_" + status
+        elif status in known_intermittent:
+            status_name = "KNOWN_INTERMITTENT"
+        elif status not in ("PASS", "SKIP"):
+            status_name = "EXPECTED_" + status
+
+        self.test_count[status_name] += 1
+
+        if status in ["SKIP", "FAIL", "PRECONDITION_FAILED", "ERROR"]:
+            if debug.get("differences"):
+                images = [
+                    ("image1", "Image 1 (test)"),
+                    ("image2", "Image 2 (reference)"),
+                ]
+                for title, description in images:
+                    screenshot = "%s" % debug[title]
+                    additional_html.append(
+                        html.div(
+                            html.a(html.img(src=screenshot), href="#"),
+                            html.br(),
+                            html.a(description),
+                            class_="screenshot",
+                        )
+                    )
+
+            if debug.get("screenshot"):
+                screenshot = "%s" % debug["screenshot"]
+                screenshot = "data:image/png;base64," + screenshot
+
+                additional_html.append(
+                    html.div(
+                        html.a(html.img(src=screenshot), href="#"), class_="screenshot"
+                    )
+                )
+
+            for name, content in debug.items():
+                if name in ["screenshot", "image1", "image2"]:
+                    if not content.startswith("data:image/png;base64,"):
+                        href = "data:image/png;base64,%s" % content
+                    else:
+                        href = content
+                else:
+                    if not isinstance(content, (str, bytes)):
+                        # All types must be json serializable
+                        content = json.dumps(content)
+                        # Decode to text type if JSON output is byte string
+                        if not isinstance(content, str):
+                            content = content.decode("utf-8")
+                    # Encode base64 to avoid that some browsers (such as Firefox, Opera)
+                    # treats '#' as the start of another link if it is contained in the data URL.
+                    if isinstance(content, str):
+                        is_known_utf8 = True
+                        content_bytes = str(content).encode(
+                            "utf-8", "xmlcharrefreplace"
+                        )
+                    else:
+                        is_known_utf8 = False
+                        content_bytes = content
+
+                    meta = ["text/html"]
+                    if is_known_utf8:
+                        meta.append("charset=utf-8")
+
+                    # base64 is ascii only, which means we don't have to care about encoding
+                    # in the case where we don't know the encoding of the input
+                    b64_bytes = base64.b64encode(content_bytes)
+                    b64_text = b64_bytes.decode()
+                    href = "data:%s;base64,%s" % (";".join(meta), b64_text)
+                links_html.append(
+                    html.a(name.title(), class_=name, href=href, target="_blank")
+                )
+                links_html.append(" ")
+
+            log = html.div(class_="log")
+            output = data.get("stack", "").splitlines()
+            output.extend(data.get("message", "").splitlines())
+            for line in output:
+                separator = line.startswith(" " * 10)
+                if separator:
+                    log.append(line[:80])
+                else:
+                    if (
+                        line.lower().find("error") != -1 or
+                        line.lower().find("exception") != -1
+                    ):
+                        log.append(html.span(raw(escape(line)), class_="error"))
+                    else:
+                        log.append(raw(escape(line)))
+                log.append(html.br())
+            additional_html.append(log)
+
+        self.result_rows.append(
+            html.tr(
+                [
+                    html.td(status_name, class_="col-result"),
+                    html.td(data["test"], class_="col-name"),
+                    html.td("%.2f" % tc_time, class_="col-duration"),
+                    html.td(links_html, class_="col-links"),
+                    html.td(additional_html, class_="debug"),
+                ],
+                class_=status_name.lower() + " results-table-row",
+            )
+        )
+
+    def generate_html(self):
+        generated = datetime.utcnow()
+        with open(os.path.join(base_path, "main.js")) as main_f:
+            doc = html.html(
+                self.head,
+                html.body(
+                    html.script(raw(main_f.read())),
+                    html.p(
+                        "Report generated on %s at %s"
+                        % (
+                            generated.strftime("%d-%b-%Y"),
+                            generated.strftime("%H:%M:%S"),
+                        )
+                    ),
+                    html.h2("Environment"),
+                    html.table(
+                        [
+                            html.tr(html.td(k), html.td(v))
+                            for k, v in sorted(self.env.items())
+                            if v
+                        ],
+                        id="environment",
+                    ),
+                    html.h2("Summary"),
+                    html.p(
+                        "%i tests ran in %.1f seconds."
+                        % (
+                            sum(self.test_count.values()),
+                            (self.suite_times["end"] - self.suite_times["start"]) / 1000.0,
+                        ),
+                        html.br(),
+                        html.span("%i passed" % self.test_count["PASS"], class_="pass"),
+                        ", ",
+                        html.span(
+                            "%i skipped" % self.test_count["SKIP"], class_="skip"
+                        ),
+                        ", ",
+                        html.span(
+                            "%i failed" % self.test_count["UNEXPECTED_FAIL"],
+                            class_="fail",
+                        ),
+                        ", ",
+                        html.span(
+                            "%i errors" % self.test_count["UNEXPECTED_ERROR"],
+                            class_="error",
+                        ),
+                        ".",
+                        html.br(),
+                        html.span(
+                            "%i expected failures" % self.test_count["EXPECTED_FAIL"],
+                            class_="expected_fail",
+                        ),
+                        ", ",
+                        html.span(
+                            "%i unexpected passes" % self.test_count["UNEXPECTED_PASS"],
+                            class_="unexpected_pass",
+                        ),
+                        ", ",
+                        html.span(
+                            "%i known intermittent results"
+                            % self.test_count["KNOWN_INTERMITTENT"],
+                            class_="known_intermittent",
+                        ),
+                        ".",
+                    ),
+                    html.h2("Results"),
+                    html.table(
+                        [
+                            html.thead(
+                                html.tr(
+                                    [
+                                        html.th(
+                                            "Result", class_="sortable", col="result"
+                                        ),
+                                        html.th("Test", class_="sortable", col="name"),
+                                        html.th(
+                                            "Duration",
+                                            class_="sortable numeric",
+                                            col="duration",
+                                        ),
+                                        html.th("Links"),
+                                    ]
+                                ),
+                                id="results-table-head",
+                            ),
+                            html.tbody(self.result_rows, id="results-table-body"),
+                        ],
+                        id="results-table",
+                    ),
+                ),
+            )
+
+        return u"<!DOCTYPE html>\n" + doc.unicode(indent=2)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/main.js b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/main.js
new file mode 100644
index 00000000000..61403f611b1
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/main.js
@@ -0,0 +1,166 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+function toArray(iter) {
+  if (iter === null) {
+    return null;
+  }
+  return Array.prototype.slice.call(iter);
+}
+
+function find(selector, elem) {
+  if (!elem) {
+    elem = document;
+  }
+  return elem.querySelector(selector);
+}
+
+function find_all(selector, elem) {
+  if (!elem) {
+    elem = document;
+  }
+  return toArray(elem.querySelectorAll(selector));
+}
+
+addEventListener("DOMContentLoaded", function () {
+  reset_sort_headers();
+
+  split_debug_onto_two_rows();
+
+  find_all(".col-links a.screenshot").forEach(function (elem) {
+    elem.addEventListener("click", function (event) {
+      var node = elem;
+      while (node && !node.classList.contains("results-table-row")) {
+        node = node.parentNode;
+      }
+      if (node != null) {
+        if (node.nextSibling && node.nextSibling.classList.contains("debug")) {
+          var href = find(".screenshot img", node.nextSibling).src;
+          window.open(href);
+        }
+      }
+      event.preventDefault();
+    });
+  });
+
+  find_all(".screenshot a").forEach(function (elem) {
+    elem.addEventListener("click", function (event) {
+      window.open(find("img", elem).getAttribute("src"));
+      event.preventDefault();
+    });
+  });
+
+  find_all(".sortable").forEach(function (elem) {
+    elem.addEventListener("click", function (event) {
+      toggle_sort_states(elem);
+      var colIndex = toArray(elem.parentNode.childNodes).indexOf(elem);
+      var key = elem.classList.contains("numeric") ? key_num : key_alpha;
+      sort_table(elem, key(colIndex));
+    });
+  });
+});
+
+function sort_table(clicked, key_func) {
+  one_row_for_data();
+  var rows = find_all(".results-table-row");
+  var reversed = !clicked.classList.contains("asc");
+
+  var sorted_rows = sort(rows, key_func, reversed);
+
+  var parent = document.getElementById("results-table-body");
+  sorted_rows.forEach(function (elem) {
+    parent.appendChild(elem);
+  });
+
+  split_debug_onto_two_rows();
+}
+
+function sort(items, key_func, reversed) {
+  var sort_array = items.map(function (item, i) {
+    return [key_func(item), i];
+  });
+  var multiplier = reversed ? -1 : 1;
+
+  sort_array.sort(function (a, b) {
+    var key_a = a[0];
+    var key_b = b[0];
+    return multiplier * (key_a >= key_b ? 1 : -1);
+  });
+
+  return sort_array.map(function (item) {
+    var index = item[1];
+    return items[index];
+  });
+}
+
+function key_alpha(col_index) {
+  return function (elem) {
+    return elem.childNodes[col_index].firstChild.data.toLowerCase();
+  };
+}
+
+function key_num(col_index) {
+  return function (elem) {
+    return parseFloat(elem.childNodes[col_index].firstChild.data);
+  };
+}
+
+function reset_sort_headers() {
+  find_all(".sort-icon").forEach(function (elem) {
+    elem.remove();
+  });
+  find_all(".sortable").forEach(function (elem) {
+    var icon = document.createElement("div");
+    icon.className = "sort-icon";
+    icon.textContent = "vvv";
+    elem.insertBefore(icon, elem.firstChild);
+    elem.classList.remove("desc", "active");
+    elem.classList.add("asc", "inactive");
+  });
+}
+
+function toggle_sort_states(elem) {
+  // if active, toggle between asc and desc
+  if (elem.classList.contains("active")) {
+    elem.classList.toggle("asc");
+    elem.classList.toggle("desc");
+  }
+
+  // if inactive, reset all other functions and add ascending active
+  if (elem.classList.contains("inactive")) {
+    reset_sort_headers();
+    elem.classList.remove("inactive");
+    elem.classList.add("active");
+  }
+}
+
+function split_debug_onto_two_rows() {
+  find_all("tr.results-table-row").forEach(function (elem) {
+    var new_row = document.createElement("tr");
+    new_row.className = "debug";
+    elem.parentNode.insertBefore(new_row, elem.nextSibling);
+    find_all(".debug", elem).forEach(function (td_elem) {
+      if (find(".log", td_elem)) {
+        new_row.appendChild(td_elem);
+        td_elem.colSpan = 5;
+      } else {
+        td_elem.remove();
+      }
+    });
+  });
+}
+
+function one_row_for_data() {
+  find_all("tr.results-table-row").forEach(function (elem) {
+    if (elem.nextSibling.classList.contains("debug")) {
+      toArray(elem.nextSibling.childNodes).forEach(function (td_elem) {
+        elem.appendChild(td_elem);
+      });
+    } else {
+      var new_td = document.createElement("td");
+      new_td.className = "debug";
+      elem.appendChild(new_td);
+    }
+  });
+}
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/style.css b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/style.css
new file mode 100644
index 00000000000..427742dd1f3
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/style.css
@@ -0,0 +1,155 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	min-width: 1200px;
+	color: #999;
+}
+h2 {
+	font-size: 16px;
+	color: black;
+}
+
+p {
+    color: black;
+}
+
+a {
+	color: #999;
+}
+
+table {
+	border-collapse: collapse;
+}
+
+/******************************
+ * SUMMARY INFORMATION
+ ******************************/
+
+#environment td {
+	padding: 5px;
+	border: 1px solid #E6E6E6;
+}
+
+#environment tr:nth-child(odd) {
+	background-color: #f6f6f6;
+}
+
+/******************************
+ * TEST RESULT COLORS
+ ******************************/
+span.pass, .pass .col-result {
+	color: green;
+}
+span.expected_fail, .expected_fail .col-result,
+span.expected_skip, .expected_skip .col-result,
+span.skip, .skip .col-result,
+span.known_intermittent, .known_intermittent .col-result {
+	color: orange;
+}
+span.error, .error .col-result,
+span.fail, .fail .col-result,
+span.unexpected_error, .unexpected_error .col-result,
+span.unexpected_fail, .unexpected_fail .col-result,
+span.unexpected_pass, .unexpected_pass .col-result {
+	color: red;
+}
+
+/******************************
+ * RESULTS TABLE
+ *
+ * 1. Table Layout
+ * 2. Debug
+ * 3. Sorting items
+ *
+ ******************************/
+
+/*------------------
+ * 1. Table Layout
+ *------------------*/
+
+#results-table {
+	border: 1px solid #e6e6e6;
+	color: #999;
+	font-size: 12px;
+	width: 100%
+}
+
+#results-table th, #results-table td {
+	padding: 5px;
+	border: 1px solid #E6E6E6;
+	text-align: left
+}
+#results-table th {
+	font-weight: bold
+}
+
+/*------------------
+ * 2. Debug
+ *------------------*/
+
+.log:only-child {
+	height: inherit
+}
+.log {
+	background-color: #e6e6e6;
+	border: 1px solid #e6e6e6;
+	color: black;
+	display: block;
+	font-family: "Courier New", Courier, monospace;
+	height: 230px;
+	overflow-y: scroll;
+	padding: 5px;
+	white-space: pre-wrap
+}
+div.screenshot {
+	border: 1px solid #e6e6e6;
+	float: left;
+	margin-left: 5px;
+	height: 220px
+}
+div.screenshot img {
+	height: 220px
+}
+
+/*if the result is passed or xpassed don't show debug row*/
+.passed + .debug, .unexpected.pass + .debug {
+	display: none;
+}
+
+/*------------------
+ * 3. Sorting items
+ *------------------*/
+.sortable {
+	cursor: pointer;
+}
+
+.sort-icon {
+	font-size: 0px;
+	float: left;
+	margin-right: 5px;
+	margin-top: 5px;
+	/*triangle*/
+	width: 0;
+	height: 0;
+	border-left: 8px solid transparent;
+	border-right: 8px solid transparent;
+}
+
+.inactive .sort-icon {
+	/*finish triangle*/
+	border-top: 8px solid #E6E6E6;
+}
+
+.asc.active .sort-icon {
+	/*finish triangle*/
+	border-bottom: 8px solid #999;
+}
+
+.desc.active .sort-icon {
+	/*finish triangle*/
+	border-top: 8px solid #999;
+}
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/xmlgen.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/xmlgen.py
new file mode 100644
index 00000000000..e8cf8edb3e9
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/html/xmlgen.py
@@ -0,0 +1,312 @@
+"""
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+This file is originally from: https://bitbucket.org/hpk42/py, specifically:
+https://bitbucket.org/hpk42/py/src/980c8d526463958ee7cae678a7e4e9b054f36b94/py/_xmlgen.py?at=default
+by holger krekel, holger at merlinux eu. 2009
+"""
+
+import re
+import sys
+
+if sys.version_info >= (3, 0):
+
+    def u(s):
+        return s
+
+    def unicode(x):
+        if hasattr(x, "__unicode__"):
+            return x.__unicode__()
+        return str(x)
+
+
+else:
+
+    def u(s):
+        return unicode(s)
+
+    # pylint: disable=W1612
+    unicode = unicode
+
+
+class NamespaceMetaclass(type):
+    def __getattr__(self, name):  # noqa: N804
+        if name[:1] == "_":
+            raise AttributeError(name)
+        if self == Namespace:
+            raise ValueError("Namespace class is abstract")
+        tagspec = self.__tagspec__
+        if tagspec is not None and name not in tagspec:
+            raise AttributeError(name)
+        classattr = {}
+        if self.__stickyname__:
+            classattr["xmlname"] = name
+        cls = type(name, (self.__tagclass__,), classattr)
+        setattr(self, name, cls)
+        return cls
+
+
+class Tag(list):
+    class Attr(object):
+        def __init__(self, **kwargs):
+            self.__dict__.update(kwargs)
+
+    def __init__(self, *args, **kwargs):
+        super(Tag, self).__init__(args)
+        self.attr = self.Attr(**kwargs)
+
+    def __unicode__(self):
+        return self.unicode(indent=0)
+
+    __str__ = __unicode__
+
+    def unicode(self, indent=2):
+        lv = []
+        SimpleUnicodeVisitor(lv.append, indent).visit(self)
+        return u("").join(lv)
+
+    def __repr__(self):
+        name = self.__class__.__name__
+        return "<%r tag object %d>" % (name, id(self))
+
+
+Namespace = NamespaceMetaclass(
+    "Namespace",
+    (object,),
+    {
+        "__tagspec__": None,
+        "__tagclass__": Tag,
+        "__stickyname__": False,
+    },
+)
+
+
+class HtmlTag(Tag):
+    def unicode(self, indent=2):
+        lv = []
+        HtmlVisitor(lv.append, indent, shortempty=False).visit(self)
+        return u("").join(lv)
+
+
+# exported plain html namespace
+
+
+class html(Namespace):
+    __tagclass__ = HtmlTag
+    __stickyname__ = True
+    __tagspec__ = dict(
+        [
+            (x, 1)
+            for x in (
+                "a,abbr,acronym,address,applet,area,b,bdo,big,blink,"
+                "blockquote,body,br,button,caption,center,cite,code,col,"
+                "colgroup,comment,dd,del,dfn,dir,div,dl,dt,em,embed,"
+                "fieldset,font,form,frameset,h1,h2,h3,h4,h5,h6,head,html,"
+                "i,iframe,img,input,ins,kbd,label,legend,li,link,listing,"
+                "map,marquee,menu,meta,multicol,nobr,noembed,noframes,"
+                "noscript,object,ol,optgroup,option,p,pre,q,s,script,"
+                "select,small,span,strike,strong,style,sub,sup,table,"
+                "tbody,td,textarea,tfoot,th,thead,title,tr,tt,u,ul,xmp,"
+                "base,basefont,frame,hr,isindex,param,samp,var"
+            ).split(",")
+            if x
+        ]
+    )
+
+    class Style(object):
+        def __init__(self, **kw):
+            for x, y in kw.items():
+                x = x.replace("_", "-")
+                setattr(self, x, y)
+
+
+class raw(object):
+    """just a box that can contain a unicode string that will be
+    included directly in the output"""
+
+    def __init__(self, uniobj):
+        self.uniobj = uniobj
+
+
+class SimpleUnicodeVisitor(object):
+    """recursive visitor to write unicode."""
+
+    def __init__(self, write, indent=0, curindent=0, shortempty=True):
+        self.write = write
+        self.cache = {}
+        self.visited = {}  # for detection of recursion
+        self.indent = indent
+        self.curindent = curindent
+        self.parents = []
+        self.shortempty = shortempty  # short empty tags or not
+
+    def visit(self, node):
+        """dispatcher on node's class/bases name."""
+        cls = node.__class__
+        try:
+            visitmethod = self.cache[cls]
+        except KeyError:
+            for subclass in cls.__mro__:
+                visitmethod = getattr(self, subclass.__name__, None)
+                if visitmethod is not None:
+                    break
+            else:
+                visitmethod = self.__object
+            self.cache[cls] = visitmethod
+        visitmethod(node)
+
+    # the default fallback handler is marked private
+    # to avoid clashes with the tag name object
+    def __object(self, obj):
+        # self.write(obj)
+        self.write(escape(unicode(obj)))
+
+    def raw(self, obj):
+        self.write(obj.uniobj)
+
+    def list(self, obj):
+        assert id(obj) not in self.visited
+        self.visited[id(obj)] = 1
+        for elem in obj:
+            self.visit(elem)
+
+    def Tag(self, tag):
+        assert id(tag) not in self.visited
+        try:
+            tag.parent = self.parents[-1]
+        except IndexError:
+            tag.parent = None
+        self.visited[id(tag)] = 1
+        tagname = getattr(tag, "xmlname", tag.__class__.__name__)
+        if self.curindent and not self._isinline(tagname):
+            self.write("\n" + u(" ") * self.curindent)
+        if tag:
+            self.curindent += self.indent
+            self.write(u("<%s%s>") % (tagname, self.attributes(tag)))
+            self.parents.append(tag)
+            for x in tag:
+                self.visit(x)
+            self.parents.pop()
+            self.write(u("</%s>") % tagname)
+            self.curindent -= self.indent
+        else:
+            nameattr = tagname + self.attributes(tag)
+            if self._issingleton(tagname):
+                self.write(u("<%s/>") % (nameattr,))
+            else:
+                self.write(u("<%s></%s>") % (nameattr, tagname))
+
+    def attributes(self, tag):
+        # serialize attributes
+        attrlist = dir(tag.attr)
+        attrlist.sort()
+        lv = []
+        for name in attrlist:
+            res = self.repr_attribute(tag.attr, name)
+            if res is not None:
+                lv.append(res)
+        lv.extend(self.getstyle(tag))
+        return u("").join(lv)
+
+    def repr_attribute(self, attrs, name):
+        if name[:2] != "__":
+            value = getattr(attrs, name)
+            if name.endswith("_"):
+                name = name[:-1]
+            if isinstance(value, raw):
+                insert = value.uniobj
+            else:
+                insert = escape(unicode(value))
+            return ' %s="%s"' % (name, insert)
+
+    def getstyle(self, tag):
+        """return attribute list suitable for styling."""
+        try:
+            styledict = tag.style.__dict__
+        except AttributeError:
+            return []
+        else:
+            stylelist = [x + ": " + y for x, y in styledict.items()]
+            return [u(' style="%s"') % u("; ").join(stylelist)]
+
+    def _issingleton(self, tagname):
+        """can (and will) be overridden in subclasses"""
+        return self.shortempty
+
+    def _isinline(self, tagname):
+        """can (and will) be overridden in subclasses"""
+        return False
+
+
+class HtmlVisitor(SimpleUnicodeVisitor):
+
+    single = dict(
+        [
+            (x, 1)
+            for x in ("br,img,area,param,col,hr,meta,link,base," "input,frame").split(
+                ","
+            )
+        ]
+    )
+    inline = dict(
+        [
+            (x, 1)
+            for x in (
+                "a abbr acronym b basefont bdo big br cite code dfn em font "
+                "i img input kbd label q s samp select small span strike "
+                "strong sub sup textarea tt u var".split(" ")
+            )
+        ]
+    )
+
+    def repr_attribute(self, attrs, name):
+        if name == "class_":
+            value = getattr(attrs, name)
+            if value is None:
+                return
+        return super(HtmlVisitor, self).repr_attribute(attrs, name)
+
+    def _issingleton(self, tagname):
+        return tagname in self.single
+
+    def _isinline(self, tagname):
+        return tagname in self.inline
+
+
+class _escape:
+    def __init__(self):
+        self.escape = {
+            u('"'): u("&quot;"),
+            u("<"): u("&lt;"),
+            u(">"): u("&gt;"),
+            u("&"): u("&amp;"),
+            u("'"): u("&apos;"),
+        }
+        self.charef_rex = re.compile(u("|").join(self.escape.keys()))
+
+    def _replacer(self, match):
+        return self.escape[match.group(0)]
+
+    def __call__(self, ustring):
+        """xml-escape the given unicode string."""
+        ustring = unicode(ustring)
+        return self.charef_rex.sub(self._replacer, ustring)
+
+
+escape = _escape()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/machformatter.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/machformatter.py
new file mode 100644
index 00000000000..2c425a2acc8
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/machformatter.py
@@ -0,0 +1,656 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import time
+from functools import reduce
+
+from mozterm import Terminal
+
+from ..handlers import SummaryHandler
+from . import base
+from .process import strstatus
+from .tbplformatter import TbplFormatter
+
+color_dict = {
+    "log_test_status_fail": "red",
+    "log_process_output": "blue",
+    "log_test_status_pass": "green",
+    "log_test_status_unexpected_fail": "red",
+    "log_test_status_known_intermittent": "yellow",
+    "time": "cyan",
+    "action": "yellow",
+    "pid": "cyan",
+    "heading": "bold_yellow",
+    "sub_heading": "yellow",
+    "error": "red",
+    "warning": "yellow",
+    "bold": "bold",
+    "grey": "grey",
+    "normal": "normal",
+    "bright_black": "bright_black",
+}
+
+DEFAULT = "\x1b(B\x1b[m"
+
+
+def format_seconds(total):
+    """Format number of seconds to MM:SS.DD form."""
+    minutes, seconds = divmod(total, 60)
+    return "%2d:%05.2f" % (minutes, seconds)
+
+
+class TerminalColors(object):
+    def __init__(self, term, color_dict):
+        for key, value in color_dict.items():
+            attribute = getattr(term, value)
+            # In Blessed, these attributes aren't always callable. We can assume
+            # that if they're not, they're just the raw ANSI Escape Sequences.
+            # This TerminalColors class is basically just a lookup table for
+            # what function to call to format/color an input string a certain way.
+            # So if the attribute above is a callable, we can just proceed, but
+            # if it's not, we need to create our own function that prepends the
+            # raw ANSI Escape Sequences to the input string, so that everything
+            # has the same behavior. We append DEFAULT to reset to no formatting
+            # at the end of our string, to prevent text that comes afterwards
+            # from inheriting the prepended formatting.
+            if not callable(attribute):
+
+                def apply_formatting(text):
+                    return attribute + text + DEFAULT
+
+                attribute = apply_formatting
+            setattr(self, key, attribute)
+
+
+class MachFormatter(base.BaseFormatter):
+    def __init__(
+        self,
+        start_time=None,
+        write_interval=False,
+        write_times=True,
+        terminal=None,
+        disable_colors=False,
+        summary_on_shutdown=False,
+        verbose=False,
+        enable_screenshot=False,
+        **kwargs
+    ):
+        super(MachFormatter, self).__init__(**kwargs)
+
+        if start_time is None:
+            start_time = time.time()
+        start_time = int(start_time * 1000)
+        self.start_time = start_time
+        self.write_interval = write_interval
+        self.write_times = write_times
+        self.status_buffer = {}
+        self.has_unexpected = {}
+        self.last_time = None
+        self.color_formatter = TerminalColors(
+            Terminal(disable_styling=disable_colors), color_dict
+        )
+        self.verbose = verbose
+        self._known_pids = set()
+        self.tbpl_formatter = None
+        self.enable_screenshot = enable_screenshot
+        self.summary = SummaryHandler()
+        self.summary_on_shutdown = summary_on_shutdown
+
+        message_handlers = {
+            "colors": {
+                "on": self._enable_colors,
+                "off": self._disable_colors,
+            },
+            "summary_on_shutdown": {
+                "on": self._enable_summary_on_shutdown,
+                "off": self._disable_summary_on_shutdown,
+            },
+        }
+
+        for topic, handlers in message_handlers.items():
+            self.message_handler.register_message_handlers(topic, handlers)
+
+    def __call__(self, data):
+        self.summary(data)
+
+        s = super(MachFormatter, self).__call__(data)
+        if s is None:
+            return
+
+        time = self.color_formatter.time(format_seconds(self._time(data)))
+        return "%s %s\n" % (time, s)
+
+    def _enable_colors(self):
+        self.disable_colors = False
+
+    def _disable_colors(self):
+        self.disable_colors = True
+
+    def _enable_summary_on_shutdown(self):
+        self.summary_on_shutdown = True
+
+    def _disable_summary_on_shutdown(self):
+        self.summary_on_shutdown = False
+
+    def _get_test_id(self, data):
+        test_id = data.get("test")
+        if isinstance(test_id, list):
+            test_id = tuple(test_id)
+        return test_id
+
+    def _get_file_name(self, test_id):
+        if isinstance(test_id, str):
+            return test_id
+
+        if isinstance(test_id, tuple):
+            return "".join(test_id)
+
+        assert False, "unexpected test_id"
+
+    def suite_start(self, data):
+        num_tests = reduce(lambda x, y: x + len(y), data["tests"].values(), 0)
+        action = self.color_formatter.action(data["action"].upper())
+        name = ""
+        if "name" in data:
+            name = " %s -" % (data["name"],)
+        return "%s:%s running %i tests" % (action, name, num_tests)
+
+    def suite_end(self, data):
+        action = self.color_formatter.action(data["action"].upper())
+        rv = [action]
+        if not self.summary_on_shutdown:
+            rv.append(
+                self._format_suite_summary(
+                    self.summary.current_suite, self.summary.current
+                )
+            )
+        return "\n".join(rv)
+
+    def _format_expected(self, status, expected, known_intermittent=[]):
+        if status == expected:
+            color = self.color_formatter.log_test_status_pass
+            if expected not in ("PASS", "OK"):
+                color = self.color_formatter.log_test_status_fail
+                status = "EXPECTED-%s" % status
+        else:
+            if status in known_intermittent:
+                color = self.color_formatter.log_test_status_known_intermittent
+                status = "KNOWN-INTERMITTENT-%s" % status
+            else:
+                color = self.color_formatter.log_test_status_fail
+                if status in ("PASS", "OK"):
+                    status = "UNEXPECTED-%s" % status
+        return color(status)
+
+    def _format_status(self, test, data):
+        name = data.get("subtest", test)
+        rv = "%s %s" % (
+            self._format_expected(
+                data["status"],
+                data.get("expected", data["status"]),
+                data.get("known_intermittent", []),
+            ),
+            name,
+        )
+        if "message" in data:
+            rv += " - %s" % data["message"]
+        if "stack" in data:
+            rv += self._format_stack(data["stack"])
+        return rv
+
+    def _format_stack(self, stack):
+        return "\n%s\n" % self.color_formatter.bright_black(stack.strip("\n"))
+
+    def _format_suite_summary(self, suite, summary):
+        count = summary["counts"]
+        logs = summary["unexpected_logs"]
+        intermittent_logs = summary["intermittent_logs"]
+        harness_errors = summary["harness_errors"]
+
+        rv = [
+            "",
+            self.color_formatter.sub_heading(suite),
+            self.color_formatter.sub_heading("~" * len(suite)),
+        ]
+
+        # Format check counts
+        checks = self.summary.aggregate("count", count)
+        rv.append(
+            "Ran {} checks ({})".format(
+                sum(checks.values()),
+                ", ".join(
+                    ["{} {}s".format(v, k) for k, v in sorted(checks.items()) if v]
+                ),
+            )
+        )
+
+        # Format expected counts
+        checks = self.summary.aggregate("expected", count, include_skip=False)
+        intermittent_checks = self.summary.aggregate(
+            "known_intermittent", count, include_skip=False
+        )
+        intermittents = sum(intermittent_checks.values())
+        known = (
+            " ({} known intermittents)".format(intermittents) if intermittents else ""
+        )
+        rv.append("Expected results: {}{}".format(sum(checks.values()), known))
+
+        # Format skip counts
+        skip_tests = count["test"]["expected"]["skip"]
+        skip_subtests = count["subtest"]["expected"]["skip"]
+        if skip_tests:
+            skipped = "Skipped: {} tests".format(skip_tests)
+            if skip_subtests:
+                skipped = "{}, {} subtests".format(skipped, skip_subtests)
+            rv.append(skipped)
+
+        # Format unexpected counts
+        checks = self.summary.aggregate("unexpected", count)
+        unexpected_count = sum(checks.values())
+        rv.append("Unexpected results: {}".format(unexpected_count))
+        if unexpected_count:
+            for key in ("test", "subtest", "assert"):
+                if not count[key]["unexpected"]:
+                    continue
+                status_str = ", ".join(
+                    [
+                        "{} {}".format(n, s)
+                        for s, n in sorted(count[key]["unexpected"].items())
+                    ]
+                )
+                rv.append(
+                    "  {}: {} ({})".format(
+                        key, sum(count[key]["unexpected"].values()), status_str
+                    )
+                )
+
+        # Format intermittents
+        if intermittents > 0:
+            heading = "Known Intermittent Results"
+            rv.extend(
+                [
+                    "",
+                    self.color_formatter.heading(heading),
+                    self.color_formatter.heading("-" * len(heading)),
+                ]
+            )
+            if count["subtest"]["count"]:
+                for test_id, results in intermittent_logs.items():
+                    test = self._get_file_name(test_id)
+                    rv.append(self.color_formatter.bold(test))
+                    for data in results:
+                        rv.append("  %s" % self._format_status(test, data).rstrip())
+            else:
+                for test_id, results in intermittent_logs.items():
+                    test = self._get_file_name(test_id)
+                    for data in results:
+                        assert "subtest" not in data
+                        rv.append(self._format_status(test, data).rstrip())
+
+        # Format status
+        testfailed = any(
+            count[key]["unexpected"] for key in ("test", "subtest", "assert")
+        )
+        if not testfailed and not harness_errors:
+            rv.append(self.color_formatter.log_test_status_pass("OK"))
+        else:
+            # Format test failures
+            heading = "Unexpected Results"
+            rv.extend(
+                [
+                    "",
+                    self.color_formatter.heading(heading),
+                    self.color_formatter.heading("-" * len(heading)),
+                ]
+            )
+            if count["subtest"]["count"]:
+                for test_id, results in logs.items():
+                    test = self._get_file_name(test_id)
+                    rv.append(self.color_formatter.bold(test))
+                    for data in results:
+                        rv.append("  %s" % self._format_status(test, data).rstrip())
+            else:
+                for test_id, results in logs.items():
+                    test = self._get_file_name(test_id)
+                    for data in results:
+                        assert "subtest" not in data
+                        rv.append(self._format_status(test, data).rstrip())
+
+            # Format harness errors
+            if harness_errors:
+                for data in harness_errors:
+                    rv.append(self.log(data))
+
+        return "\n".join(rv)
+
+    def test_start(self, data):
+        action = self.color_formatter.action(data["action"].upper())
+        return "%s: %s" % (action, self._get_test_id(data))
+
+    def test_end(self, data):
+        subtests = self._get_subtest_data(data)
+
+        if "expected" in data and data["status"] not in data.get(
+            "known_intermittent", []
+        ):
+            parent_unexpected = True
+            expected_str = ", expected %s" % data["expected"]
+        else:
+            parent_unexpected = False
+            expected_str = ""
+
+        has_screenshots = "reftest_screenshots" in data.get("extra", {})
+
+        test = self._get_test_id(data)
+
+        # Reset the counts to 0
+        self.status_buffer[test] = {"count": 0, "unexpected": 0, "pass": 0}
+        self.has_unexpected[test] = bool(subtests["unexpected"])
+
+        if subtests["count"] != 0:
+            rv = "Test %s%s. Subtests passed %i/%i. Unexpected %s" % (
+                data["status"],
+                expected_str,
+                subtests["pass"],
+                subtests["count"],
+                subtests["unexpected"],
+            )
+        else:
+            rv = "%s%s" % (data["status"], expected_str)
+
+        unexpected = self.summary.current["unexpected_logs"].get(data["test"])
+        if unexpected:
+            if len(unexpected) == 1 and parent_unexpected:
+                message = unexpected[0].get("message", "")
+                if message:
+                    rv += " - %s" % message
+                if "stack" in data:
+                    rv += self._format_stack(data["stack"])
+            elif not self.verbose:
+                rv += "\n"
+                for d in unexpected:
+                    rv += self._format_status(data["test"], d)
+
+        intermittents = self.summary.current["intermittent_logs"].get(data["test"])
+        if intermittents:
+            rv += "\n"
+            for d in intermittents:
+                rv += self._format_status(data["test"], d)
+
+        if "expected" not in data and not bool(subtests["unexpected"]):
+            color = self.color_formatter.log_test_status_pass
+        else:
+            color = self.color_formatter.log_test_status_unexpected_fail
+
+        action = color(data["action"].upper())
+        rv = "%s: %s" % (action, rv)
+        if has_screenshots and self.enable_screenshot:
+            if self.tbpl_formatter is None:
+                self.tbpl_formatter = TbplFormatter()
+            # Create TBPL-like output that can be pasted into the reftest analyser
+            rv = "\n".join((rv, self.tbpl_formatter.test_end(data)))
+        return rv
+
+    def valgrind_error(self, data):
+        rv = " " + data["primary"] + "\n"
+        for line in data["secondary"]:
+            rv = rv + line + "\n"
+
+        return rv
+
+    def lsan_leak(self, data):
+        allowed = data.get("allowed_match")
+        if allowed:
+            prefix = self.color_formatter.log_test_status_fail("FAIL")
+        else:
+            prefix = self.color_formatter.log_test_status_unexpected_fail(
+                "UNEXPECTED-FAIL"
+            )
+
+        return "%s LeakSanitizer: leak at %s" % (prefix, ", ".join(data["frames"]))
+
+    def lsan_summary(self, data):
+        allowed = data.get("allowed", False)
+        if allowed:
+            prefix = self.color_formatter.warning("WARNING")
+        else:
+            prefix = self.color_formatter.error("ERROR")
+
+        return (
+            "%s | LeakSanitizer | "
+            "SUMMARY: AddressSanitizer: %d byte(s) leaked in %d allocation(s)."
+            % (prefix, data["bytes"], data["allocations"])
+        )
+
+    def mozleak_object(self, data):
+        data_log = data.copy()
+        data_log["level"] = "INFO"
+        data_log["message"] = "leakcheck: %s leaked %d %s" % (
+            data["process"],
+            data["bytes"],
+            data["name"],
+        )
+        return self.log(data_log)
+
+    def mozleak_total(self, data):
+        if data["bytes"] is None:
+            # We didn't see a line with name 'TOTAL'
+            if data.get("induced_crash", False):
+                data_log = data.copy()
+                data_log["level"] = "INFO"
+                data_log["message"] = (
+                    "leakcheck: %s deliberate crash and thus no leak log\n"
+                    % data["process"]
+                )
+                return self.log(data_log)
+            if data.get("ignore_missing", False):
+                return (
+                    "%s ignoring missing output line for total leaks\n"
+                    % data["process"]
+                )
+
+            status = self.color_formatter.log_test_status_pass("FAIL")
+            return "%s leakcheck: " "%s missing output line for total leaks!\n" % (
+                status,
+                data["process"],
+            )
+
+        if data["bytes"] == 0:
+            return "%s leakcheck: %s no leaks detected!\n" % (
+                self.color_formatter.log_test_status_pass("PASS"),
+                data["process"],
+            )
+
+        message = "leakcheck: %s %d bytes leaked\n" % (data["process"], data["bytes"])
+
+        # data["bytes"] will include any expected leaks, so it can be off
+        # by a few thousand bytes.
+        failure = data["bytes"] > data["threshold"]
+        status = (
+            self.color_formatter.log_test_status_unexpected_fail("UNEXPECTED-FAIL")
+            if failure
+            else self.color_formatter.log_test_status_fail("FAIL")
+        )
+        return "%s %s\n" % (status, message)
+
+    def test_status(self, data):
+        test = self._get_test_id(data)
+        if test not in self.status_buffer:
+            self.status_buffer[test] = {"count": 0, "unexpected": 0, "pass": 0}
+        self.status_buffer[test]["count"] += 1
+
+        if data["status"] == "PASS":
+            self.status_buffer[test]["pass"] += 1
+
+        if "expected" in data and data["status"] not in data.get(
+            "known_intermittent", []
+        ):
+            self.status_buffer[test]["unexpected"] += 1
+
+        if self.verbose:
+            return self._format_status(test, data).rstrip("\n")
+
+    def assertion_count(self, data):
+        if data["min_expected"] <= data["count"] <= data["max_expected"]:
+            return
+
+        if data["min_expected"] != data["max_expected"]:
+            expected = "%i to %i" % (data["min_expected"], data["max_expected"])
+        else:
+            expected = "%i" % data["min_expected"]
+
+        action = self.color_formatter.log_test_status_fail("ASSERT")
+        return "%s: Assertion count %i, expected %s assertions\n" % (
+            action,
+            data["count"],
+            expected,
+        )
+
+    def process_output(self, data):
+        rv = []
+
+        pid = data["process"]
+        if pid.isdigit():
+            pid = "pid:%s" % pid
+        pid = self.color_formatter.pid(pid)
+
+        if "command" in data and data["process"] not in self._known_pids:
+            self._known_pids.add(data["process"])
+            rv.append("%s Full command: %s" % (pid, data["command"]))
+
+        rv.append("%s %s" % (pid, data["data"]))
+        return "\n".join(rv)
+
+    def crash(self, data):
+        test = self._get_test_id(data)
+
+        if data.get("stackwalk_returncode", 0) != 0 and not data.get(
+            "stackwalk_stderr"
+        ):
+            success = True
+        else:
+            success = False
+
+        rv = [
+            "pid:%s. Process type: %s. Test:%s. Minidump analysed:%s. Signature:[%s]"
+            % (
+                data.get("pid", "unknown"),
+                data.get("process_type", None),
+                test,
+                success,
+                data["signature"],
+            )
+        ]
+
+        if data.get("java_stack"):
+            rv.append("Java exception: %s" % data["java_stack"])
+        else:
+            if data.get("reason"):
+                rv.append("Mozilla crash reason: %s" % data["reason"])
+
+            if data.get("minidump_path"):
+                rv.append("Crash dump filename: %s" % data["minidump_path"])
+
+            if data.get("stackwalk_returncode", 0) != 0:
+                rv.append(
+                    "minidump-stackwalk exited with return code %d"
+                    % data["stackwalk_returncode"]
+                )
+
+            if data.get("stackwalk_stderr"):
+                rv.append("stderr from minidump-stackwalk:")
+                rv.append(data["stackwalk_stderr"])
+            elif data.get("stackwalk_stdout"):
+                rv.append(data["stackwalk_stdout"])
+
+            if data.get("stackwalk_errors"):
+                rv.extend(data.get("stackwalk_errors"))
+
+        rv = "\n".join(rv)
+        if not rv[-1] == "\n":
+            rv += "\n"
+
+        action = self.color_formatter.action(data["action"].upper())
+        return "%s: %s" % (action, rv)
+
+    def process_start(self, data):
+        rv = "Started process `%s`" % data["process"]
+        desc = data.get("command")
+        if desc:
+            rv = "%s (%s)" % (rv, desc)
+        return rv
+
+    def process_exit(self, data):
+        return "%s: %s" % (data["process"], strstatus(data["exitcode"]))
+
+    def log(self, data):
+        level = data.get("level").upper()
+
+        if level in ("CRITICAL", "ERROR"):
+            level = self.color_formatter.error(level)
+        elif level == "WARNING":
+            level = self.color_formatter.warning(level)
+        elif level == "INFO":
+            level = self.color_formatter.log_process_output(level)
+
+        if data.get("component"):
+            rv = " ".join([data["component"], level, data["message"]])
+        else:
+            rv = "%s %s" % (level, data["message"])
+
+        if "stack" in data:
+            rv += "\n%s" % data["stack"]
+
+        return rv
+
+    def lint(self, data):
+        fmt = (
+            "{path}  {c1}{lineno}{column}  {c2}{level}{normal}  {message}"
+            "  {c1}{rule}({linter}){normal}"
+        )
+        message = fmt.format(
+            path=data["path"],
+            normal=self.color_formatter.normal,
+            c1=self.color_formatter.grey,
+            c2=self.color_formatter.error
+            if data["level"] == "error"
+            else (self.color_formatter.log_test_status_fail),
+            lineno=str(data["lineno"]),
+            column=(":" + str(data["column"])) if data.get("column") else "",
+            level=data["level"],
+            message=data["message"],
+            rule="{} ".format(data["rule"]) if data.get("rule") else "",
+            linter=data["linter"].lower() if data.get("linter") else "",
+        )
+
+        return message
+
+    def shutdown(self, data):
+        if not self.summary_on_shutdown:
+            return
+
+        heading = "Overall Summary"
+        rv = [
+            "",
+            self.color_formatter.heading(heading),
+            self.color_formatter.heading("=" * len(heading)),
+        ]
+        for suite, summary in self.summary:
+            rv.append(self._format_suite_summary(suite, summary))
+        return "\n".join(rv)
+
+    def _get_subtest_data(self, data):
+        test = self._get_test_id(data)
+        return self.status_buffer.get(test, {"count": 0, "unexpected": 0, "pass": 0})
+
+    def _time(self, data):
+        entry_time = data["time"]
+        if self.write_interval and self.last_time is not None:
+            t = entry_time - self.last_time
+            self.last_time = entry_time
+        else:
+            t = entry_time - self.start_time
+
+        return t / 1000.0
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/process.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/process.py
new file mode 100644
index 00000000000..582afbf9358
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/process.py
@@ -0,0 +1,58 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import signal
+
+# a dict cache of signal number -> signal name
+_SIG_NAME = None
+
+
+def strsig(n):
+    """
+    Translate a process signal identifier to a human readable string.
+    """
+    global _SIG_NAME
+
+    if _SIG_NAME is None:
+        # cache signal names
+        _SIG_NAME = {}
+        for k in dir(signal):
+            if (
+                k.startswith("SIG") and
+                not k.startswith("SIG_") and
+                k != "SIGCLD" and
+                k != "SIGPOLL"
+            ):
+
+                _SIG_NAME[getattr(signal, k)] = k
+
+        # Realtime signals mostly have no names
+        if hasattr(signal, "SIGRTMIN") and hasattr(signal, "SIGRTMAX"):
+            for r in range(signal.SIGRTMIN + 1, signal.SIGRTMAX + 1):
+                _SIG_NAME[r] = "SIGRTMIN+" + str(r - signal.SIGRTMIN)
+
+    if n < 0 or n >= signal.NSIG:
+        return "out-of-range signal, number %s" % n
+    try:
+        return _SIG_NAME[n]
+    except KeyError:
+        return "unrecognized signal, number %s" % n
+
+
+def strstatus(status):
+    """
+    Returns a human readable string of a process exit code, as returned
+    by the subprocess module.
+    """
+    # 'status' is the exit status
+    if os.name != "posix":
+        # Windows error codes are easier to look up if printed in hexadecimal
+        if status < 0:
+            status += 2 ** 32
+        return "exit %x" % status
+    elif status >= 0:
+        return "exit %d" % status
+    else:
+        return "killed by %s" % strsig(-status)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/tbplformatter.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/tbplformatter.py
new file mode 100644
index 00000000000..2fec3946fea
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/tbplformatter.py
@@ -0,0 +1,452 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import functools
+from collections import deque
+from functools import reduce
+
+from ..handlers import SummaryHandler
+from .base import BaseFormatter
+from .process import strstatus
+
+
+def output_subtests(func):
+    @functools.wraps(func)
+    def inner(self, data):
+        if self.subtests_count:
+            return self._format_subtests(data.get("component")) + func(self, data)
+        else:
+            return func(self, data)
+
+    return inner
+
+
+class TbplFormatter(BaseFormatter):
+    """Formatter that formats logs in the legacy formatting format used by TBPL
+    This is intended to be used to preserve backward compatibility with existing tools
+    hand-parsing this format.
+    """
+
+    def __init__(self, compact=False, summary_on_shutdown=False, **kwargs):
+        super(TbplFormatter, self).__init__(**kwargs)
+        self.suite_start_time = None
+        self.test_start_times = {}
+        self.buffer = None
+        self.compact = compact
+        self.subtests_count = 0
+
+        self.summary = SummaryHandler()
+        self.summary_on_shutdown = summary_on_shutdown
+
+    def __call__(self, data):
+        if self.summary_on_shutdown:
+            self.summary(data)
+        return super(TbplFormatter, self).__call__(data)
+
+    @property
+    def compact(self):
+        return self._compact
+
+    @compact.setter
+    def compact(self, value):
+        self._compact = value
+        if value:
+            self.buffer = deque([], 10)
+        else:
+            self.buffer = None
+
+    def _format_subtests(self, component, subtract_context=False):
+        count = self.subtests_count
+        if subtract_context:
+            count -= len(self.buffer)
+        self.subtests_count = 0
+        return self._log(
+            {"level": "INFO", "message": "." * count, "component": component}
+        )
+
+    @output_subtests
+    def log(self, data):
+        return self._log(data)
+
+    def _log(self, data):
+        if data.get("component"):
+            message = "%s %s" % (data["component"], data["message"])
+        else:
+            message = data["message"]
+
+        if "stack" in data:
+            message += "\n%s" % data["stack"]
+
+        return "%s\n" % message
+
+    @output_subtests
+    def process_output(self, data):
+        pid = data["process"]
+        if pid.isdigit():
+            pid = "PID %s" % pid
+        return "%s | %s\n" % (pid, data["data"])
+
+    @output_subtests
+    def process_start(self, data):
+        msg = "TEST-INFO | started process %s" % data["process"]
+        if "command" in data:
+            msg = "%s (%s)" % (msg, data["command"])
+        return msg + "\n"
+
+    @output_subtests
+    def process_exit(self, data):
+        return "TEST-INFO | %s: %s\n" % (data["process"], strstatus(data["exitcode"]))
+
+    @output_subtests
+    def crash(self, data):
+        id = data["test"] if "test" in data else "pid: %s" % data["process"]
+
+        if data.get("java_stack"):
+            # use "<exception> at <top frame>" as a crash signature for java exception
+            sig = data["java_stack"].split("\n")
+            sig = " ".join(sig[0:2])
+            rv = ["PROCESS-CRASH | %s | %s\n[%s]" % (id, sig, data["java_stack"])]
+
+            if data.get("reason"):
+                rv.append("Mozilla crash reason: %s" % data["reason"])
+
+            if data.get("minidump_path"):
+                rv.append("Crash dump filename: %s" % data["minidump_path"])
+
+        else:
+            signature = data["signature"] if data["signature"] else "unknown top frame"
+            reason = data.get("reason", "application crashed")
+            rv = ["PROCESS-CRASH | %s [%s] | %s " % (reason, signature, id)]
+
+            if data.get("process_type"):
+                rv.append("Process type: {}".format(data["process_type"]))
+
+            rv.append("Process pid: {}".format(data.get("pid", "unknown")))
+
+            if data.get("reason"):
+                rv.append("Mozilla crash reason: %s" % data["reason"])
+
+            if data.get("minidump_path"):
+                rv.append("Crash dump filename: %s" % data["minidump_path"])
+
+            if data.get("stackwalk_stderr"):
+                rv.append("stderr from minidump-stackwalk:")
+                rv.append(data["stackwalk_stderr"])
+            elif data.get("stackwalk_stdout"):
+                rv.append(data["stackwalk_stdout"])
+
+            if data.get("stackwalk_returncode", 0) != 0:
+                rv.append(
+                    "minidump-stackwalk exited with return code %d"
+                    % data["stackwalk_returncode"]
+                )
+
+            if data.get("stackwalk_errors"):
+                rv.extend(data.get("stackwalk_errors"))
+
+        rv = "\n".join(rv)
+        if not rv[-1] == "\n":
+            rv += "\n"
+
+        return rv
+
+    def suite_start(self, data):
+        self.suite_start_time = data["time"]
+        num_tests = reduce(lambda x, y: x + len(y), data["tests"].values(), 0)
+        return "SUITE-START | Running %i tests\n" % num_tests
+
+    def test_start(self, data):
+        self.test_start_times[self.test_id(data["test"])] = data["time"]
+
+        return "TEST-START | %s\n" % data["test"]
+
+    def test_status(self, data):
+        if self.compact:
+            if "expected" in data:
+                rv = []
+                rv.append(
+                    self._format_subtests(data.get("component"), subtract_context=True)
+                )
+                rv.extend(self._format_status(item) for item in self.buffer)
+                rv.append(self._format_status(data))
+                self.buffer.clear()
+                return "".join(rv)
+            else:
+                self.subtests_count += 1
+                self.buffer.append(data)
+        else:
+            return self._format_status(data)
+
+    def assertion_count(self, data):
+        if data["min_expected"] != data["max_expected"]:
+            expected = "%i to %i" % (data["min_expected"], data["max_expected"])
+        else:
+            expected = "%i" % data["min_expected"]
+
+        if data["count"] < data["min_expected"]:
+            status, comparison = "TEST-UNEXPECTED-PASS", "is less than"
+        elif data["count"] > data["max_expected"]:
+            status, comparison = "TEST-UNEXPECTED-FAIL", "is more than"
+        elif data["count"] > 0:
+            status, comparison = "TEST-KNOWN-FAIL", "matches"
+        else:
+            return
+
+        return "%s | %s | assertion count %i %s expected %s assertions\n" % (
+            status,
+            data["test"],
+            data["count"],
+            comparison,
+            expected,
+        )
+
+    def _format_status(self, data):
+        message = "- " + data["message"] if "message" in data else ""
+        if "stack" in data:
+            message += "\n%s" % data["stack"]
+        if message and message[-1] == "\n":
+            message = message[:-1]
+
+        status = data["status"]
+
+        if "expected" in data:
+            if status in data.get("known_intermittent", []):
+                status = "KNOWN-INTERMITTENT-%s" % status
+            else:
+                if not message:
+                    message = "- expected %s" % data["expected"]
+                failure_line = "TEST-UNEXPECTED-%s | %s | %s %s\n" % (
+                    status,
+                    data["test"],
+                    data["subtest"],
+                    message,
+                )
+                if data["expected"] != "PASS":
+                    info_line = "TEST-INFO | expected %s\n" % data["expected"]
+                    return failure_line + info_line
+                return failure_line
+
+        return "TEST-%s | %s | %s %s\n" % (
+            status,
+            data["test"],
+            data["subtest"],
+            message,
+        )
+
+    def test_end(self, data):
+        rv = []
+        if self.compact and self.subtests_count:
+            print_context = "expected" in data
+            rv.append(
+                self._format_subtests(
+                    data.get("component"), subtract_context=print_context
+                )
+            )
+            if print_context:
+                rv.extend(self._format_status(item) for item in self.buffer)
+            self.buffer.clear()
+
+        test_id = self.test_id(data["test"])
+        duration_msg = ""
+
+        if test_id in self.test_start_times:
+            start_time = self.test_start_times.pop(test_id)
+            time = data["time"] - start_time
+            duration_msg = "took %ims" % time
+
+        screenshot_msg = ""
+        extra = data.get("extra", {})
+        if "reftest_screenshots" in extra:
+            screenshots = extra["reftest_screenshots"]
+            if len(screenshots) == 3:
+                screenshot_msg = (
+                    "\nREFTEST   IMAGE 1 (TEST): data:image/png;base64,%s\n"
+                    "REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,%s"
+                ) % (screenshots[0]["screenshot"], screenshots[2]["screenshot"])
+            elif len(screenshots) == 1:
+                screenshot_msg = (
+                    "\nREFTEST   IMAGE: data:image/png;base64,%s"
+                    % screenshots[0]["screenshot"]
+                )
+
+        status = data["status"]
+
+        if "expected" in data:
+            if status in data.get("known_intermittent", []):
+                status = "KNOWN-INTERMITTENT-%s" % status
+            else:
+                message = data.get("message", "")
+                if not message:
+                    message = "expected %s" % data["expected"]
+                if "stack" in data:
+                    message += "\n%s" % data["stack"]
+                if message and message[-1] == "\n":
+                    message = message[:-1]
+
+                message += screenshot_msg
+
+                failure_line = "TEST-UNEXPECTED-%s | %s | %s\n" % (
+                    data["status"],
+                    test_id,
+                    message,
+                )
+
+                if data["expected"] not in ("PASS", "OK"):
+                    expected_msg = "expected %s | " % data["expected"]
+                else:
+                    expected_msg = ""
+                info_line = "TEST-INFO %s%s\n" % (expected_msg, duration_msg)
+
+                return failure_line + info_line
+
+        sections = ["TEST-%s" % status, test_id]
+        if duration_msg:
+            sections.append(duration_msg)
+        rv.append(" | ".join(sections) + "\n")
+        if screenshot_msg:
+            rv.append(screenshot_msg[1:] + "\n")
+        return "".join(rv)
+
+    def suite_end(self, data):
+        start_time = self.suite_start_time
+        # pylint --py3k W1619
+        # in wpt --repeat mode sometimes we miss suite_start()
+        if start_time is None:
+            start_time = data["time"]
+        time = int((data["time"] - start_time) / 1000)
+
+        return "SUITE-END | took %is\n" % time
+
+    def test_id(self, test_id):
+        if isinstance(test_id, str):
+            return test_id
+        else:
+            return tuple(test_id)
+
+    @output_subtests
+    def valgrind_error(self, data):
+        rv = "TEST-UNEXPECTED-VALGRIND-ERROR | " + data["primary"] + "\n"
+        for line in data["secondary"]:
+            rv = rv + line + "\n"
+
+        return rv
+
+    def lint(self, data):
+        fmt = "TEST-UNEXPECTED-{level} | {path}:{lineno}{column} | {message} ({rule})"
+        data["column"] = ":%s" % data["column"] if data["column"] else ""
+        data["rule"] = data["rule"] or data["linter"] or ""
+        return fmt.append(fmt.format(**data))
+
+    def lsan_leak(self, data):
+        frames = data.get("frames")
+        allowed_match = data.get("allowed_match")
+        frame_list = ", ".join(frames)
+        prefix = "TEST-UNEXPECTED-FAIL" if not allowed_match else "TEST-FAIL"
+        suffix = (
+            ""
+            if not allowed_match
+            else "INFO | LeakSanitizer | Frame %s matched a expected leak\n"
+            % allowed_match
+        )
+        return "%s | LeakSanitizer | leak at %s\n%s" % (prefix, frame_list, suffix)
+
+    def lsan_summary(self, data):
+        level = "INFO" if data.get("allowed", False) else "ERROR"
+        return (
+            "%s | LeakSanitizer | "
+            "SUMMARY: AddressSanitizer: %d byte(s) leaked in %d allocation(s)."
+            % (level, data["bytes"], data["allocations"])
+        )
+
+    def mozleak_object(self, data):
+        return "TEST-INFO | leakcheck | %s leaked %d %s\n" % (
+            data["process"],
+            data["bytes"],
+            data["name"],
+        )
+
+    def mozleak_total(self, data):
+        if data["bytes"] is None:
+            # We didn't see a line with name 'TOTAL'
+            if data.get("induced_crash", False):
+                return (
+                    "TEST-INFO | leakcheck | %s deliberate crash and thus no leak log\n"
+                    % data["process"]
+                )
+            if data.get("ignore_missing", False):
+                return (
+                    "TEST-INFO | leakcheck | "
+                    "%s ignoring missing output line for total leaks\n"
+                    % data["process"]
+                )
+
+            return (
+                "TEST-UNEXPECTED-FAIL | leakcheck | "
+                "%s missing output line for total leaks!\n" % data["process"]
+            )
+
+        if data["bytes"] == 0:
+            return "TEST-PASS | leakcheck | %s no leaks detected!\n" % data["process"]
+
+        # Create a comma delimited string of the first N leaked objects found,
+        # to aid with bug summary matching in TBPL. Note: The order of the objects
+        # had no significance (they're sorted alphabetically).
+        max_objects = 5
+        object_summary = ", ".join(data["objects"][:max_objects])
+        if len(data["objects"]) > max_objects:
+            object_summary += ", ..."
+
+        message = "leakcheck | %s %d bytes leaked (%s)\n" % (
+            data["process"],
+            data["bytes"],
+            object_summary,
+        )
+
+        # data["bytes"] will include any expected leaks, so it can be off
+        # by a few thousand bytes.
+        if data["bytes"] > data["threshold"]:
+            return "TEST-UNEXPECTED-FAIL | %s\n" % message
+        else:
+            return "WARNING | %s\n" % message
+
+    def _format_suite_summary(self, suite, summary):
+        counts = summary["counts"]
+        logs = summary["unexpected_logs"]
+        intermittent_logs = summary["intermittent_logs"]
+
+        total = sum(self.summary.aggregate("count", counts).values())
+        expected = sum(self.summary.aggregate("expected", counts).values())
+        intermittents = sum(
+            self.summary.aggregate("known_intermittent", counts).values()
+        )
+        known = (
+            " ({} known intermittent tests)".format(intermittents)
+            if intermittents
+            else ""
+        )
+        status_str = "{}/{}{}".format(expected, total, known)
+        rv = ["{}: {}".format(suite, status_str)]
+
+        for results in logs.values():
+            for data in results:
+                rv.append("  {}".format(self._format_status(data)))
+
+        if intermittent_logs:
+            rv.append("Known Intermittent tests:")
+            for results in intermittent_logs.values():
+                for data in results:
+                    data["subtest"] = data.get("subtest", "")
+                    rv.append("  {}".format(self._format_status(data)))
+
+        return "\n".join(rv)
+
+    def shutdown(self, data):
+        if not self.summary_on_shutdown:
+            return
+
+        rv = ["", "Overall Summary"]
+        for suite, summary in self.summary:
+            rv.append(self._format_suite_summary(suite, summary))
+        rv.append("")
+        return "\n".join(rv)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/unittest.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/unittest.py
new file mode 100644
index 00000000000..e644f80094a
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/unittest.py
@@ -0,0 +1,82 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+from . import base
+
+
+class UnittestFormatter(base.BaseFormatter):
+    """Formatter designed to produce output in a format like that used by
+    the ``unittest`` module in the standard library."""
+
+    def __init__(self):
+        self.fails = []
+        self.errors = []
+        self.tests_run = 0
+        self.start_time = None
+        self.end_time = None
+
+    def suite_start(self, data):
+        self.start_time = data["time"]
+
+    def test_start(self, data):
+        self.tests_run += 1
+
+    def test_end(self, data):
+        char = "."
+        if "expected" in data:
+            status = data["status"]
+            char = {"FAIL": "F", "PRECONDITION_FAILED": "F", "ERROR": "E", "PASS": "X"}[
+                status
+            ]
+
+            if status == "FAIL" or status == "PRECONDITION_FAILED":
+                self.fails.append(data)
+            elif status == "ERROR":
+                self.errors.append(data)
+
+        elif data["status"] == "SKIP":
+            char = "S"
+        return char
+
+    def assertion_count(self, data):
+        if data["count"] < data["min_expected"]:
+            char = "X"
+        elif data["count"] > data["max_expected"]:
+            char = "F"
+            self.fails.append(
+                {
+                    "test": data["test"],
+                    "message": (
+                        "assertion count %i is greated than %i"
+                        % (data["count"], data["max_expected"])
+                    ),
+                }
+            )
+        elif data["count"] > 0:
+            char = "."
+        else:
+            char = "."
+
+        return char
+
+    def suite_end(self, data):
+        self.end_time = data["time"]
+        summary = "\n".join(
+            [self.output_fails(), self.output_errors(), self.output_summary()]
+        )
+        return "\n%s\n" % summary
+
+    def output_fails(self):
+        return "\n".join("FAIL %(test)s\n%(message)s\n" % data for data in self.fails)
+
+    def output_errors(self):
+        return "\n".join("ERROR %(test)s\n%(message)s" % data for data in self.errors)
+
+    def output_summary(self):
+        # pylint --py3k W1619
+        return "Ran %i tests in %.1fs" % (
+            self.tests_run,
+            (self.end_time - self.start_time) / 1000,
+        )
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/xunit.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/xunit.py
new file mode 100644
index 00000000000..7307f6fa866
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/formatters/xunit.py
@@ -0,0 +1,113 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from xml.etree import ElementTree
+
+from . import base
+
+
+def format_test_id(test_id):
+    """Take a test id and return something that looks a bit like
+    a class path"""
+    if not isinstance(test_id, str):
+        # Not sure how to deal with reftests yet
+        raise NotImplementedError
+
+    # Turn a path into something like a class heirachy
+    return test_id.replace(".", "_").replace("/", ".")
+
+
+class XUnitFormatter(base.BaseFormatter):
+    """Formatter that produces XUnit-style XML output.
+
+    The tree is created in-memory so this formatter may be problematic
+    with very large log files.
+
+    Note that the data model isn't a perfect match. In
+    particular XUnit assumes that each test has a unittest-style
+    class name and function name, which isn't the case for us. The
+    implementation currently replaces path names with something that
+    looks like class names, but this doesn't work for test types that
+    actually produce class names, or for test types that have multiple
+    components in their test id (e.g. reftests)."""
+
+    def __init__(self):
+        self.tree = ElementTree.ElementTree()
+        self.root = None
+        self.suite_start_time = None
+        self.test_start_time = None
+
+        self.tests_run = 0
+        self.errors = 0
+        self.failures = 0
+        self.skips = 0
+
+    def suite_start(self, data):
+        self.root = ElementTree.Element("testsuite")
+        self.tree.root = self.root
+        self.suite_start_time = data["time"]
+
+    def test_start(self, data):
+        self.tests_run += 1
+        self.test_start_time = data["time"]
+
+    def _create_result(self, data):
+        test = ElementTree.SubElement(self.root, "testcase")
+        name = format_test_id(data["test"])
+        extra = data.get("extra") or {}
+        test.attrib["classname"] = extra.get("class_name") or name
+
+        if "subtest" in data:
+            test.attrib["name"] = data["subtest"]
+            # We generally don't know how long subtests take
+            test.attrib["time"] = "0"
+        else:
+            if "." in name:
+                test_name = name.rsplit(".", 1)[1]
+            else:
+                test_name = name
+            test.attrib["name"] = extra.get("method_name") or test_name
+            test.attrib["time"] = "%.2f" % (
+                (data["time"] - self.test_start_time) / 1000.0
+            )
+
+        if "expected" in data and data["expected"] != data["status"]:
+            if data["status"] in ("NOTRUN", "ASSERT", "ERROR"):
+                result = ElementTree.SubElement(test, "error")
+                self.errors += 1
+            else:
+                result = ElementTree.SubElement(test, "failure")
+                self.failures += 1
+
+            result.attrib["message"] = "Expected %s, got %s" % (
+                data["expected"],
+                data["status"],
+            )
+            result.text = "%s\n%s" % (data.get("stack", ""), data.get("message", ""))
+
+        elif data["status"] == "SKIP":
+            result = ElementTree.SubElement(test, "skipped")
+            self.skips += 1
+
+    def test_status(self, data):
+        self._create_result(data)
+
+    def test_end(self, data):
+        self._create_result(data)
+
+    def suite_end(self, data):
+        self.root.attrib.update(
+            {
+                "tests": str(self.tests_run),
+                "errors": str(self.errors),
+                "failures": str(self.failures),
+                "skips": str(self.skips),
+                "time": "%.2f" % ((data["time"] - self.suite_start_time) / 1000.0),
+            }
+        )
+        xml_string = ElementTree.tostring(self.root, encoding="utf8")
+        # pretty printing can not be done from xml.etree
+        from xml.dom import minidom
+
+        return minidom.parseString(xml_string).toprettyxml()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/__init__.py
new file mode 100644
index 00000000000..e14bdf675f0
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/__init__.py
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .base import BaseHandler, LogLevelFilter, StreamHandler
+from .bufferhandler import BufferHandler
+from .statushandler import StatusHandler
+from .summaryhandler import SummaryHandler
+from .valgrindhandler import ValgrindHandler
+
+__all__ = [
+    "LogLevelFilter",
+    "StreamHandler",
+    "BaseHandler",
+    "StatusHandler",
+    "SummaryHandler",
+    "BufferHandler",
+    "ValgrindHandler",
+]
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/base.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/base.py
new file mode 100644
index 00000000000..7cea14c7a44
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/base.py
@@ -0,0 +1,102 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import locale
+import tempfile
+from threading import Lock
+
+from mozlog.handlers.messagehandler import MessageHandler
+from mozlog.structuredlog import log_levels
+
+
+class BaseHandler(object):
+    """A base handler providing message handling facilities to
+    derived classes.
+    """
+
+    def __init__(self, inner):
+        self.message_handler = MessageHandler()
+        if hasattr(inner, "message_handler"):
+            self.message_handler.wrapped.append(inner)
+
+
+class LogLevelFilter(BaseHandler):
+    """Handler that filters out messages with action of log and a level
+    lower than some specified level.
+
+    :param inner: Handler to use for messages that pass this filter
+    :param level: Minimum log level to process
+    """
+
+    def __init__(self, inner, level):
+        BaseHandler.__init__(self, inner)
+        self.inner = inner
+        self.level = log_levels[level.upper()]
+
+    def __call__(self, item):
+        if item["action"] != "log" or log_levels[item["level"].upper()] <= self.level:
+            return self.inner(item)
+
+
+class StreamHandler(BaseHandler):
+    """Handler for writing to a file-like object
+
+    :param stream: File-like object to write log messages to
+    :param formatter: formatter to convert messages to string format
+    """
+
+    _lock = Lock()
+
+    def __init__(self, stream, formatter):
+        BaseHandler.__init__(self, formatter)
+        assert stream is not None
+
+        self.formatter = formatter
+        self.stream = stream
+
+    def __call__(self, data):
+        """Write a log message.
+
+        :param data: Structured log message dictionary."""
+        formatted = self.formatter(data)
+        if not formatted:
+            return
+        with self._lock:
+            import io
+
+            source_enc = "utf-8"
+            target_enc = "utf-8"
+            if isinstance(self.stream, io.BytesIO):
+                target_enc = None
+                if hasattr(self.stream, "encoding"):
+                    target_enc = self.stream.encoding
+            if target_enc is None:
+                target_enc = locale.getpreferredencoding()
+
+            if isinstance(self.stream, io.StringIO) and isinstance(
+                formatted, bytes
+            ):
+                formatted = formatted.decode(source_enc, "replace")
+            elif (
+                isinstance(self.stream, io.BytesIO) or
+                isinstance(self.stream, tempfile._TemporaryFileWrapper)
+            ) and isinstance(formatted, str):
+                formatted = formatted.encode(target_enc, "replace")
+            elif isinstance(formatted, str):
+                # Suppress eventual surrogates, but keep as string.
+                # TODO: It is yet unclear how we can end up with
+                # surrogates here, see comment on patch on bug 1794401.
+                formatted_bin = formatted.encode(target_enc, "replace")
+                formatted = formatted_bin.decode(target_enc, "ignore")
+
+            # It seems that under Windows we can have cp1252 encoding
+            # for the output stream and that not all unicode chars map
+            # well. We just ignore those errors here (they have no
+            # consequences for the executed tests, anyways).
+            try:
+                self.stream.write(formatted)
+            except (UnicodeEncodeError):
+                return
+
+            self.stream.flush()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/bufferhandler.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/bufferhandler.py
new file mode 100644
index 00000000000..4dca61548e6
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/bufferhandler.py
@@ -0,0 +1,86 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .base import BaseHandler
+
+
+class BufferHandler(BaseHandler):
+    """Handler that maintains a circular buffer of messages based on the
+    size and actions specified by a user.
+
+    :param inner: The underlying handler used to emit messages.
+    :param message_limit: The maximum number of messages to retain for
+                          context. If None, the buffer will grow without limit.
+    :param buffered_actions: The set of actions to include in the buffer
+                             rather than log directly.
+    """
+
+    def __init__(self, inner, message_limit=100, buffered_actions=None):
+        BaseHandler.__init__(self, inner)
+        self.inner = inner
+        self.message_limit = message_limit
+        if buffered_actions is None:
+            buffered_actions = ["log", "test_status"]
+        self.buffered_actions = set(buffered_actions)
+        self._buffering = True
+
+        if self.message_limit is not None:
+            self._buffer = [None] * self.message_limit
+            self._buffer_pos = 0
+        else:
+            self._buffer = []
+
+        self.message_handler.register_message_handlers(
+            "buffer",
+            {
+                "on": self._enable_buffering,
+                "off": self._disable_buffering,
+                "flush": self._flush_buffered,
+                "clear": self._clear_buffer,
+            },
+        )
+
+    def __call__(self, data):
+        action = data["action"]
+        if "bypass_mozlog_buffer" in data:
+            data.pop("bypass_mozlog_buffer")
+            self.inner(data)
+            return
+        if not self._buffering or action not in self.buffered_actions:
+            self.inner(data)
+            return
+
+        self._add_message(data)
+
+    def _add_message(self, data):
+        if self.message_limit is None:
+            self._buffer.append(data)
+        else:
+            self._buffer[self._buffer_pos] = data
+            self._buffer_pos = (self._buffer_pos + 1) % self.message_limit
+
+    def _enable_buffering(self):
+        self._buffering = True
+
+    def _disable_buffering(self):
+        self._buffering = False
+
+    def _clear_buffer(self):
+        """Clear the buffer of unwanted messages."""
+        current_size = len([m for m in self._buffer if m is not None])
+        if self.message_limit is not None:
+            self._buffer = [None] * self.message_limit
+        else:
+            self._buffer = []
+        return current_size
+
+    def _flush_buffered(self):
+        """Logs the contents of the current buffer"""
+        for msg in self._buffer[self._buffer_pos:]:
+            if msg is not None:
+                self.inner(msg)
+        for msg in self._buffer[: self._buffer_pos]:
+            if msg is not None:
+                self.inner(msg)
+        return self._clear_buffer()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/messagehandler.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/messagehandler.py
new file mode 100644
index 00000000000..606dd839264
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/messagehandler.py
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+class MessageHandler(object):
+    """A message handler providing message handling facilities to
+    classes derived from BaseHandler and BaseFormatter. This is a
+    composition class, to ensure handlers and formatters remain separate.
+
+    :param inner: A handler-like callable that may receive messages
+                  from a log user.
+    """
+
+    def __init__(self):
+        self.message_handlers = {}
+        self.wrapped = []
+
+    def register_message_handlers(self, topic, handlers):
+        self.message_handlers[topic] = handlers
+
+    def handle_message(self, topic, cmd, *args):
+        """Handles a message for the given topic by calling a subclass-defined
+        callback for the command.
+
+        :param topic: The topic of the broadcasted message. Handlers opt-in to
+                      receiving messages by identifying a topic when calling
+                      register_message_handlers.
+        :param command: The command to issue. This is a string that corresponds
+                        to a callback provided by the target.
+        :param arg: Arguments to pass to the identified message callback, if any.
+        """
+        rv = []
+        if topic in self.message_handlers and cmd in self.message_handlers[topic]:
+            rv.append(self.message_handlers[topic][cmd](*args))
+        if self.wrapped:
+            for inner in self.wrapped:
+                rv.extend(inner.handle_message(topic, cmd, *args))
+        return rv
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/statushandler.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/statushandler.py
new file mode 100644
index 00000000000..500f2e1d897
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/statushandler.py
@@ -0,0 +1,87 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from collections import defaultdict, namedtuple
+
+RunSummary = namedtuple(
+    "RunSummary",
+    (
+        "unexpected_statuses",
+        "expected_statuses",
+        "known_intermittent_statuses",
+        "log_level_counts",
+        "action_counts",
+    ),
+)
+
+
+class StatusHandler(object):
+    """A handler used to determine an overall status for a test run according
+    to a sequence of log messages."""
+
+    def __init__(self):
+        # The count of each type of unexpected result status (includes tests and subtests)
+        self.unexpected_statuses = defaultdict(int)
+        # The count of each type of expected result status (includes tests and subtests)
+        self.expected_statuses = defaultdict(int)
+        # The count of known intermittent result statuses (includes tests and subtests)
+        self.known_intermittent_statuses = defaultdict(int)
+        # The count of actions logged
+        self.action_counts = defaultdict(int)
+        # The count of messages logged at each log level
+        self.log_level_counts = defaultdict(int)
+        # The count of "No tests run" error messages seen
+        self.no_tests_run_count = 0
+
+    def __call__(self, data):
+        action = data["action"]
+        known_intermittent = data.get("known_intermittent", [])
+        self.action_counts[action] += 1
+
+        if action == "log":
+            if data["level"] == "ERROR" and data["message"] == "No tests ran":
+                self.no_tests_run_count += 1
+            self.log_level_counts[data["level"]] += 1
+
+        if action in ("test_status", "test_end"):
+            status = data["status"]
+            # Don't count known_intermittent status as unexpected
+            if "expected" in data and status not in known_intermittent:
+                self.unexpected_statuses[status] += 1
+            else:
+                self.expected_statuses[status] += 1
+                # Count known_intermittent as expected and intermittent.
+                if status in known_intermittent:
+                    self.known_intermittent_statuses[status] += 1
+
+        if action == "assertion_count":
+            if data["count"] < data["min_expected"]:
+                self.unexpected_statuses["PASS"] += 1
+            elif data["count"] > data["max_expected"]:
+                self.unexpected_statuses["FAIL"] += 1
+            elif data["count"]:
+                self.expected_statuses["FAIL"] += 1
+            else:
+                self.expected_statuses["PASS"] += 1
+
+        if action == "lsan_leak":
+            if not data.get("allowed_match"):
+                self.unexpected_statuses["FAIL"] += 1
+
+        if action == "lsan_summary":
+            if not data.get("allowed", False):
+                self.unexpected_statuses["FAIL"] += 1
+
+        if action == "mozleak_total":
+            if data["bytes"] is not None and data["bytes"] > data.get("threshold", 0):
+                self.unexpected_statuses["FAIL"] += 1
+
+    def summarize(self):
+        return RunSummary(
+            dict(self.unexpected_statuses),
+            dict(self.expected_statuses),
+            dict(self.known_intermittent_statuses),
+            dict(self.log_level_counts),
+            dict(self.action_counts),
+        )
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/summaryhandler.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/summaryhandler.py
new file mode 100644
index 00000000000..06b4a963323
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/summaryhandler.py
@@ -0,0 +1,191 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from collections import OrderedDict, defaultdict
+
+from ..reader import LogHandler
+
+
+class SummaryHandler(LogHandler):
+    """Handler class for storing suite summary information.
+
+    Can handle multiple suites in a single run. Summary
+    information is stored on the self.summary instance variable.
+
+    Per suite summary information can be obtained by calling 'get'
+    or iterating over this class.
+    """
+
+    def __init__(self, **kwargs):
+        super(SummaryHandler, self).__init__(**kwargs)
+
+        self.summary = OrderedDict()
+        self.current_suite = None
+
+    @property
+    def current(self):
+        return self.summary.get(self.current_suite)
+
+    def __getitem__(self, suite):
+        """Return summary information for the given suite.
+
+        The summary is of the form:
+
+            {
+              'counts': {
+                '<check>': {
+                  'count': int,
+                  'expected': {
+                    '<status>': int,
+                  },
+                  'unexpected': {
+                    '<status>': int,
+                  },
+                  'known_intermittent': {
+                    '<status>': int,
+                  },
+                },
+              },
+              'unexpected_logs': {
+                '<test>': [<data>]
+              },
+              'intermittent_logs': {
+                '<test>': [<data>]
+              }
+            }
+
+        Valid values for <check> are `test`, `subtest` and `assert`. Valid
+        <status> keys are defined in the :py:mod:`mozlog.logtypes` module.  The
+        <test> key is the id as logged by `test_start`. Finally the <data>
+        field is the log data from any `test_end` or `test_status` log messages
+        that have an unexpected result.
+
+        Mozlog's structuredlog has a `known_intermittent` field indicating if a
+        `test` and `subtest` <status> are expected to arise intermittently.
+        Known intermittent results are logged as both as `expected` and
+        `known_intermittent`.
+        """
+        return self.summary[suite]
+
+    def __iter__(self):
+        """Iterate over summaries.
+
+        Yields a tuple of (suite, summary). The summary returned is
+        the same format as returned by 'get'.
+        """
+        for suite, data in self.summary.items():
+            yield suite, data
+
+    @classmethod
+    def aggregate(cls, key, counts, include_skip=True):
+        """Helper method for aggregating count data by 'key' instead of by 'check'."""
+        assert key in ("count", "expected", "unexpected", "known_intermittent")
+
+        res = defaultdict(int)
+        for check, val in counts.items():
+            if key == "count":
+                res[check] += val[key]
+                continue
+
+            for status, num in val[key].items():
+                if not include_skip and status == "skip":
+                    continue
+                res[check] += num
+        return res
+
+    def suite_start(self, data):
+        self.current_suite = data.get("name", "suite {}".format(len(self.summary) + 1))
+        if self.current_suite not in self.summary:
+            self.summary[self.current_suite] = {
+                "counts": {
+                    "test": {
+                        "count": 0,
+                        "expected": defaultdict(int),
+                        "unexpected": defaultdict(int),
+                        "known_intermittent": defaultdict(int),
+                    },
+                    "subtest": {
+                        "count": 0,
+                        "expected": defaultdict(int),
+                        "unexpected": defaultdict(int),
+                        "known_intermittent": defaultdict(int),
+                    },
+                    "assert": {
+                        "count": 0,
+                        "expected": defaultdict(int),
+                        "unexpected": defaultdict(int),
+                        "known_intermittent": defaultdict(int),
+                    },
+                },
+                "unexpected_logs": OrderedDict(),
+                "intermittent_logs": OrderedDict(),
+                "harness_errors": [],
+            }
+
+    def test_start(self, data):
+        self.current["counts"]["test"]["count"] += 1
+
+    def test_status(self, data):
+        logs = self.current["unexpected_logs"]
+        intermittent_logs = self.current["intermittent_logs"]
+        count = self.current["counts"]
+        count["subtest"]["count"] += 1
+
+        if "expected" in data:
+            if data["status"] not in data.get("known_intermittent", []):
+                count["subtest"]["unexpected"][data["status"].lower()] += 1
+                if data["test"] not in logs:
+                    logs[data["test"]] = []
+                logs[data["test"]].append(data)
+            else:
+                count["subtest"]["expected"][data["status"].lower()] += 1
+                count["subtest"]["known_intermittent"][data["status"].lower()] += 1
+                if data["test"] not in intermittent_logs:
+                    intermittent_logs[data["test"]] = []
+                intermittent_logs[data["test"]].append(data)
+        else:
+            count["subtest"]["expected"][data["status"].lower()] += 1
+
+    def test_end(self, data):
+        logs = self.current["unexpected_logs"]
+        intermittent_logs = self.current["intermittent_logs"]
+        count = self.current["counts"]
+        if "expected" in data:
+            if data["status"] not in data.get("known_intermittent", []):
+                count["test"]["unexpected"][data["status"].lower()] += 1
+                if data["test"] not in logs:
+                    logs[data["test"]] = []
+                logs[data["test"]].append(data)
+            else:
+                count["test"]["expected"][data["status"].lower()] += 1
+                count["test"]["known_intermittent"][data["status"].lower()] += 1
+                if data["test"] not in intermittent_logs:
+                    intermittent_logs[data["test"]] = []
+                intermittent_logs[data["test"]].append(data)
+        else:
+            count["test"]["expected"][data["status"].lower()] += 1
+
+    def assertion_count(self, data):
+        count = self.current["counts"]
+        count["assert"]["count"] += 1
+
+        if data["min_expected"] <= data["count"] <= data["max_expected"]:
+            if data["count"] > 0:
+                count["assert"]["expected"]["fail"] += 1
+            else:
+                count["assert"]["expected"]["pass"] += 1
+        elif data["max_expected"] < data["count"]:
+            count["assert"]["unexpected"]["fail"] += 1
+        else:
+            count["assert"]["unexpected"]["pass"] += 1
+
+    def log(self, data):
+        if not self.current_suite:
+            return
+
+        logs = self.current["harness_errors"]
+        level = data.get("level").upper()
+
+        if level in ("CRITICAL", "ERROR"):
+            logs.append(data)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/valgrindhandler.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/valgrindhandler.py
new file mode 100644
index 00000000000..b4760b1ee83
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/handlers/valgrindhandler.py
@@ -0,0 +1,138 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import re
+
+from .base import BaseHandler
+
+
+class ValgrindHandler(BaseHandler):
+    def __init__(self, inner):
+        BaseHandler.__init__(self, inner)
+        self.inner = inner
+        self.vFilter = ValgrindFilter()
+
+    def __call__(self, data):
+        tmp = self.vFilter(data)
+        if tmp is not None:
+            self.inner(tmp)
+
+
+class ValgrindFilter(object):
+    """
+    A class for handling Valgrind output.
+
+    Valgrind errors look like this:
+
+    ==60741== 40 (24 direct, 16 indirect) bytes in 1 blocks are definitely lost in loss
+                  record 2,746 of 5,235
+    ==60741==    at 0x4C26B43: calloc (vg_replace_malloc.c:593)
+    ==60741==    by 0x63AEF65: PR_Calloc (prmem.c:443)
+    ==60741==    by 0x69F236E: PORT_ZAlloc_Util (secport.c:117)
+    ==60741==    by 0x69F1336: SECITEM_AllocItem_Util (secitem.c:28)
+    ==60741==    by 0xA04280B: ffi_call_unix64 (in /builds/worker/m-in-l64-valgrind-000000000000/objdir/toolkit/library/libxul.so) # noqa
+    ==60741==    by 0xA042443: ffi_call (ffi64.c:485)
+
+    For each such error, this class extracts most or all of the first (error
+    kind) line, plus the function name in each of the first few stack entries.
+    With this data it constructs and prints a TEST-UNEXPECTED-FAIL message that
+    TBPL will highlight.
+
+    It buffers these lines from which text is extracted so that the
+    TEST-UNEXPECTED-FAIL message can be printed before the full error.
+
+    Parsing the Valgrind output isn't ideal, and it may break in the future if
+    Valgrind changes the format of the messages, or introduces new error kinds.
+    To protect against this, we also count how many lines containing
+    "<insert_a_suppression_name_here>" are seen. Thanks to the use of
+    --gen-suppressions=yes, exactly one of these lines is present per error. If
+    the count of these lines doesn't match the error count found during
+    parsing, then the parsing has missed one or more errors and we can fail
+    appropriately.
+    """
+
+    def __init__(self):
+        # The regexps in this list match all of Valgrind's errors. Note that
+        # Valgrind is English-only, so we don't have to worry about
+        # localization.
+        self.re_error = re.compile(
+            r"==\d+== (" +
+            r"(Use of uninitialised value of size \d+)|" +
+            r"(Conditional jump or move depends on uninitialised value\(s\))|" +
+            r"(Syscall param .* contains uninitialised byte\(s\))|" +
+            r"(Syscall param .* points to (unaddressable|uninitialised) byte\(s\))|" +
+            r"((Unaddressable|Uninitialised) byte\(s\) found during client check request)|" +
+            r"(Invalid free\(\) / delete / delete\[\] / realloc\(\))|" +
+            r"(Mismatched free\(\) / delete / delete \[\])|" +
+            r"(Invalid (read|write) of size \d+)|" +
+            r"(Jump to the invalid address stated on the next line)|" +
+            r"(Source and destination overlap in .*)|" +
+            r"(.* bytes in .* blocks are .* lost)" +
+            r")"
+        )
+        # Match identifer chars, plus ':' for namespaces, and '\?' in order to
+        # match "???" which Valgrind sometimes produces.
+        self.re_stack_entry = re.compile(r"^==\d+==.*0x[A-Z0-9]+: ([A-Za-z0-9_:\?]+)")
+        self.re_suppression = re.compile(r" *<insert_a_suppression_name_here>")
+        self.error_count = 0
+        self.suppression_count = 0
+        self.number_of_stack_entries_to_get = 0
+        self.curr_failure_msg = ""
+        self.buffered_lines = []
+
+    # Takes a message and returns a message
+    def __call__(self, msg):
+        # Pass through everything that isn't plain text
+        if msg["action"] != "log":
+            return msg
+
+        line = msg["message"]
+        output_message = None
+        if self.number_of_stack_entries_to_get == 0:
+            # Look for the start of a Valgrind error.
+            m = re.search(self.re_error, line)
+            if m:
+                self.error_count += 1
+                self.number_of_stack_entries_to_get = 4
+                self.curr_failure_msg = m.group(1) + " at "
+                self.buffered_lines = [line]
+            else:
+                output_message = msg
+
+        else:
+            # We've recently found a Valgrind error, and are now extracting
+            # details from the first few stack entries.
+            self.buffered_lines.append(line)
+            m = re.match(self.re_stack_entry, line)
+            if m:
+                self.curr_failure_msg += m.group(1)
+            else:
+                self.curr_failure_msg += "?!?"
+
+            self.number_of_stack_entries_to_get -= 1
+            if self.number_of_stack_entries_to_get != 0:
+                self.curr_failure_msg += " / "
+            else:
+                # We've finished getting the first few stack entries.  Emit
+                # the failure action, comprising the primary message and the
+                # buffered lines, and then reset state.  Copy the mandatory
+                # fields from the incoming message, since there's nowhere
+                # else to get them from.
+                output_message = {  # Mandatory fields
+                    u"action": "valgrind_error",
+                    u"time": msg["time"],
+                    u"thread": msg["thread"],
+                    u"pid": msg["pid"],
+                    u"source": msg["source"],
+                    # valgrind_error specific fields
+                    u"primary": self.curr_failure_msg,
+                    u"secondary": self.buffered_lines,
+                }
+                self.curr_failure_msg = ""
+                self.buffered_lines = []
+
+        if re.match(self.re_suppression, line):
+            self.suppression_count += 1
+
+        return output_message
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/logtypes.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/logtypes.py
new file mode 100644
index 00000000000..ba6c7b1d180
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/logtypes.py
@@ -0,0 +1,297 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import inspect
+
+convertor_registry = {}
+missing = object()
+no_default = object()
+
+
+class log_action(object):
+    def __init__(self, *args):
+        self.args = {}
+
+        self.args_no_default = []
+        self.args_with_default = []
+        self.optional_args = set()
+
+        # These are the required fields in a log message that usually aren't
+        # supplied by the caller, but can be in the case of log_raw
+        self.default_args = [
+            Unicode("action"),
+            Int("time"),
+            Unicode("thread"),
+            Int("pid", default=None),
+            Unicode("source"),
+            Unicode("component"),
+        ]
+
+        for arg in args:
+            if arg.default is no_default:
+                self.args_no_default.append(arg.name)
+            else:
+                self.args_with_default.append(arg.name)
+
+            if arg.optional:
+                self.optional_args.add(arg.name)
+
+            if arg.name in self.args:
+                raise ValueError("Repeated argument name %s" % arg.name)
+
+            self.args[arg.name] = arg
+
+        for extra in self.default_args:
+            self.args[extra.name] = extra
+
+    def __call__(self, f):
+        convertor_registry[f.__name__] = self
+        converter = self
+
+        def inner(self, *args, **kwargs):
+            data = converter.convert(*args, **kwargs)
+            return f(self, data)
+
+        if hasattr(f, "__doc__"):
+            setattr(inner, "__doc__", f.__doc__)
+
+        return inner
+
+    def convert(self, *args, **kwargs):
+        data = {}
+        values = {}
+        values.update(kwargs)
+
+        positional_no_default = [
+            item for item in self.args_no_default if item not in values
+        ]
+
+        num_no_default = len(positional_no_default)
+
+        if len(args) < num_no_default:
+            raise TypeError("Too few arguments")
+
+        if len(args) > num_no_default + len(self.args_with_default):
+            raise TypeError("Too many arguments")
+
+        for i, name in enumerate(positional_no_default):
+            values[name] = args[i]
+
+        positional_with_default = [
+            self.args_with_default[i] for i in range(len(args) - num_no_default)
+        ]
+
+        for i, name in enumerate(positional_with_default):
+            if name in values:
+                raise TypeError("Argument %s specified twice" % name)
+            values[name] = args[i + num_no_default]
+
+        # Fill in missing arguments
+        for name in self.args_with_default:
+            if name not in values:
+                values[name] = self.args[name].default
+
+        for key, value in values.items():
+            if key in self.args:
+                out_value = self.args[key](value)
+                if out_value is not missing:
+                    if key in self.optional_args and value == self.args[key].default:
+                        pass
+                    else:
+                        data[key] = out_value
+            else:
+                raise TypeError("Unrecognised argument %s" % key)
+
+        return data
+
+    def convert_known(self, **kwargs):
+        known_kwargs = {
+            name: value for name, value in kwargs.items() if name in self.args
+        }
+        return self.convert(**known_kwargs)
+
+
+class DataType(object):
+    def __init__(self, name, default=no_default, optional=False):
+        self.name = name
+        self.default = default
+
+        if default is no_default and optional is not False:
+            raise ValueError("optional arguments require a default value")
+
+        self.optional = optional
+
+    def __call__(self, value):
+        if value == self.default:
+            if self.optional:
+                return missing
+            return self.default
+
+        try:
+            return self.convert(value)
+        except Exception:
+            raise ValueError(
+                "Failed to convert value %s of type %s for field %s to type %s"
+                % (value, type(value).__name__, self.name, self.__class__.__name__)
+            )
+
+
+class ContainerType(DataType):
+    """A DataType that contains other DataTypes.
+
+    ContainerTypes must specify which other DataType they will contain. ContainerTypes
+    may contain other ContainerTypes.
+
+    Some examples:
+
+        List(Int, 'numbers')
+        Tuple((Unicode, Int, Any), 'things')
+        Dict(Unicode, 'config')
+        Dict({TestId: Status}, 'results')
+        Dict(List(Unicode), 'stuff')
+    """
+
+    def __init__(self, item_type, name=None, **kwargs):
+        DataType.__init__(self, name, **kwargs)
+        self.item_type = self._format_item_type(item_type)
+
+    def _format_item_type(self, item_type):
+        if inspect.isclass(item_type):
+            return item_type(None)
+        return item_type
+
+
+class Unicode(DataType):
+    def convert(self, data):
+        if isinstance(data, str):
+            return data
+        return str(data)
+
+
+class TestId(DataType):
+    def convert(self, data):
+        if isinstance(data, str):
+            return data
+        elif isinstance(data, bytes):
+            return data.decode("utf-8", "replace")
+        elif isinstance(data, (tuple, list)):
+            # This is really a bit of a hack; should really split out convertors from the
+            # fields they operate on
+            func = Unicode(None).convert
+            return tuple(func(item) for item in data)
+        else:
+            raise ValueError
+
+
+class Status(DataType):
+    allowed = [
+        "PASS",
+        "FAIL",
+        "OK",
+        "ERROR",
+        "TIMEOUT",
+        "CRASH",
+        "ASSERT",
+        "PRECONDITION_FAILED",
+        "SKIP",
+    ]
+
+    def convert(self, data):
+        value = data.upper()
+        if value not in self.allowed:
+            raise ValueError
+        return value
+
+
+class SubStatus(Status):
+    allowed = [
+        "PASS",
+        "FAIL",
+        "ERROR",
+        "TIMEOUT",
+        "ASSERT",
+        "PRECONDITION_FAILED",
+        "NOTRUN",
+        "SKIP",
+    ]
+
+
+class Dict(ContainerType):
+    def _format_item_type(self, item_type):
+        superfmt = super(Dict, self)._format_item_type
+
+        if isinstance(item_type, dict):
+            if len(item_type) != 1:
+                raise ValueError(
+                    "Dict item type specifier must contain a single entry."
+                )
+            key_type, value_type = list(item_type.items())[0]
+            return superfmt(key_type), superfmt(value_type)
+        return Any(None), superfmt(item_type)
+
+    def convert(self, data):
+        key_type, value_type = self.item_type
+        return {
+            key_type.convert(k): value_type.convert(v) for k, v in dict(data).items()
+        }
+
+
+class List(ContainerType):
+    def convert(self, data):
+        # while dicts and strings _can_ be cast to lists,
+        # doing so is likely not intentional behaviour
+        if isinstance(data, (str, dict)):
+            raise ValueError("Expected list but got %s" % type(data))
+        return [self.item_type.convert(item) for item in data]
+
+
+class TestList(DataType):
+    """A TestList is a list of tests that can be either keyed by a group name,
+    or specified as a flat list.
+    """
+
+    def convert(self, data):
+        if isinstance(data, (list, tuple)):
+            data = {"default": data}
+        return Dict({Unicode: List(Unicode)}).convert(data)
+
+
+class Int(DataType):
+    def convert(self, data):
+        return int(data)
+
+
+class Any(DataType):
+    def convert(self, data):
+        return data
+
+
+class Boolean(DataType):
+    def convert(self, data):
+        return bool(data)
+
+
+class Tuple(ContainerType):
+    def _format_item_type(self, item_type):
+        superfmt = super(Tuple, self)._format_item_type
+
+        if isinstance(item_type, (tuple, list)):
+            return [superfmt(t) for t in item_type]
+        return (superfmt(item_type),)
+
+    def convert(self, data):
+        if len(data) != len(self.item_type):
+            raise ValueError(
+                "Expected %i items got %i" % (len(self.item_type), len(data))
+            )
+        return tuple(
+            item_type.convert(value) for item_type, value in zip(self.item_type, data)
+        )
+
+
+class Nullable(ContainerType):
+    def convert(self, data):
+        if data is None:
+            return data
+        return self.item_type.convert(data)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/proxy.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/proxy.py
new file mode 100644
index 00000000000..1d5994406b5
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/proxy.py
@@ -0,0 +1,81 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from threading import Thread
+
+from .structuredlog import StructuredLogger, get_default_logger
+
+
+class ProxyLogger(object):
+    """
+    A ProxyLogger behaves like a
+    :class:`mozlog.structuredlog.StructuredLogger`.
+
+    Each method and attribute access will be forwarded to the underlying
+    StructuredLogger.
+
+    RuntimeError will be raised when the default logger is not yet initialized.
+    """
+
+    def __init__(self, component=None):
+        self.logger = None
+        self._component = component
+
+    def __getattr__(self, name):
+        if self.logger is None:
+            self.logger = get_default_logger(component=self._component)
+            if self.logger is None:
+                raise RuntimeError("Default logger is not initialized!")
+        return getattr(self.logger, name)
+
+
+def get_proxy_logger(component=None):
+    """
+    Returns a :class:`ProxyLogger` for the given component.
+    """
+    return ProxyLogger(component)
+
+
+class QueuedProxyLogger(StructuredLogger):
+    """Logger that logs via a queue.
+
+    This is intended for multiprocessing use cases where there are
+    some subprocesses which want to share a log handler with the main thread,
+    without the overhead of having a multiprocessing lock for all logger
+    access."""
+
+    threads = {}
+
+    def __init__(self, logger, mp_context=None):
+        StructuredLogger.__init__(self, logger.name)
+
+        if mp_context is None:
+            import multiprocessing as mp_context
+
+        if logger.name not in self.threads:
+            self.threads[logger.name] = LogQueueThread(mp_context.Queue(), logger)
+            self.threads[logger.name].start()
+        self.queue = self.threads[logger.name].queue
+
+    def _handle_log(self, data):
+        self.queue.put(data)
+
+
+class LogQueueThread(Thread):
+    def __init__(self, queue, logger):
+        self.queue = queue
+        self.logger = logger
+        Thread.__init__(self, name="Thread-Log")
+        self.daemon = True
+
+    def run(self):
+        while True:
+            try:
+                msg = self.queue.get()
+            except (EOFError, IOError):
+                break
+            if msg is None:
+                break
+            else:
+                self.logger._handle_log(msg)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/pytest_mozlog/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/pytest_mozlog/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/pytest_mozlog/plugin.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/pytest_mozlog/plugin.py
new file mode 100644
index 00000000000..270f404993b
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/pytest_mozlog/plugin.py
@@ -0,0 +1,126 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import time
+
+import pytest
+
+import mozlog
+
+
+def pytest_addoption(parser):
+    # We can't simply use mozlog.commandline.add_logging_group(parser) here because
+    # Pytest's parser doesn't have the add_argument_group method Mozlog expects.
+    group = parser.getgroup("mozlog")
+
+    for name, (_class, _help) in mozlog.commandline.log_formatters.items():
+        group.addoption("--log-{0}".format(name), action="append", help=_help)
+
+    formatter_options = mozlog.commandline.fmt_options.items()
+    for name, (_class, _help, formatters, action) in formatter_options:
+        for formatter in formatters:
+            if formatter in mozlog.commandline.log_formatters:
+                group.addoption(
+                    "--log-{0}-{1}".format(formatter, name), action=action, help=_help
+                )
+
+
+def pytest_configure(config):
+    # If using pytest-xdist for parallelization, only register plugin on master process
+    if not hasattr(config, "slaveinput"):
+        config.pluginmanager.register(MozLog())
+
+
+class MozLog(object):
+    def __init__(self):
+        self._started = False
+        self.results = {}
+        self.start_time = int(time.time() * 1000)  # in ms for Mozlog compatibility
+
+    def _log_suite_start(self, tests):
+        if not self._started:
+            # As this is called for each node when using pytest-xdist, we want
+            # to avoid logging multiple suite_start messages.
+            self.logger.suite_start(
+                tests=tests, time=self.start_time, run_info=self.run_info
+            )
+            self._started = True
+
+    def pytest_configure(self, config):
+        mozlog.commandline.setup_logging(
+            "pytest",
+            config.known_args_namespace,
+            defaults={},
+            allow_unused_options=True,
+        )
+        self.logger = mozlog.get_default_logger(component="pytest")
+
+    def pytest_sessionstart(self, session):
+        """Called before test collection; records suite start time to log later"""
+        self.start_time = int(time.time() * 1000)  # in ms for Mozlog compatibility
+        self.run_info = getattr(session.config, "_metadata", None)
+
+    def pytest_collection_finish(self, session):
+        """Called after test collection is completed, just before tests are run (suite start)"""
+        self._log_suite_start([item.nodeid for item in session.items])
+
+    @pytest.mark.optionalhook
+    def pytest_xdist_node_collection_finished(self, node, ids):
+        """Called after each pytest-xdist node collection is completed"""
+        self._log_suite_start(ids)
+
+    def pytest_sessionfinish(self, session, exitstatus):
+        self.logger.suite_end()
+
+    def pytest_runtest_logstart(self, nodeid, location):
+        self.logger.test_start(test=nodeid)
+
+    def pytest_runtest_logreport(self, report):
+        """Called 3 times per test (setup, call, teardown), indicated by report.when"""
+        test = report.nodeid
+        status = expected = "PASS"
+        message = stack = None
+        if hasattr(report, "wasxfail"):
+            expected = "FAIL"
+        if report.failed or report.outcome == "rerun":
+            status = "FAIL" if report.when == "call" else "ERROR"
+        if report.skipped:
+            status = "SKIP" if not hasattr(report, "wasxfail") else "FAIL"
+        if report.longrepr is not None:
+            longrepr = report.longrepr
+            if isinstance(longrepr, str):
+                # When using pytest-xdist, longrepr is serialised as a str
+                message = stack = longrepr
+                if longrepr.startswith("[XPASS(strict)]"):
+                    # Strict expected failures have an outcome of failed when
+                    # they unexpectedly pass.
+                    expected, status = ("FAIL", "PASS")
+            elif hasattr(longrepr, "reprcrash"):
+                # For failures, longrepr is a ReprExceptionInfo
+                crash = longrepr.reprcrash
+                message = "{0} (line {1})".format(crash.message, crash.lineno)
+                stack = longrepr.reprtraceback
+            elif hasattr(longrepr, "errorstring"):
+                message = longrepr.errorstring
+                stack = longrepr.errorstring
+            elif hasattr(longrepr, "__getitem__") and len(longrepr) == 3:
+                # For skips, longrepr is a tuple of (file, lineno, reason)
+                message = report.longrepr[-1]
+            else:
+                raise ValueError(
+                    "Unable to convert longrepr to message:\ntype %s\nfields: %s"
+                    % (longrepr.__class__, dir(longrepr))
+                )
+        if status != expected or expected != "PASS":
+            self.results[test] = (status, expected, message, stack)
+        if report.outcome == "rerun" or report.when == "teardown":
+            defaults = ("PASS", "PASS", None, None)
+            status, expected, message, stack = self.results.get(test, defaults)
+            self.logger.test_end(
+                test=test,
+                status=status,
+                expected=expected,
+                message=message,
+                stack=stack,
+            )
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/reader.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/reader.py
new file mode 100644
index 00000000000..af5470f351c
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/reader.py
@@ -0,0 +1,78 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+
+
+def read(log_f, raise_on_error=False):
+    """Return a generator that will return the entries in a structured log file.
+    Note that the caller must not close the file whilst the generator is still
+    in use.
+
+    :param log_f: file-like object containing the raw log entries, one per line
+    :param raise_on_error: boolean indicating whether ValueError should be raised
+                           for lines that cannot be decoded."""
+    while True:
+        line = log_f.readline()
+        if not line:
+            # This allows log_f to be a stream like stdout
+            break
+        try:
+            yield json.loads(line)
+        except ValueError:
+            if raise_on_error:
+                raise
+
+
+def imap_log(log_iter, action_map):
+    """Create an iterator that will invoke a callback per action for each item in a
+    iterable containing structured log entries
+
+    :param log_iter: Iterator returning structured log entries
+    :param action_map: Dictionary mapping action name to callback function. Log items
+                       with actions not in this dictionary will be skipped.
+    """
+    for item in log_iter:
+        if item["action"] in action_map:
+            yield action_map[item["action"]](item)
+
+
+def each_log(log_iter, action_map):
+    """Call a callback for each item in an iterable containing structured
+    log entries
+
+    :param log_iter: Iterator returning structured log entries
+    :param action_map: Dictionary mapping action name to callback function. Log items
+                       with actions not in this dictionary will be skipped.
+    """
+    for item in log_iter:
+        if item["action"] in action_map:
+            action_map[item["action"]](item)
+
+
+class LogHandler(object):
+    """Base class for objects that act as log handlers. A handler is a callable
+    that takes a log entry as the only argument.
+
+    Subclasses are expected to provide a method for each action type they
+    wish to handle, each taking a single argument for the test data.
+    For example a trivial subclass that just produces the id of each test as
+    it starts might be::
+
+      class StartIdHandler(LogHandler):
+          def test_start(data):
+              #For simplicity in the example pretend the id is always a string
+              return data["test"]
+    """
+
+    def __call__(self, data):
+        if hasattr(self, data["action"]):
+            handler = getattr(self, data["action"])
+            return handler(data)
+
+
+def handle_log(log_iter, handler):
+    """Call a handler for each item in a log, discarding the return value"""
+    for item in log_iter:
+        handler(item)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/__init__.py
new file mode 100644
index 00000000000..07780ab2d07
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/__init__.py
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import argparse
+
+import format as formatlog
+import logmerge
+import unstable
+
+
+def get_parser():
+    parser = argparse.ArgumentParser(
+        "structlog", description="Tools for dealing with structured logs"
+    )
+
+    commands = {
+        "unstable": (unstable.get_parser, unstable.main),
+        "format": (formatlog.get_parser, formatlog.main),
+        "logmerge": (logmerge.get_parser, logmerge.main),
+    }
+
+    sub_parser = parser.add_subparsers(title="Subcommands")
+
+    for command, (parser_func, main_func) in commands.items():
+        parent = parser_func(False)
+        command_parser = sub_parser.add_parser(
+            command, description=parent.description, parents=[parent]
+        )
+        command_parser.set_defaults(func=main_func)
+
+    return parser
+
+
+def main():
+    parser = get_parser()
+    args = parser.parse_args()
+    args.func(**vars(args))
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/format.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/format.py
new file mode 100644
index 00000000000..27a643068f4
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/format.py
@@ -0,0 +1,55 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import sys
+
+from .. import commandline, handlers, reader
+
+
+def get_parser(add_help=True):
+    parser = argparse.ArgumentParser(
+        "format", description="Format a structured log stream", add_help=add_help
+    )
+    parser.add_argument(
+        "--input",
+        action="store",
+        default=None,
+        help="Filename to read from, defaults to stdin",
+    )
+    parser.add_argument(
+        "--output",
+        action="store",
+        default=None,
+        help="Filename to write to, defaults to stdout",
+    )
+    parser.add_argument(
+        "format", choices=list(commandline.log_formatters.keys()), help="Format to use"
+    )
+    return parser
+
+
+def main(**kwargs):
+    if kwargs["input"] is None:
+        input_file = sys.stdin
+    else:
+        input_file = open(kwargs["input"])
+    if kwargs["output"] is None:
+        output_file = sys.stdout
+    else:
+        output_file = open(kwargs["output"], "w")
+
+    formatter = commandline.log_formatters[kwargs["format"]][0]()
+
+    handler = handlers.StreamHandler(stream=output_file, formatter=formatter)
+
+    for data in reader.read(input_file):
+        handler(data)
+
+
+if __name__ == "__main__":
+    parser = get_parser()
+    args = parser.parse_args()
+    kwargs = vars(args)
+    main(**kwargs)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/logmerge.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/logmerge.py
new file mode 100644
index 00000000000..11147953877
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/logmerge.py
@@ -0,0 +1,90 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import json
+import os
+import sys
+import time
+from threading import current_thread
+
+from mozlog.reader import read
+
+
+def dump_entry(entry, output):
+    json.dump(entry, output)
+    output.write("\n")
+
+
+def fill_process_info(event):
+    # pylint: disable=W1633
+    event["time"] = int(round(time.time() * 1000))
+    event["thread"] = current_thread().name
+    event["pid"] = os.getpid()
+    return event
+
+
+def process_until(reader, output, action):
+    for entry in reader:
+        if entry["action"] == action:
+            return entry
+        dump_entry(entry, output)
+
+
+def process_until_suite_start(reader, output):
+    return process_until(reader, output, "suite_start")
+
+
+def process_until_suite_end(reader, output):
+    return process_until(reader, output, "suite_end")
+
+
+def validate_start_events(events):
+    for start in events:
+        if not start["run_info"] == events[0]["run_info"]:
+            print("Error: different run_info entries", file=sys.stderr)
+            sys.exit(1)
+
+
+def merge_start_events(events):
+    for start in events[1:]:
+        events[0]["tests"].extend(start["tests"])
+    return events[0]
+
+
+def get_parser(add_help=True):
+    parser = argparse.ArgumentParser(
+        "logmerge", description="Merge multiple log files.", add_help=add_help
+    )
+    parser.add_argument("-o", dest="output", help="output file, defaults to stdout")
+    parser.add_argument(
+        "files", metavar="File", type=str, nargs="+", help="file to be merged"
+    )
+    return parser
+
+
+def main(**kwargs):
+    if kwargs["output"] is None:
+        output = sys.stdout
+    else:
+        output = open(kwargs["output"], "w")
+    readers = [read(open(filename, "r")) for filename in kwargs["files"]]
+    start_events = [process_until_suite_start(reader, output) for reader in readers]
+    validate_start_events(start_events)
+    merged_start_event = merge_start_events(start_events)
+    dump_entry(fill_process_info(merged_start_event), output)
+
+    end_events = [process_until_suite_end(reader, output) for reader in readers]
+    dump_entry(fill_process_info(end_events[0]), output)
+
+    for reader in readers:
+        for entry in reader:
+            dump_entry(entry, output)
+
+
+if __name__ == "__main__":
+    parser = get_parser()
+    args = parser.parse_args()
+    kwargs = vars(args)
+    main(**kwargs)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/unstable.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/unstable.py
new file mode 100644
index 00000000000..8eb95019bea
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/scripts/unstable.py
@@ -0,0 +1,146 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import json
+from collections import defaultdict
+
+from mozlog import reader
+
+
+class StatusHandler(reader.LogHandler):
+    def __init__(self):
+        self.run_info = None
+        self.statuses = defaultdict(
+            lambda: defaultdict(lambda: defaultdict(lambda: defaultdict(int)))
+        )
+
+    def test_id(self, test):
+        if isinstance(test, str):
+            return test
+        else:
+            return tuple(test)
+
+    def suite_start(self, item):
+        self.run_info = tuple(sorted(item.get("run_info", {}).items()))
+
+    def test_status(self, item):
+        self.statuses[self.run_info][self.test_id(item["test"])][item["subtest"]][
+            item["status"]
+        ] += 1
+
+    def test_end(self, item):
+        self.statuses[self.run_info][self.test_id(item["test"])][None][
+            item["status"]
+        ] += 1
+
+    def suite_end(self, item):
+        self.run_info = None
+
+
+def get_statuses(filenames):
+    handler = StatusHandler()
+
+    for filename in filenames:
+        with open(filename) as f:
+            reader.handle_log(reader.read(f), handler)
+
+    return handler.statuses
+
+
+def _filter(results_cmp):
+    def inner(statuses):
+        rv = defaultdict(lambda: defaultdict(dict))
+
+        for run_info, tests in statuses.items():
+            for test, subtests in tests.items():
+                for name, results in subtests.items():
+                    if results_cmp(results):
+                        rv[run_info][test][name] = results
+
+        return rv
+
+    return inner
+
+
+filter_unstable = _filter(lambda x: len(x) > 1)
+filter_stable = _filter(lambda x: len(x) == 1)
+
+
+def group_results(data):
+    rv = defaultdict(lambda: defaultdict(lambda: defaultdict(int)))
+
+    for run_info, tests in data.items():
+        for test, subtests in tests.items():
+            for name, results in subtests.items():
+                for status, number in results.items():
+                    rv[test][name][status] += number
+    return rv
+
+
+def print_results(data):
+    for run_info, tests in data.items():
+        run_str = (
+            " ".join("%s:%s" % (k, v) for k, v in run_info)
+            if run_info
+            else "No Run Info"
+        )
+        print(run_str)
+        print("=" * len(run_str))
+        print_run(tests)
+
+
+def print_run(tests):
+    for test, subtests in sorted(tests.items()):
+        print("\n" + str(test))
+        print("-" * len(test))
+        for name, results in subtests.items():
+            print(
+                "[%s]: %s"
+                % (
+                    name if name is not None else "",
+                    " ".join("%s (%i)" % (k, v) for k, v in results.items()),
+                )
+            )
+
+
+def get_parser(add_help=True):
+    parser = argparse.ArgumentParser(
+        "unstable",
+        description="List tests that don't give consistent "
+        "results from one or more runs.",
+        add_help=add_help,
+    )
+    parser.add_argument(
+        "--json", action="store_true", default=False, help="Output in JSON format"
+    )
+    parser.add_argument(
+        "--group",
+        action="store_true",
+        default=False,
+        help="Group results from different run types",
+    )
+    parser.add_argument("log_file", nargs="+", help="Log files to read")
+    return parser
+
+
+def main(**kwargs):
+    unstable = filter_unstable(get_statuses(kwargs["log_file"]))
+    if kwargs["group"]:
+        unstable = group_results(unstable)
+
+    if kwargs["json"]:
+        print(json.dumps(unstable))
+    else:
+        if not kwargs["group"]:
+            print_results(unstable)
+        else:
+            print_run(unstable)
+
+
+if __name__ == "__main__":
+    parser = get_parser()
+    args = parser.parse_args()
+    kwargs = vars(args)
+    main(**kwargs)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/stdadapter.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/stdadapter.py
new file mode 100644
index 00000000000..0c13d61e438
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/stdadapter.py
@@ -0,0 +1,50 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import logging
+
+from .structuredlog import StructuredLogger, log_levels
+
+
+class UnstructuredHandler(logging.Handler):
+    def __init__(self, name=None, level=logging.NOTSET):
+        self.structured = StructuredLogger(name)
+        logging.Handler.__init__(self, level=level)
+
+    def emit(self, record):
+        if record.levelname in log_levels:
+            log_func = getattr(self.structured, record.levelname.lower())
+        else:
+            log_func = self.logger.debug
+        log_func(record.msg)
+
+    def handle(self, record):
+        self.emit(record)
+
+
+class LoggingWrapper(object):
+    def __init__(self, wrapped):
+        self.wrapped = wrapped
+        self.wrapped.addHandler(
+            UnstructuredHandler(
+                self.wrapped.name, logging.getLevelName(self.wrapped.level)
+            )
+        )
+
+    def add_handler(self, handler):
+        self.addHandler(handler)
+
+    def remove_handler(self, handler):
+        self.removeHandler(handler)
+
+    def __getattr__(self, name):
+        return getattr(self.wrapped, name)
+
+
+def std_logging_adapter(logger):
+    """Adapter for stdlib logging so that it produces structured
+    messages rather than standard logging messages
+
+    :param logger: logging.Logger to wrap"""
+    return LoggingWrapper(logger)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/structuredlog.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/structuredlog.py
new file mode 100644
index 00000000000..20924e8b16a
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/structuredlog.py
@@ -0,0 +1,771 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+import sys
+import time
+import traceback
+from multiprocessing import current_process
+from threading import Lock, current_thread
+
+from .logtypes import (
+    Any,
+    Boolean,
+    Dict,
+    Int,
+    List,
+    Nullable,
+    Status,
+    SubStatus,
+    TestId,
+    TestList,
+    Tuple,
+    Unicode,
+    convertor_registry,
+    log_action,
+)
+
+"""Structured Logging for recording test results.
+
+Allowed actions, and subfields:
+  suite_start
+      tests  - List of test names
+      name - Name for the suite
+      run_info - Dictionary of run properties
+
+  add_subsuite
+      name - Name for the subsuite (must be unique)
+      run_info - Updates to the suite run_info (optional)
+
+  suite_end
+
+  test_start
+      test - ID for the test
+      path - Relative path to test (optional)
+      subsuite - Name of the subsuite to which test belongs (optional)
+
+  test_end
+      test - ID for the test
+      status [PASS | FAIL | OK | ERROR | TIMEOUT | CRASH |
+              ASSERT PRECONDITION_FAILED | SKIP] - test status
+      expected [As for status] - Status that the test was expected to get,
+                                 or absent if the test got the expected status
+      extra - Dictionary of harness-specific extra information e.g. debug info
+      known_intermittent - List of known intermittent statuses that should
+                           not fail a test. eg. ['FAIL', 'TIMEOUT']
+      subsuite - Name of the subsuite to which test belongs (optional)
+
+  test_status
+      test - ID for the test
+      subtest - Name of the subtest
+      status [PASS | FAIL | TIMEOUT |
+              PRECONDITION_FAILED | NOTRUN | SKIP] - test status
+      expected [As for status] - Status that the subtest was expected to get,
+                                 or absent if the subtest got the expected status
+      known_intermittent - List of known intermittent statuses that should
+                           not fail a test. eg. ['FAIL', 'TIMEOUT']
+      subsuite - Name of the subsuite to which test belongs (optional)
+
+  process_output
+      process - PID of the process
+      command - Command line of the process
+      data - Output data from the process
+      test - ID of the test that the process was running (optional)
+      subsuite - Name of the subsuite that the process was running (optional)
+
+  assertion_count
+      count - Number of assertions produced
+      min_expected - Minimum expected number of assertions
+      max_expected - Maximum expected number of assertions
+      subsuite - Name of the subsuite for the tests that ran (optional)
+
+  lsan_leak
+      frames - List of stack frames from the leak report
+      scope - An identifier for the set of tests run during the browser session
+              (e.g. a directory name)
+      allowed_match - A stack frame in the list that matched a rule meaning the
+                      leak is expected
+      subsuite - Name of the subsuite for the tests that ran (optional)
+
+  lsan_summary
+      bytes - Number of bytes leaked
+      allocations - Number of allocations
+      allowed - Boolean indicating whether all detected leaks matched allow rules
+      subsuite - Name of the subsuite for the tests that ran (optional)
+
+  mozleak_object
+     process - Process that leaked
+     bytes - Number of bytes that leaked
+     name - Name of the object that leaked
+     scope - An identifier for the set of tests run during the browser session
+             (e.g. a directory name)
+     allowed - Boolean indicating whether the leak was permitted
+     subsuite - Name of the subsuite for the tests that ran (optional)
+
+  log
+      level [CRITICAL | ERROR | WARNING |
+             INFO | DEBUG] - level of the logging message
+      message - Message to log
+
+Subfields for all messages:
+      action - the action type of the current message
+      time - the timestamp in ms since the epoch of the log message
+      thread - name for the thread emitting the message
+      pid - id of the python process in which the logger is running
+      source - name for the source emitting the message
+      component - name of the subcomponent emitting the message
+"""
+
+_default_logger_name = None
+
+
+def get_default_logger(component=None):
+    """Gets the default logger if available, optionally tagged with component
+    name. Will return None if not yet set
+
+    :param component: The component name to tag log messages with
+    """
+    global _default_logger_name
+
+    if not _default_logger_name:
+        return None
+
+    return StructuredLogger(_default_logger_name, component=component)
+
+
+def set_default_logger(default_logger):
+    """Sets the default logger to logger.
+
+    It can then be retrieved with :py:func:`get_default_logger`
+
+    Note that :py:func:`~mozlog.commandline.setup_logging` will
+    set a default logger for you, so there should be no need to call this
+    function if you're using setting up logging that way (recommended).
+
+    :param default_logger: The logger to set to default.
+    """
+    global _default_logger_name
+
+    _default_logger_name = default_logger.name
+
+
+log_levels = dict(
+    (k.upper(), v)
+    for v, k in enumerate(["critical", "error", "warning", "info", "debug"])
+)
+
+lint_levels = ["ERROR", "WARNING"]
+
+
+def log_actions():
+    """Returns the set of actions implemented by mozlog."""
+    return set(convertor_registry.keys())
+
+
+class LoggerShutdownError(Exception):
+    """Raised when attempting to log after logger.shutdown() has been called."""
+
+
+class LoggerState(object):
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        self.handlers = []
+        self.subsuites = set()
+        self.running_tests = set()
+        self.suite_started = False
+        self.component_states = {}
+        self.has_shutdown = False
+
+
+class ComponentState(object):
+    def __init__(self):
+        self.filter_ = None
+
+
+class StructuredLogger(object):
+    _lock = Lock()
+    _logger_states = {}
+    """Create a structured logger with the given name
+
+    :param name: The name of the logger.
+    :param component: A subcomponent that the logger belongs to (typically a library name)
+    """
+
+    def __init__(self, name, component=None):
+        self.name = name
+        self.component = component
+
+        with self._lock:
+            if name not in self._logger_states:
+                self._logger_states[name] = LoggerState()
+
+            if component not in self._logger_states[name].component_states:
+                self._logger_states[name].component_states[component] = ComponentState()
+
+        self._state = self._logger_states[name]
+        self._component_state = self._state.component_states[component]
+
+    def add_handler(self, handler):
+        """Add a handler to the current logger"""
+        self._state.handlers.append(handler)
+
+    def remove_handler(self, handler):
+        """Remove a handler from the current logger"""
+        self._state.handlers.remove(handler)
+
+    def reset_state(self):
+        """Resets the logger to a brand new state. This means all handlers
+        are removed, running tests are discarded and components are reset.
+        """
+        self._state.reset()
+        self._component_state = self._state.component_states[
+            self.component
+        ] = ComponentState()
+
+    def send_message(self, topic, command, *args):
+        """Send a message to each handler configured for this logger. This
+        part of the api is useful to those users requiring dynamic control
+        of a handler's behavior.
+
+        :param topic: The name used by handlers to subscribe to a message.
+        :param command: The name of the command to issue.
+        :param args: Any arguments known to the target for specialized
+                     behavior.
+        """
+        rv = []
+        for handler in self._state.handlers:
+            if hasattr(handler, "message_handler"):
+                rv += handler.message_handler.handle_message(topic, command, *args)
+        return rv
+
+    @property
+    def handlers(self):
+        """A list of handlers that will be called when a
+        message is logged from this logger"""
+        return self._state.handlers
+
+    @property
+    def component_filter(self):
+        return self._component_state.filter_
+
+    @component_filter.setter
+    def component_filter(self, value):
+        self._component_state.filter_ = value
+
+    def log_raw(self, raw_data):
+        if "action" not in raw_data:
+            raise ValueError
+
+        action = raw_data["action"]
+        converted_data = convertor_registry[action].convert_known(**raw_data)
+        for k, v in raw_data.items():
+            if (
+                k not in converted_data and
+                k not in convertor_registry[action].optional_args
+            ):
+                converted_data[k] = v
+
+        data = self._make_log_data(action, converted_data)
+
+        if action in ("test_status", "test_end"):
+            if (
+                data["expected"] == data["status"] or
+                data["status"] == "SKIP" or
+                "expected" not in raw_data
+            ):
+                del data["expected"]
+
+        if not self._ensure_suite_state(action, data):
+            return
+
+        self._handle_log(data)
+
+    def _log_data(self, action, data=None):
+        if data is None:
+            data = {}
+
+        if data.get("subsuite") and data["subsuite"] not in self._state.subsuites:
+            self.error(f"Unrecognised subsuite {data['subsuite']}")
+            return
+
+        log_data = self._make_log_data(action, data)
+        self._handle_log(log_data)
+
+    def _handle_log(self, data):
+        if self._state.has_shutdown:
+            raise LoggerShutdownError(
+                "{} action received after shutdown.".format(data["action"])
+            )
+
+        with self._lock:
+            if self.component_filter:
+                data = self.component_filter(data)
+                if data is None:
+                    return
+
+            for handler in self.handlers:
+                try:
+                    handler(data)
+                except Exception:
+                    # Write the exception details directly to stderr because
+                    # log() would call this method again which is currently locked.
+                    print(
+                        "%s: Failure calling log handler:" % __name__,
+                        file=sys.__stderr__,
+                    )
+                    print(traceback.format_exc(), file=sys.__stderr__)
+
+    def _make_log_data(self, action, data):
+        all_data = {
+            "action": action,
+            "time": int(time.time() * 1000),
+            "thread": current_thread().name,
+            "pid": current_process().pid,
+            "source": self.name,
+        }
+        if self.component:
+            all_data["component"] = self.component
+        all_data.update(data)
+        return all_data
+
+    def _ensure_suite_state(self, action, data):
+        if action == "suite_start":
+            if self._state.suite_started:
+                # limit data to reduce unnecessary log bloat
+                self.error(
+                    "Got second suite_start message before suite_end. " +
+                    "Logged with data: {}".format(json.dumps(data)[:100])
+                )
+                return False
+            self._state.suite_started = True
+        elif action == "suite_end":
+            if not self._state.suite_started:
+                self.error(
+                    "Got suite_end message before suite_start. " +
+                    "Logged with data: {}".format(json.dumps(data))
+                )
+                return False
+            self._state.suite_started = False
+        return True
+
+    @log_action(
+        TestList("tests"),
+        Unicode("name", default=None, optional=True),
+        Dict(Any, "run_info", default=None, optional=True),
+        Dict(Any, "version_info", default=None, optional=True),
+        Dict(Any, "device_info", default=None, optional=True),
+        Dict(Any, "extra", default=None, optional=True),
+    )
+    def suite_start(self, data):
+        """Log a suite_start message
+
+        :param dict tests: Test identifiers that will be run in the suite, keyed by group name.
+        :param str name: Optional name to identify the suite.
+        :param dict run_info: Optional information typically provided by mozinfo.
+        :param dict version_info: Optional target application version information provided
+          by mozversion.
+        :param dict device_info: Optional target device information provided by mozdevice.
+        """
+        if not self._ensure_suite_state("suite_start", data):
+            return
+
+        self._log_data("suite_start", data)
+
+    @log_action(
+        Unicode("name"),
+        Dict(Any, "run_info", default=None, optional=True),
+    )
+    def add_subsuite(self, data):
+        """Log a add_subsuite message
+
+        :param str name: Name to identify the subsuite.
+        :param dict run_info: Optional information about the subsuite. This updates the suite run_info.
+        """
+        if data["name"] in self._state.subsuites:
+            return
+        run_info = data.get("run_info", {"subsuite": data["name"]})
+        if "subsuite" not in run_info:
+            run_info = run_info.copy()
+            run_info["subsuite"] = data["name"]
+        data["run_info"] = run_info
+        self._state.subsuites.add(data["name"])
+        self._log_data("add_subsuite", data)
+
+    @log_action(Dict(Any, "extra", default=None, optional=True))
+    def suite_end(self, data):
+        """Log a suite_end message"""
+        if not self._ensure_suite_state("suite_end", data):
+            return
+
+        self._state.subsuites.clear()
+
+        self._log_data("suite_end", data)
+
+    @log_action(
+        TestId("test"),
+        Unicode("path", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def test_start(self, data):
+        """Log a test_start message
+
+        :param test: Identifier of the test that will run.
+        :param path: Path to test relative to some base (typically the root of
+                     the source tree).
+        :param subsuite: Optional name of the subsuite to which the test belongs.
+        """
+        if not self._state.suite_started:
+            self.error(
+                "Got test_start message before suite_start for test %s" % data["test"]
+            )
+            return
+        test_key = (data.get("subsuite"), data["test"])
+        if test_key in self._state.running_tests:
+            self.error("test_start for %s logged while in progress." % data["test"])
+            return
+        self._state.running_tests.add(test_key)
+        self._log_data("test_start", data)
+
+    @log_action(
+        TestId("test"),
+        Unicode("subtest"),
+        SubStatus("status"),
+        SubStatus("expected", default="PASS"),
+        Unicode("message", default=None, optional=True),
+        Unicode("stack", default=None, optional=True),
+        Dict(Any, "extra", default=None, optional=True),
+        List(SubStatus, "known_intermittent", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def test_status(self, data):
+        """
+        Log a test_status message indicating a subtest result. Tests that
+        do not have subtests are not expected to produce test_status messages.
+
+        :param test: Identifier of the test that produced the result.
+        :param subtest: Name of the subtest.
+        :param status: Status string indicating the subtest result
+        :param expected: Status string indicating the expected subtest result.
+        :param message: Optional string containing a message associated with the result.
+        :param stack: Optional stack trace encountered during test execution.
+        :param extra: Optional suite-specific data associated with the test result.
+        :param known_intermittent: Optional list of string expected intermittent statuses
+        :param subsuite: Optional name of the subsuite to which the test belongs.
+        """
+
+        if data["expected"] == data["status"] or data["status"] == "SKIP":
+            del data["expected"]
+
+        test_key = (data.get("subsuite"), data["test"])
+        if test_key not in self._state.running_tests:
+            self.error(
+                "test_status for %s logged while not in progress. "
+                "Logged with data: %s" % (data["test"], json.dumps(data))
+            )
+            return
+
+        self._log_data("test_status", data)
+
+    @log_action(
+        TestId("test"),
+        Status("status"),
+        Status("expected", default="OK"),
+        Unicode("message", default=None, optional=True),
+        Unicode("stack", default=None, optional=True),
+        Dict(Any, "extra", default=None, optional=True),
+        List(Status, "known_intermittent", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def test_end(self, data):
+        """
+        Log a test_end message indicating that a test completed. For tests
+        with subtests this indicates whether the overall test completed without
+        errors. For tests without subtests this indicates the test result
+        directly.
+
+        :param test: Identifier of the test that produced the result.
+        :param status: Status string indicating the test result
+        :param expected: Status string indicating the expected test result.
+        :param message: Optonal string containing a message associated with the result.
+        :param stack: Optional stack trace encountered during test execution.
+        :param extra: Optional suite-specific data associated with the test result.
+        :param subsuite: Optional name of the subsuite to which the test belongs.
+        """
+
+        if data["expected"] == data["status"] or data["status"] == "SKIP":
+            del data["expected"]
+
+        test_key = (data.get("subsuite"), data["test"])
+        if test_key not in self._state.running_tests:
+            self.error(
+                "test_end for %s logged while not in progress. "
+                "Logged with data: %s" % (data["test"], json.dumps(data))
+            )
+        else:
+            self._state.running_tests.remove(test_key)
+            self._log_data("test_end", data)
+
+    @log_action(
+        Unicode("process"),
+        Unicode("data"),
+        Unicode("command", default=None, optional=True),
+        TestId("test", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def process_output(self, data):
+        """Log output from a managed process.
+
+        :param process: A unique identifier for the process producing the output
+                        (typically the pid)
+        :param data: The output to log
+        :param command: Optional string representing the full command line used to start
+                        the process.
+        :param test: Optional ID of the test which the process was running.
+        :param subsuite: Optional name of the subsuite which the process was running.
+        """
+        self._log_data("process_output", data)
+
+    @log_action(
+        Unicode("process", default=None),
+        Unicode("signature", default="[Unknown]"),
+        TestId("test", default=None, optional=True),
+        Unicode("minidump_path", default=None, optional=True),
+        Unicode("minidump_extra", default=None, optional=True),
+        Int("stackwalk_retcode", default=None, optional=True),
+        Unicode("stackwalk_stdout", default=None, optional=True),
+        Unicode("stackwalk_stderr", default=None, optional=True),
+        Unicode("reason", default=None, optional=True),
+        Unicode("java_stack", default=None, optional=True),
+        Unicode("process_type", default=None, optional=True),
+        List(Unicode, "stackwalk_errors", default=None),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def crash(self, data):
+        if data["stackwalk_errors"] is None:
+            data["stackwalk_errors"] = []
+
+        self._log_data("crash", data)
+
+    @log_action(
+        Unicode("primary", default=None), List(Unicode, "secondary", default=None)
+    )
+    def valgrind_error(self, data):
+        self._log_data("valgrind_error", data)
+
+    @log_action(
+        Unicode("process"),
+        Unicode("command", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def process_start(self, data):
+        """Log start event of a process.
+
+        :param process: A unique identifier for the process producing the
+                        output (typically the pid)
+        :param command: Optional string representing the full command line used to
+                        start the process.
+        :param subsuite: Optional name of the subsuite using the process.
+        """
+        self._log_data("process_start", data)
+
+    @log_action(
+        Unicode("process"),
+        Int("exitcode"),
+        Unicode("command", default=None, optional=True),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def process_exit(self, data):
+        """Log exit event of a process.
+
+        :param process: A unique identifier for the process producing the
+                        output (typically the pid)
+        :param exitcode: the exit code
+        :param command: Optional string representing the full command line used to
+                        start the process.
+        :param subsuite: Optional name of the subsuite using the process.
+        """
+        self._log_data("process_exit", data)
+
+    @log_action(
+        TestId("test"),
+        Int("count"),
+        Int("min_expected"),
+        Int("max_expected"),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def assertion_count(self, data):
+        """Log count of assertions produced when running a test.
+
+        :param count: Number of assertions produced
+        :param min_expected: Minimum expected number of assertions
+        :param max_expected: Maximum expected number of assertions
+        :param subsuite: Optional name of the subsuite for the tests that ran
+        """
+        self._log_data("assertion_count", data)
+
+    @log_action(
+        List(Unicode, "frames"),
+        Unicode("scope", optional=True, default=None),
+        Unicode("allowed_match", optional=True, default=None),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def lsan_leak(self, data):
+        self._log_data("lsan_leak", data)
+
+    @log_action(
+        Int("bytes"),
+        Int("allocations"),
+        Boolean("allowed", optional=True, default=False),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def lsan_summary(self, data):
+        self._log_data("lsan_summary", data)
+
+    @log_action(
+        Unicode("process"),
+        Int("bytes"),
+        Unicode("name"),
+        Unicode("scope", optional=True, default=None),
+        Boolean("allowed", optional=True, default=False),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def mozleak_object(self, data):
+        self._log_data("mozleak_object", data)
+
+    @log_action(
+        Unicode("process"),
+        Nullable(Int, "bytes"),
+        Int("threshold"),
+        List(Unicode, "objects"),
+        Unicode("scope", optional=True, default=None),
+        Boolean("induced_crash", optional=True, default=False),
+        Boolean("ignore_missing", optional=True, default=False),
+        Unicode("subsuite", default=None, optional=True),
+    )
+    def mozleak_total(self, data):
+        self._log_data("mozleak_total", data)
+
+    @log_action()
+    def shutdown(self, data):
+        """Shutdown the logger.
+
+        This logs a 'shutdown' action after which any further attempts to use
+        the logger will raise a :exc:`LoggerShutdownError`.
+
+        This is also called implicitly from the destructor or
+        when exiting the context manager.
+        """
+        self._log_data("shutdown", data)
+        self._state.has_shutdown = True
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc, val, tb):
+        self.shutdown()
+
+
+def _log_func(level_name):
+    @log_action(Unicode("message"), Any("exc_info", default=False))
+    def log(self, data):
+        exc_info = data.pop("exc_info", None)
+        if exc_info:
+            if not isinstance(exc_info, tuple):
+                exc_info = sys.exc_info()
+            if exc_info != (None, None, None):
+                bt = traceback.format_exception(*exc_info)
+                data["stack"] = "\n".join(bt)
+
+        data["level"] = level_name
+        self._log_data("log", data)
+
+    log.__doc__ = (
+        """Log a message with level %s
+
+:param message: The string message to log
+:param exc_info: Either a boolean indicating whether to include a traceback
+                 derived from sys.exc_info() or a three-item tuple in the
+                 same format as sys.exc_info() containing exception information
+                 to log.
+"""
+        % level_name
+    )
+    log.__name__ = str(level_name).lower()
+    return log
+
+
+def _lint_func(level_name):
+    @log_action(
+        Unicode("path"),
+        Unicode("message", default=""),
+        Int("lineno", default=0),
+        Int("column", default=None, optional=True),
+        Unicode("hint", default=None, optional=True),
+        Unicode("source", default=None, optional=True),
+        Unicode("rule", default=None, optional=True),
+        Tuple((Int, Int), "lineoffset", default=None, optional=True),
+        Unicode("linter", default=None, optional=True),
+    )
+    def lint(self, data):
+        data["level"] = level_name
+        self._log_data("lint", data)
+
+    lint.__doc__ = """Log an error resulting from a failed lint check
+
+        :param linter: name of the linter that flagged this error
+        :param path: path to the file containing the error
+        :param message: text describing the error
+        :param lineno: line number that contains the error
+        :param column: column containing the error
+        :param hint: suggestion for fixing the error (optional)
+        :param source: source code context of the error (optional)
+        :param rule: name of the rule that was violated (optional)
+        :param lineoffset: denotes an error spans multiple lines, of the form
+                           (<lineno offset>, <num lines>) (optional)
+        """
+    lint.__name__ = str("lint_%s" % level_name)
+    return lint
+
+
+# Create all the methods on StructuredLog for log/lint levels
+for level_name in log_levels:
+    setattr(StructuredLogger, level_name.lower(), _log_func(level_name))
+
+for level_name in lint_levels:
+    level_name = level_name.lower()
+    name = "lint_%s" % level_name
+    setattr(StructuredLogger, name, _lint_func(level_name))
+
+
+class StructuredLogFileLike(object):
+    """Wrapper for file-like objects to redirect writes to logger
+    instead. Each call to `write` becomes a single log entry of type `log`.
+
+    When using this it is important that the callees i.e. the logging
+    handlers do not themselves try to write to the wrapped file as this
+    will cause infinite recursion.
+
+    :param logger: `StructuredLogger` to which to redirect the file write operations.
+    :param level: log level to use for each write.
+    :param prefix: String prefix to prepend to each log entry.
+    """
+
+    def __init__(self, logger, level="info", prefix=None):
+        self.logger = logger
+        self.log_func = getattr(self.logger, level)
+        self.prefix = prefix
+
+    def write(self, data):
+        if data.endswith("\n"):
+            data = data[:-1]
+        if data.endswith("\r"):
+            data = data[:-1]
+        if self.prefix is not None:
+            data = "%s: %s" % (self.prefix, data)
+        self.log_func(data)
+
+    def flush(self):
+        pass
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/__init__.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/__init__.py
new file mode 100644
index 00000000000..24b8f5b4059
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/__init__.py
@@ -0,0 +1,8 @@
+# flake8: noqa
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .logger import *
+from .loggingmixin import LoggingMixin
+from .loglistener import LogMessageServer
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/logger.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/logger.py
new file mode 100644
index 00000000000..db436c9d111
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/logger.py
@@ -0,0 +1,191 @@
+# flake8: noqa
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+
+# Some of the build slave environments don't see the following when doing
+# 'from logging import *'
+# see https://bugzilla.mozilla.org/show_bug.cgi?id=700415#c35
+from logging import *
+from logging import addLevelName, basicConfig, debug
+from logging import getLogger as getSysLogger
+from logging import getLoggerClass, info, setLoggerClass, shutdown
+
+_default_level = INFO
+_LoggerClass = getLoggerClass()
+
+# Define mozlog specific log levels
+START = _default_level + 1
+END = _default_level + 2
+PASS = _default_level + 3
+KNOWN_FAIL = _default_level + 4
+FAIL = _default_level + 5
+CRASH = _default_level + 6
+# Define associated text of log levels
+addLevelName(START, "TEST-START")
+addLevelName(END, "TEST-END")
+addLevelName(PASS, "TEST-PASS")
+addLevelName(KNOWN_FAIL, "TEST-KNOWN-FAIL")
+addLevelName(FAIL, "TEST-UNEXPECTED-FAIL")
+addLevelName(CRASH, "PROCESS-CRASH")
+
+
+class MozLogger(_LoggerClass):
+    """
+    MozLogger class which adds some convenience log levels
+    related to automated testing in Mozilla and ability to
+    output structured log messages.
+    """
+
+    def testStart(self, message, *args, **kwargs):
+        """Logs a test start message"""
+        self.log(START, message, *args, **kwargs)
+
+    def testEnd(self, message, *args, **kwargs):
+        """Logs a test end message"""
+        self.log(END, message, *args, **kwargs)
+
+    def testPass(self, message, *args, **kwargs):
+        """Logs a test pass message"""
+        self.log(PASS, message, *args, **kwargs)
+
+    def testFail(self, message, *args, **kwargs):
+        """Logs a test fail message"""
+        self.log(FAIL, message, *args, **kwargs)
+
+    def testKnownFail(self, message, *args, **kwargs):
+        """Logs a test known fail message"""
+        self.log(KNOWN_FAIL, message, *args, **kwargs)
+
+    def processCrash(self, message, *args, **kwargs):
+        """Logs a process crash message"""
+        self.log(CRASH, message, *args, **kwargs)
+
+    def log_structured(self, action, params=None):
+        """Logs a structured message object."""
+        if params is None:
+            params = {}
+
+        level = params.get("_level", _default_level)
+        if isinstance(level, int):
+            params["_level"] = getLevelName(level)
+        else:
+            params["_level"] = level
+            level = getLevelName(level.upper())
+
+            # If the logger is fed a level number unknown to the logging
+            # module, getLevelName will return a string. Unfortunately,
+            # the logging module will raise a type error elsewhere if
+            # the level is not an integer.
+            if not isinstance(level, int):
+                level = _default_level
+
+        params["action"] = action
+
+        # The can message be None. This is expected, and shouldn't cause
+        # unstructured formatters to fail.
+        message = params.get("_message")
+
+        self.log(level, message, extra={"params": params})
+
+
+class JSONFormatter(Formatter):
+    """Log formatter for emitting structured JSON entries."""
+
+    def format(self, record):
+        # Default values determined by logger metadata
+        # pylint: disable=W1633
+        output = {
+            "_time": int(round(record.created * 1000, 0)),
+            "_namespace": record.name,
+            "_level": getLevelName(record.levelno),
+        }
+
+        # If this message was created by a call to log_structured,
+        # anything specified by the caller's params should act as
+        # an override.
+        output.update(getattr(record, "params", {}))
+
+        if record.msg and output.get("_message") is None:
+            # For compatibility with callers using the printf like
+            # API exposed by python logging, call the default formatter.
+            output["_message"] = Formatter.format(self, record)
+
+        return json.dumps(output, indent=output.get("indent"))
+
+
+class MozFormatter(Formatter):
+    """
+    MozFormatter class used to standardize formatting
+    If a different format is desired, this can be explicitly
+    overriden with the log handler's setFormatter() method
+    """
+
+    level_length = 0
+    max_level_length = len("TEST-START")
+
+    def __init__(self, include_timestamp=False):
+        """
+        Formatter.__init__ has fmt and datefmt parameters that won't have
+        any affect on a MozFormatter instance.
+
+        :param include_timestamp: if True, include formatted time at the
+                                  beginning of the message
+        """
+        self.include_timestamp = include_timestamp
+        Formatter.__init__(self)
+
+    def format(self, record):
+        # Handles padding so record levels align nicely
+        if len(record.levelname) > self.level_length:
+            pad = 0
+            if len(record.levelname) <= self.max_level_length:
+                self.level_length = len(record.levelname)
+        else:
+            pad = self.level_length - len(record.levelname) + 1
+        sep = "|".rjust(pad)
+        fmt = "%(name)s %(levelname)s " + sep + " %(message)s"
+        if self.include_timestamp:
+            fmt = "%(asctime)s " + fmt
+        # this protected member is used to define the format
+        # used by the base Formatter's method
+        self._fmt = fmt
+        return Formatter(fmt=fmt).format(record)
+
+
+def getLogger(name, handler=None):
+    """
+    Returns the logger with the specified name.
+    If the logger doesn't exist, it is created.
+    If handler is specified, adds it to the logger. Otherwise a default handler
+    that logs to standard output will be used.
+
+    :param name: The name of the logger to retrieve
+    :param handler: A handler to add to the logger. If the logger already exists,
+                    and a handler is specified, an exception will be raised. To
+                    add a handler to an existing logger, call that logger's
+                    addHandler method.
+    """
+    setLoggerClass(MozLogger)
+
+    if name in Logger.manager.loggerDict:
+        if handler:
+            raise ValueError(
+                "The handler parameter requires "
+                + "that a logger by this name does "
+                + "not already exist"
+            )
+        return Logger.manager.loggerDict[name]
+
+    logger = getSysLogger(name)
+    logger.setLevel(_default_level)
+
+    if handler is None:
+        handler = StreamHandler()
+        handler.setFormatter(MozFormatter())
+
+    logger.addHandler(handler)
+    logger.propagate = False
+    return logger
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loggingmixin.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loggingmixin.py
new file mode 100644
index 00000000000..727e8f1a7db
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loggingmixin.py
@@ -0,0 +1,42 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .logger import Logger, getLogger
+
+
+class LoggingMixin(object):
+    """Expose a subset of logging functions to an inheriting class."""
+
+    def set_logger(self, logger_instance=None, name=None):
+        """Method for setting the underlying logger instance to be used."""
+
+        if logger_instance and not isinstance(logger_instance, Logger):
+            raise ValueError("logger_instance must be an instance of Logger")
+
+        if name is None:
+            name = ".".join([self.__module__, self.__class__.__name__])
+
+        self._logger = logger_instance or getLogger(name)
+
+    def _log_msg(self, cmd, *args, **kwargs):
+        if not hasattr(self, "_logger"):
+            self._logger = getLogger(
+                ".".join([self.__module__, self.__class__.__name__])
+            )
+        getattr(self._logger, cmd)(*args, **kwargs)
+
+    def log(self, *args, **kwargs):
+        self._log_msg("log", *args, **kwargs)
+
+    def info(self, *args, **kwargs):
+        self._log_msg("info", *args, **kwargs)
+
+    def error(self, *args, **kwargs):
+        self._log_msg("error", *args, **kwargs)
+
+    def warn(self, *args, **kwargs):
+        self._log_msg("warn", *args, **kwargs)
+
+    def log_structured(self, *args, **kwargs):
+        self._log_msg("log_structured", *args, **kwargs)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loglistener.py b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loglistener.py
new file mode 100644
index 00000000000..adaa0f3a139
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/mozlog/unstructured/loglistener.py
@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+import socket
+import socketserver
+
+
+class LogMessageServer(socketserver.TCPServer):
+    def __init__(self, server_address, logger, message_callback=None, timeout=3):
+        socketserver.TCPServer.__init__(self, server_address, LogMessageHandler)
+        self._logger = logger
+        self._message_callback = message_callback
+        self.timeout = timeout
+
+
+class LogMessageHandler(socketserver.BaseRequestHandler):
+    """Processes output from a connected log source, logging to an
+    existing logger upon receipt of a well-formed log messsage."""
+
+    def handle(self):
+        """Continually listens for log messages."""
+        self._partial_message = ""
+        self.request.settimeout(self.server.timeout)
+
+        while True:
+            try:
+                data = self.request.recv(1024)
+                if not data:
+                    return
+                self.process_message(data.decode())
+            except socket.timeout:
+                return
+
+    def process_message(self, data):
+        """Processes data from a connected log source. Messages are assumed
+        to be newline delimited, and generally well-formed JSON."""
+        for part in data.split("\n"):
+            msg_string = self._partial_message + part
+            try:
+                msg = json.loads(msg_string)
+                self._partial_message = ""
+                self.server._logger.log_structured(msg.get("action", "UNKNOWN"), msg)
+                if self.server._message_callback:
+                    self.server._message_callback()
+
+            except ValueError:
+                self._partial_message = msg_string
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/setup.cfg b/tests/wpt/tests/tools/third_party_modified/mozlog/setup.cfg
new file mode 100644
index 00000000000..3c6e79cf31d
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/setup.py b/tests/wpt/tests/tools/third_party_modified/mozlog/setup.py
new file mode 100644
index 00000000000..3aa21a4fad6
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/setup.py
@@ -0,0 +1,40 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from setuptools import find_packages, setup
+
+PACKAGE_NAME = "mozlog"
+PACKAGE_VERSION = "8.0.0"
+DEPS = [
+    "blessed>=1.19.1",
+    "mozterm",
+]
+
+
+setup(
+    name=PACKAGE_NAME,
+    version=PACKAGE_VERSION,
+    description="Robust log handling specialized for logging in the Mozilla universe",
+    long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
+    author="Mozilla Automation and Testing Team",
+    author_email="tools@lists.mozilla.org",
+    url="https://wiki.mozilla.org/Auto-tools/Projects/Mozbase",
+    license="Mozilla Public License 2.0 (MPL 2.0)",
+    packages=find_packages(),
+    zip_safe=False,
+    install_requires=DEPS,
+    tests_require=["mozfile"],
+    platforms=["Any"],
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3.5",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
+    package_data={"mozlog": ["formatters/html/main.js", "formatters/html/style.css"]},
+    entry_points={"console_scripts": ["structlog = mozlog.scripts:main"]},
+)
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/conftest.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/conftest.py
new file mode 100644
index 00000000000..9eb76e27a80
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/conftest.py
@@ -0,0 +1,26 @@
+from io import StringIO
+
+import pytest
+
+from mozlog.formatters import ErrorSummaryFormatter, MachFormatter
+from mozlog.handlers import StreamHandler
+from mozlog.structuredlog import StructuredLogger
+
+
+@pytest.fixture
+def get_logger():
+    # Ensure a new state instance is created for each test function.
+    StructuredLogger._logger_states = {}
+    formatters = {
+        "mach": MachFormatter,
+        "errorsummary": ErrorSummaryFormatter,
+    }
+
+    def inner(name, **fmt_args):
+        buf = StringIO()
+        fmt = formatters[name](**fmt_args)
+        logger = StructuredLogger("test_logger")
+        logger.add_handler(StreamHandler(buf, fmt))
+        return logger
+
+    return inner
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/manifest.ini b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/manifest.ini
new file mode 100644
index 00000000000..23737ca4697
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/manifest.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+subsuite = mozbase
+[test_errorsummary.py]
+[test_logger.py]
+[test_logtypes.py]
+[test_formatters.py]
+[test_structured.py]
+[test_terminal_colors.py]
+[test_capture.py]
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_capture.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_capture.py
new file mode 100644
index 00000000000..f0cf990a00d
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_capture.py
@@ -0,0 +1,37 @@
+import sys
+import unittest
+
+from mozlog import capture, structuredlog
+from test_structured import LogHandler
+
+
+class TestCaptureIO(unittest.TestCase):
+    """Tests expected logging output of CaptureIO"""
+
+    def setUp(self):
+        self.logger = structuredlog.StructuredLogger("test")
+        self.handler = LogHandler()
+        self.logger.add_handler(self.handler)
+
+    def test_captureio_log(self):
+        """
+        CaptureIO takes in two arguments. The second argument must
+        be truthy in order for the code to run. Hence, the string
+        "capture_stdio" has been used in this test case.
+        """
+        with capture.CaptureIO(self.logger, "capture_stdio"):
+            print("message 1")
+            sys.stdout.write("message 2")
+            sys.stderr.write("message 3")
+            sys.stdout.write("\xff")
+        log = self.handler.items
+        messages = [item["message"] for item in log]
+        self.assertIn("STDOUT: message 1", messages)
+        self.assertIn("STDOUT: message 2", messages)
+        self.assertIn("STDERR: message 3", messages)
+        self.assertIn(u"STDOUT: \xff", messages)
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_errorsummary.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_errorsummary.py
new file mode 100644
index 00000000000..a56e94bae44
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_errorsummary.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+
+import json
+import time
+
+import pytest
+
+# flake8: noqa
+
+
+@pytest.mark.parametrize(
+    "logs,expected",
+    (
+        pytest.param(
+            [
+                (
+                    "suite_start",
+                    {
+                        "manifestA": ["test_foo", "test_bar", "test_baz"],
+                        "manifestB": ["test_something"],
+                    },
+                ),
+                ("test_start", "test_foo"),
+                ("test_end", "test_foo", "SKIP"),
+                ("test_start", "test_bar"),
+                ("test_end", "test_bar", "OK"),
+                ("test_start", "test_something"),
+                ("test_end", "test_something", "OK"),
+                ("test_start", "test_baz"),
+                ("test_end", "test_baz", "PASS", "FAIL"),
+                ("suite_end",),
+            ],
+            """
+                {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0}
+                {"test": "test_baz", "subtest": null, "group": "manifestA", "status": "PASS", "expected": "FAIL", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 8}
+                {"group": "manifestA", "status": "ERROR", "duration": 70, "action": "group_result", "line": 9}
+                {"group": "manifestB", "status": "OK", "duration": 10, "action": "group_result", "line": 9}
+            """.strip(),
+            id="basic",
+        ),
+        pytest.param(
+            [
+                ("suite_start", {"manifest": ["test_foo"]}),
+                ("test_start", "test_foo"),
+                ("suite_end",),
+            ],
+            """
+                {"groups": ["manifest"], "action": "test_groups", "line": 0}
+                {"group": "manifest", "status": null, "duration": null, "action": "group_result", "line": 2}
+            """.strip(),
+            id="missing_test_end",
+        ),
+        pytest.param(
+            [
+                ("suite_start", {"manifest": ["test_foo"]}),
+                ("test_start", "test_foo"),
+                ("test_status", "test_foo", "subtest", "PASS"),
+                ("suite_end",),
+            ],
+            """
+                {"groups": ["manifest"], "action": "test_groups", "line": 0}
+                {"group": "manifest", "status": "ERROR", "duration": null, "action": "group_result", "line": 3}
+            """.strip(),
+            id="missing_test_end_with_test_status_ok",
+            marks=pytest.mark.xfail,  # status is OK but should be ERROR
+        ),
+        pytest.param(
+            [
+                (
+                    "suite_start",
+                    {
+                        "manifestA": ["test_foo", "test_bar", "test_baz"],
+                        "manifestB": ["test_something"],
+                    },
+                ),
+                ("test_start", "test_foo"),
+                ("test_end", "test_foo", "SKIP"),
+                ("test_start", "test_bar"),
+                ("test_end", "test_bar", "CRASH"),
+                ("test_start", "test_something"),
+                ("test_end", "test_something", "OK"),
+                ("test_start", "test_baz"),
+                ("test_end", "test_baz", "FAIL", "FAIL"),
+                ("suite_end",),
+            ],
+            """
+                {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0}
+                {"test": "test_bar", "subtest": null, "group": "manifestA", "status": "CRASH", "expected": "OK", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 4}
+                {"group": "manifestA", "status": "ERROR", "duration": 70, "action": "group_result", "line": 9}
+                {"group": "manifestB", "status": "OK", "duration": 10, "action": "group_result", "line": 9}
+            """.strip(),
+            id="crash_and_group_status",
+        ),
+    ),
+)
+def test_errorsummary(monkeypatch, get_logger, logs, expected):
+    ts = {"ts": 0.0}  # need to use dict since 'nonlocal' doesn't exist on PY2
+
+    def fake_time():
+        ts["ts"] += 0.01
+        return ts["ts"]
+
+    monkeypatch.setattr(time, "time", fake_time)
+    logger = get_logger("errorsummary")
+
+    for log in logs:
+        getattr(logger, log[0])(*log[1:])
+
+    buf = logger.handlers[0].stream
+    result = buf.getvalue()
+    print("Dumping result for copy/paste:")
+    print(result)
+
+    expected = expected.split("\n")
+    for i, line in enumerate(result.split("\n")):
+        if not line:
+            continue
+
+        data = json.loads(line)
+        assert data == json.loads(expected[i])
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_formatters.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_formatters.py
new file mode 100644
index 00000000000..30e63032238
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_formatters.py
@@ -0,0 +1,767 @@
+# encoding: utf-8
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import signal
+import unittest
+import xml.etree.ElementTree as Et
+from textwrap import dedent
+
+import pytest
+from mozlog.formatters import (
+    GroupingFormatter,
+    HTMLFormatter,
+    MachFormatter,
+    TbplFormatter,
+    XUnitFormatter,
+)
+from mozlog.handlers import StreamHandler
+from mozlog.structuredlog import StructuredLogger
+from six import StringIO, ensure_text, unichr
+
+FORMATS = {
+    # A list of tuples consisting of (name, options, expected string).
+    "PASS": [
+        (
+            "mach",
+            {},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: OK
+             0:00.00 TEST_START: test_bar
+             0:00.00 TEST_END: Test OK. Subtests passed 1/1. Unexpected 0
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (1 subtests, 3 tests)
+            Expected results: 4
+            Unexpected results: 0
+            OK
+            """
+            ).lstrip("\n"),
+        ),
+        (
+            "mach",
+            {"verbose": True},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: OK
+             0:00.00 TEST_START: test_bar
+             0:00.00 PASS a subtest
+             0:00.00 TEST_END: Test OK. Subtests passed 1/1. Unexpected 0
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (1 subtests, 3 tests)
+            Expected results: 4
+            Unexpected results: 0
+            OK
+            """
+            ).lstrip("\n"),
+        ),
+    ],
+    "FAIL": [
+        (
+            "mach",
+            {},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: FAIL, expected PASS - expected 0 got 1
+             0:00.00 TEST_START: test_bar
+             0:00.00 TEST_END: Test OK. Subtests passed 0/2. Unexpected 2
+            FAIL a subtest - expected 0 got 1
+                SimpleTest.is@SimpleTest/SimpleTest.js:312:5
+                @caps/tests/mochitest/test_bug246699.html:53:1
+            TIMEOUT another subtest
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: PASS, expected FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 5 checks (2 subtests, 3 tests)
+            Expected results: 1
+            Unexpected results: 4
+              test: 2 (1 fail, 1 pass)
+              subtest: 2 (1 fail, 1 timeout)
+
+            Unexpected Results
+            ------------------
+            test_foo
+              FAIL test_foo - expected 0 got 1
+            test_bar
+              FAIL a subtest - expected 0 got 1
+                SimpleTest.is@SimpleTest/SimpleTest.js:312:5
+                @caps/tests/mochitest/test_bug246699.html:53:1
+              TIMEOUT another subtest
+            test_baz
+              UNEXPECTED-PASS test_baz
+            """
+            ).lstrip("\n"),
+        ),
+        (
+            "mach",
+            {"verbose": True},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: FAIL, expected PASS - expected 0 got 1
+             0:00.00 TEST_START: test_bar
+             0:00.00 FAIL a subtest - expected 0 got 1
+                SimpleTest.is@SimpleTest/SimpleTest.js:312:5
+                @caps/tests/mochitest/test_bug246699.html:53:1
+             0:00.00 TIMEOUT another subtest
+             0:00.00 TEST_END: Test OK. Subtests passed 0/2. Unexpected 2
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: PASS, expected FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 5 checks (2 subtests, 3 tests)
+            Expected results: 1
+            Unexpected results: 4
+              test: 2 (1 fail, 1 pass)
+              subtest: 2 (1 fail, 1 timeout)
+
+            Unexpected Results
+            ------------------
+            test_foo
+              FAIL test_foo - expected 0 got 1
+            test_bar
+              FAIL a subtest - expected 0 got 1
+                SimpleTest.is@SimpleTest/SimpleTest.js:312:5
+                @caps/tests/mochitest/test_bug246699.html:53:1
+              TIMEOUT another subtest
+            test_baz
+              UNEXPECTED-PASS test_baz
+            """
+            ).lstrip("\n"),
+        ),
+    ],
+    "PRECONDITION_FAILED": [
+        (
+            "mach",
+            {},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 2 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: PRECONDITION_FAILED, expected OK
+             0:00.00 TEST_START: test_bar
+             0:00.00 TEST_END: Test OK. Subtests passed 1/2. Unexpected 1
+            PRECONDITION_FAILED another subtest
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (2 subtests, 2 tests)
+            Expected results: 2
+            Unexpected results: 2
+              test: 1 (1 precondition_failed)
+              subtest: 1 (1 precondition_failed)
+
+            Unexpected Results
+            ------------------
+            test_foo
+              PRECONDITION_FAILED test_foo
+            test_bar
+              PRECONDITION_FAILED another subtest
+            """
+            ).lstrip("\n"),
+        ),
+        (
+            "mach",
+            {"verbose": True},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 2 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: PRECONDITION_FAILED, expected OK
+             0:00.00 TEST_START: test_bar
+             0:00.00 PASS a subtest
+             0:00.00 PRECONDITION_FAILED another subtest
+             0:00.00 TEST_END: Test OK. Subtests passed 1/2. Unexpected 1
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (2 subtests, 2 tests)
+            Expected results: 2
+            Unexpected results: 2
+              test: 1 (1 precondition_failed)
+              subtest: 1 (1 precondition_failed)
+
+            Unexpected Results
+            ------------------
+            test_foo
+              PRECONDITION_FAILED test_foo
+            test_bar
+              PRECONDITION_FAILED another subtest
+            """
+            ).lstrip("\n"),
+        ),
+    ],
+    "KNOWN-INTERMITTENT": [
+        (
+            "mach",
+            {},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: FAIL
+            KNOWN-INTERMITTENT-FAIL test_foo
+             0:00.00 TEST_START: test_bar
+             0:00.00 TEST_END: Test OK. Subtests passed 1/1. Unexpected 0
+            KNOWN-INTERMITTENT-PASS a subtest
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (1 subtests, 3 tests)
+            Expected results: 4 (2 known intermittents)
+            Unexpected results: 0
+
+            Known Intermittent Results
+            --------------------------
+            test_foo
+              KNOWN-INTERMITTENT-FAIL test_foo
+            test_bar
+              KNOWN-INTERMITTENT-PASS a subtest
+            OK
+            """
+            ).lstrip("\n"),
+        ),
+        (
+            "mach",
+            {"verbose": True},
+            dedent(
+                """
+             0:00.00 SUITE_START: running 3 tests
+             0:00.00 TEST_START: test_foo
+             0:00.00 TEST_END: FAIL
+            KNOWN-INTERMITTENT-FAIL test_foo
+             0:00.00 TEST_START: test_bar
+             0:00.00 KNOWN-INTERMITTENT-PASS a subtest
+             0:00.00 TEST_END: Test OK. Subtests passed 1/1. Unexpected 0
+            KNOWN-INTERMITTENT-PASS a subtest
+             0:00.00 TEST_START: test_baz
+             0:00.00 TEST_END: FAIL
+             0:00.00 SUITE_END
+
+            suite 1
+            ~~~~~~~
+            Ran 4 checks (1 subtests, 3 tests)
+            Expected results: 4 (2 known intermittents)
+            Unexpected results: 0
+
+            Known Intermittent Results
+            --------------------------
+            test_foo
+              KNOWN-INTERMITTENT-FAIL test_foo
+            test_bar
+              KNOWN-INTERMITTENT-PASS a subtest
+            OK
+            """
+            ).lstrip("\n"),
+        ),
+    ],
+}
+
+
+def ids(test):
+    ids = []
+    for value in FORMATS[test]:
+        args = ", ".join(["{}={}".format(k, v) for k, v in value[1].items()])
+        if args:
+            args = "-{}".format(args)
+        ids.append("{}{}".format(value[0], args))
+    return ids
+
+
+@pytest.fixture(autouse=True)
+def timestamp(monkeypatch):
+    def fake_time(*args, **kwargs):
+        return 0
+
+    monkeypatch.setattr(MachFormatter, "_time", fake_time)
+
+
+@pytest.mark.parametrize("name,opts,expected", FORMATS["PASS"], ids=ids("PASS"))
+def test_pass(get_logger, name, opts, expected):
+    logger = get_logger(name, **opts)
+
+    logger.suite_start(["test_foo", "test_bar", "test_baz"])
+    logger.test_start("test_foo")
+    logger.test_end("test_foo", "OK")
+    logger.test_start("test_bar")
+    logger.test_status("test_bar", "a subtest", "PASS")
+    logger.test_end("test_bar", "OK")
+    logger.test_start("test_baz")
+    logger.test_end("test_baz", "FAIL", "FAIL", "expected 0 got 1")
+    logger.suite_end()
+
+    buf = logger.handlers[0].stream
+    result = buf.getvalue()
+    print("Dumping result for copy/paste:")
+    print(result)
+    assert result == expected
+
+
+@pytest.mark.parametrize("name,opts,expected", FORMATS["FAIL"], ids=ids("FAIL"))
+def test_fail(get_logger, name, opts, expected):
+    stack = """
+    SimpleTest.is@SimpleTest/SimpleTest.js:312:5
+    @caps/tests/mochitest/test_bug246699.html:53:1
+""".strip(
+        "\n"
+    )
+
+    logger = get_logger(name, **opts)
+
+    logger.suite_start(["test_foo", "test_bar", "test_baz"])
+    logger.test_start("test_foo")
+    logger.test_end("test_foo", "FAIL", "PASS", "expected 0 got 1")
+    logger.test_start("test_bar")
+    logger.test_status(
+        "test_bar", "a subtest", "FAIL", "PASS", "expected 0 got 1", stack
+    )
+    logger.test_status("test_bar", "another subtest", "TIMEOUT")
+    logger.test_end("test_bar", "OK")
+    logger.test_start("test_baz")
+    logger.test_end("test_baz", "PASS", "FAIL")
+    logger.suite_end()
+
+    buf = logger.handlers[0].stream
+    result = buf.getvalue()
+    print("Dumping result for copy/paste:")
+    print(result)
+    assert result == expected
+
+
+@pytest.mark.parametrize(
+    "name,opts,expected", FORMATS["PRECONDITION_FAILED"], ids=ids("PRECONDITION_FAILED")
+)
+def test_precondition_failed(get_logger, name, opts, expected):
+    logger = get_logger(name, **opts)
+
+    logger.suite_start(["test_foo", "test_bar"])
+    logger.test_start("test_foo")
+    logger.test_end("test_foo", "PRECONDITION_FAILED")
+    logger.test_start("test_bar")
+    logger.test_status("test_bar", "a subtest", "PASS")
+    logger.test_status("test_bar", "another subtest", "PRECONDITION_FAILED")
+    logger.test_end("test_bar", "OK")
+    logger.suite_end()
+
+    buf = logger.handlers[0].stream
+    result = buf.getvalue()
+    print("Dumping result for copy/paste:")
+    print(result)
+    assert result == expected
+
+
+@pytest.mark.parametrize(
+    "name,opts,expected", FORMATS["KNOWN-INTERMITTENT"], ids=ids("KNOWN-INTERMITTENT")
+)
+def test_known_intermittent(get_logger, name, opts, expected):
+    logger = get_logger(name, **opts)
+
+    logger.suite_start(["test_foo", "test_bar", "test_baz"])
+    logger.test_start("test_foo")
+    logger.test_end("test_foo", "FAIL", "PASS", known_intermittent=["FAIL"])
+    logger.test_start("test_bar")
+    logger.test_status(
+        "test_bar", "a subtest", "PASS", "FAIL", known_intermittent=["PASS"]
+    )
+    logger.test_end("test_bar", "OK")
+    logger.test_start("test_baz")
+    logger.test_end(
+        "test_baz", "FAIL", "FAIL", "expected 0 got 1", known_intermittent=["PASS"]
+    )
+    logger.suite_end()
+
+    buf = logger.handlers[0].stream
+    result = buf.getvalue()
+    print("Dumping result for copy/paste:")
+    print(result)
+    assert result == expected
+
+
+class FormatterTest(unittest.TestCase):
+    def setUp(self):
+        self.position = 0
+        self.logger = StructuredLogger("test_%s" % type(self).__name__)
+        self.output_file = StringIO()
+        self.handler = StreamHandler(self.output_file, self.get_formatter())
+        self.logger.add_handler(self.handler)
+
+    def set_position(self, pos=None):
+        if pos is None:
+            pos = self.output_file.tell()
+        self.position = pos
+
+    def get_formatter(self):
+        raise NotImplementedError(
+            "FormatterTest subclasses must implement get_formatter"
+        )
+
+    @property
+    def loglines(self):
+        self.output_file.seek(self.position)
+        return [ensure_text(line.rstrip()) for line in self.output_file.readlines()]
+
+
+class TestHTMLFormatter(FormatterTest):
+    def get_formatter(self):
+        return HTMLFormatter()
+
+    def test_base64_string(self):
+        self.logger.suite_start([])
+        self.logger.test_start("string_test")
+        self.logger.test_end("string_test", "FAIL", extra={"data": "foobar"})
+        self.logger.suite_end()
+        self.assertIn("data:text/html;charset=utf-8;base64,Zm9vYmFy", self.loglines[-3])
+
+    def test_base64_unicode(self):
+        self.logger.suite_start([])
+        self.logger.test_start("unicode_test")
+        self.logger.test_end("unicode_test", "FAIL", extra={"data": unichr(0x02A9)})
+        self.logger.suite_end()
+        self.assertIn("data:text/html;charset=utf-8;base64,yqk=", self.loglines[-3])
+
+    def test_base64_other(self):
+        self.logger.suite_start([])
+        self.logger.test_start("int_test")
+        self.logger.test_end("int_test", "FAIL", extra={"data": {"foo": "bar"}})
+        self.logger.suite_end()
+        self.assertIn(
+            "data:text/html;charset=utf-8;base64,eyJmb28iOiAiYmFyIn0=",
+            self.loglines[-3],
+        )
+
+
+class TestTBPLFormatter(FormatterTest):
+    def get_formatter(self):
+        return TbplFormatter()
+
+    def test_unexpected_message(self):
+        self.logger.suite_start([])
+        self.logger.test_start("timeout_test")
+        self.logger.test_end("timeout_test", "TIMEOUT", message="timed out")
+        self.assertIn(
+            "TEST-UNEXPECTED-TIMEOUT | timeout_test | timed out", self.loglines
+        )
+        self.logger.suite_end()
+
+    def test_default_unexpected_end_message(self):
+        self.logger.suite_start([])
+        self.logger.test_start("timeout_test")
+        self.logger.test_end("timeout_test", "TIMEOUT")
+        self.assertIn(
+            "TEST-UNEXPECTED-TIMEOUT | timeout_test | expected OK", self.loglines
+        )
+        self.logger.suite_end()
+
+    def test_default_unexpected_status_message(self):
+        self.logger.suite_start([])
+        self.logger.test_start("timeout_test")
+        self.logger.test_status("timeout_test", "subtest", status="TIMEOUT")
+        self.assertIn(
+            "TEST-UNEXPECTED-TIMEOUT | timeout_test | subtest - expected PASS",
+            self.loglines,
+        )
+        self.logger.test_end("timeout_test", "OK")
+        self.logger.suite_end()
+
+    def test_known_intermittent_end(self):
+        self.logger.suite_start([])
+        self.logger.test_start("intermittent_test")
+        self.logger.test_end(
+            "intermittent_test",
+            status="FAIL",
+            expected="PASS",
+            known_intermittent=["FAIL"],
+        )
+        # test_end log format:
+        # "TEST-KNOWN-INTERMITTENT-<STATUS> | <test> | took <duration>ms"
+        # where duration may be different each time
+        self.assertIn(
+            "TEST-KNOWN-INTERMITTENT-FAIL | intermittent_test | took ", self.loglines[2]
+        )
+        self.assertIn("ms", self.loglines[2])
+        self.logger.suite_end()
+
+    def test_known_intermittent_status(self):
+        self.logger.suite_start([])
+        self.logger.test_start("intermittent_test")
+        self.logger.test_status(
+            "intermittent_test",
+            "subtest",
+            status="FAIL",
+            expected="PASS",
+            known_intermittent=["FAIL"],
+        )
+        self.assertIn(
+            "TEST-KNOWN-INTERMITTENT-FAIL | intermittent_test | subtest", self.loglines
+        )
+        self.logger.test_end("intermittent_test", "OK")
+        self.logger.suite_end()
+
+    def test_single_newline(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.set_position()
+        self.logger.test_status("test1", "subtest", status="PASS", expected="FAIL")
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+        # This sequence should not produce blanklines
+        for line in self.loglines:
+            self.assertNotEqual("", line)
+
+    def test_process_exit(self):
+        self.logger.process_exit(1234, 0)
+        self.assertIn("TEST-INFO | 1234: exit 0", self.loglines)
+
+    @unittest.skipUnless(os.name == "posix", "posix only")
+    def test_process_exit_with_sig(self):
+        # subprocess return code is negative when process
+        # has been killed by signal on posix.
+        self.logger.process_exit(1234, -signal.SIGTERM)
+        self.assertIn("TEST-INFO | 1234: killed by SIGTERM", self.loglines)
+
+
+class TestTBPLFormatterWithShutdown(FormatterTest):
+    def get_formatter(self):
+        return TbplFormatter(summary_on_shutdown=True)
+
+    def test_suite_summary_on_shutdown(self):
+        self.logger.suite_start([])
+        self.logger.test_start("summary_test")
+        self.logger.test_status(
+            "summary_test", "subtest", "FAIL", "PASS", known_intermittent=["FAIL"]
+        )
+        self.logger.test_end("summary_test", "FAIL", "OK", known_intermittent=["FAIL"])
+        self.logger.suite_end()
+        self.logger.shutdown()
+
+        self.assertIn("suite 1: 2/2 (2 known intermittent tests)", self.loglines)
+        self.assertIn("Known Intermittent tests:", self.loglines)
+        self.assertIn(
+            "TEST-KNOWN-INTERMITTENT-FAIL | summary_test | subtest", self.loglines
+        )
+
+
+class TestMachFormatter(FormatterTest):
+    def get_formatter(self):
+        return MachFormatter(disable_colors=True)
+
+    def test_summary(self):
+        self.logger.suite_start([])
+
+        # Some tests that pass
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", status="PASS", expected="PASS")
+
+        self.logger.test_start("test2")
+        self.logger.test_end("test2", status="PASS", expected="TIMEOUT")
+
+        self.logger.test_start("test3")
+        self.logger.test_end("test3", status="FAIL", expected="PASS")
+
+        self.set_position()
+        self.logger.suite_end()
+
+        self.assertIn("Ran 3 checks (3 tests)", self.loglines)
+        self.assertIn("Expected results: 1", self.loglines)
+        self.assertIn(
+            """
+Unexpected results: 2
+  test: 2 (1 fail, 1 pass)
+""".strip(),
+            "\n".join(self.loglines),
+        )
+        self.assertNotIn("test1", self.loglines)
+        self.assertIn("UNEXPECTED-PASS test2", self.loglines)
+        self.assertIn("FAIL test3", self.loglines)
+
+    def test_summary_subtests(self):
+        self.logger.suite_start([])
+
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "subtest1", status="PASS")
+        self.logger.test_status("test1", "subtest2", status="FAIL")
+        self.logger.test_end("test1", status="OK", expected="OK")
+
+        self.logger.test_start("test2")
+        self.logger.test_status("test2", "subtest1", status="TIMEOUT", expected="PASS")
+        self.logger.test_end("test2", status="TIMEOUT", expected="OK")
+
+        self.set_position()
+        self.logger.suite_end()
+
+        self.assertIn("Ran 5 checks (3 subtests, 2 tests)", self.loglines)
+        self.assertIn("Expected results: 2", self.loglines)
+        self.assertIn(
+            """
+Unexpected results: 3
+  test: 1 (1 timeout)
+  subtest: 2 (1 fail, 1 timeout)
+""".strip(),
+            "\n".join(self.loglines),
+        )
+
+    def test_summary_ok(self):
+        self.logger.suite_start([])
+
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "subtest1", status="PASS")
+        self.logger.test_status("test1", "subtest2", status="PASS")
+        self.logger.test_end("test1", status="OK", expected="OK")
+
+        self.logger.test_start("test2")
+        self.logger.test_status("test2", "subtest1", status="PASS", expected="PASS")
+        self.logger.test_end("test2", status="OK", expected="OK")
+
+        self.set_position()
+        self.logger.suite_end()
+
+        self.assertIn("OK", self.loglines)
+        self.assertIn("Expected results: 5", self.loglines)
+        self.assertIn("Unexpected results: 0", self.loglines)
+
+    def test_process_start(self):
+        self.logger.process_start(1234)
+        self.assertIn("Started process `1234`", self.loglines[0])
+
+    def test_process_start_with_command(self):
+        self.logger.process_start(1234, command="test cmd")
+        self.assertIn("Started process `1234` (test cmd)", self.loglines[0])
+
+    def test_process_exit(self):
+        self.logger.process_exit(1234, 0)
+        self.assertIn("1234: exit 0", self.loglines[0])
+
+    @unittest.skipUnless(os.name == "posix", "posix only")
+    def test_process_exit_with_sig(self):
+        # subprocess return code is negative when process
+        # has been killed by signal on posix.
+        self.logger.process_exit(1234, -signal.SIGTERM)
+        self.assertIn("1234: killed by SIGTERM", self.loglines[0])
+
+
+class TestGroupingFormatter(FormatterTest):
+    def get_formatter(self):
+        return GroupingFormatter()
+
+    def test_results_total(self):
+        self.logger.suite_start([])
+
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "subtest1", status="PASS")
+        self.logger.test_status("test1", "subtest1", status="PASS")
+        self.logger.test_end("test1", status="OK")
+
+        self.logger.test_start("test2")
+        self.logger.test_status(
+            "test2",
+            "subtest2",
+            status="FAIL",
+            expected="PASS",
+            known_intermittent=["FAIL"],
+        )
+        self.logger.test_end("test2", status="FAIL", expected="OK")
+
+        self.set_position()
+        self.logger.suite_end()
+
+        self.assertIn("Ran 2 tests finished in 0.0 seconds.", self.loglines)
+        self.assertIn("  \u2022 1 ran as expected. 0 tests skipped.", self.loglines)
+        self.assertIn("  \u2022 1 known intermittent results.", self.loglines)
+        self.assertIn("  \u2022 1 tests failed unexpectedly", self.loglines)
+        self.assertIn("  \u25B6 FAIL [expected OK] test2", self.loglines)
+        self.assertIn(
+            "  \u25B6 FAIL [expected PASS, known intermittent [FAIL] test2, subtest2",
+            self.loglines,
+        )
+
+
+class TestXUnitFormatter(FormatterTest):
+    def get_formatter(self):
+        return XUnitFormatter()
+
+    def log_as_xml(self):
+        return Et.fromstring("\n".join(self.loglines))
+
+    def test_stacktrace_is_present(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end(
+            "test1", "fail", message="Test message", stack="this\nis\na\nstack"
+        )
+        self.logger.suite_end()
+
+        root = self.log_as_xml()
+        self.assertIn("this\nis\na\nstack", root.find("testcase/failure").text)
+
+    def test_failure_message(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", "fail", message="Test message")
+        self.logger.suite_end()
+
+        root = self.log_as_xml()
+        self.assertEqual(
+            "Expected OK, got FAIL", root.find("testcase/failure").get("message")
+        )
+
+    def test_suite_attrs(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", "ok", message="Test message")
+        self.logger.suite_end()
+
+        root = self.log_as_xml()
+        self.assertEqual(root.get("skips"), "0")
+        self.assertEqual(root.get("failures"), "0")
+        self.assertEqual(root.get("errors"), "0")
+        self.assertEqual(root.get("tests"), "1")
+
+    def test_time_is_not_rounded(self):
+        # call formatter directly, it is easier here
+        formatter = self.get_formatter()
+        formatter.suite_start(dict(time=55000))
+        formatter.test_start(dict(time=55100))
+        formatter.test_end(
+            dict(time=55558, test="id", message="message", status="PASS")
+        )
+        xml_string = formatter.suite_end(dict(time=55559))
+
+        root = Et.fromstring(xml_string)
+        self.assertEqual(root.get("time"), "0.56")
+        self.assertEqual(root.find("testcase").get("time"), "0.46")
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logger.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logger.py
new file mode 100644
index 00000000000..af136b89aa6
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logger.py
@@ -0,0 +1,299 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import datetime
+import json
+import socket
+import threading
+import time
+import unittest
+
+import mozlog.unstructured as mozlog
+
+
+class ListHandler(mozlog.Handler):
+    """Mock handler appends messages to a list for later inspection."""
+
+    def __init__(self):
+        mozlog.Handler.__init__(self)
+        self.messages = []
+
+    def emit(self, record):
+        self.messages.append(self.format(record))
+
+
+class TestLogging(unittest.TestCase):
+    """Tests behavior of basic mozlog api."""
+
+    def test_logger_defaults(self):
+        """Tests the default logging format and behavior."""
+
+        default_logger = mozlog.getLogger("default.logger")
+        self.assertEqual(default_logger.name, "default.logger")
+        self.assertEqual(len(default_logger.handlers), 1)
+        self.assertTrue(isinstance(default_logger.handlers[0], mozlog.StreamHandler))
+
+        list_logger = mozlog.getLogger("list.logger", handler=ListHandler())
+        self.assertEqual(len(list_logger.handlers), 1)
+        self.assertTrue(isinstance(list_logger.handlers[0], ListHandler))
+
+        self.assertRaises(
+            ValueError, mozlog.getLogger, "list.logger", handler=mozlog.StreamHandler()
+        )
+
+    def test_timestamps(self):
+        """Verifies that timestamps are included when asked for."""
+        log_name = "test"
+        handler = ListHandler()
+        handler.setFormatter(mozlog.MozFormatter())
+        log = mozlog.getLogger(log_name, handler=handler)
+        log.info("no timestamp")
+        self.assertTrue(handler.messages[-1].startswith("%s " % log_name))
+        handler.setFormatter(mozlog.MozFormatter(include_timestamp=True))
+        log.info("timestamp")
+        # Just verify that this raises no exceptions.
+        datetime.datetime.strptime(handler.messages[-1][:23], "%Y-%m-%d %H:%M:%S,%f")
+
+
+class TestStructuredLogging(unittest.TestCase):
+    """Tests structured output in mozlog."""
+
+    def setUp(self):
+        self.handler = ListHandler()
+        self.handler.setFormatter(mozlog.JSONFormatter())
+        self.logger = mozlog.MozLogger("test.Logger")
+        self.logger.addHandler(self.handler)
+        self.logger.setLevel(mozlog.DEBUG)
+
+    def check_messages(self, expected, actual):
+        """Checks actual for equality with corresponding fields in actual.
+        The actual message should contain all fields in expected, and
+        should be identical, with the exception of the timestamp field.
+        The actual message should contain no fields other than the timestamp
+        field and those present in expected."""
+
+        self.assertTrue(isinstance(actual["_time"], int))
+
+        for k, v in expected.items():
+            self.assertEqual(v, actual[k])
+
+        for k in actual.keys():
+            if k != "_time":
+                self.assertTrue(expected.get(k) is not None)
+
+    def test_structured_output(self):
+        self.logger.log_structured(
+            "test_message", {"_level": mozlog.INFO, "_message": "message one"}
+        )
+        self.logger.log_structured(
+            "test_message", {"_level": mozlog.INFO, "_message": "message two"}
+        )
+        self.logger.log_structured(
+            "error_message", {"_level": mozlog.ERROR, "diagnostic": "unexpected error"}
+        )
+
+        message_one_expected = {
+            "_namespace": "test.Logger",
+            "_level": "INFO",
+            "_message": "message one",
+            "action": "test_message",
+        }
+        message_two_expected = {
+            "_namespace": "test.Logger",
+            "_level": "INFO",
+            "_message": "message two",
+            "action": "test_message",
+        }
+        message_three_expected = {
+            "_namespace": "test.Logger",
+            "_level": "ERROR",
+            "diagnostic": "unexpected error",
+            "action": "error_message",
+        }
+
+        message_one_actual = json.loads(self.handler.messages[0])
+        message_two_actual = json.loads(self.handler.messages[1])
+        message_three_actual = json.loads(self.handler.messages[2])
+
+        self.check_messages(message_one_expected, message_one_actual)
+        self.check_messages(message_two_expected, message_two_actual)
+        self.check_messages(message_three_expected, message_three_actual)
+
+    def test_unstructured_conversion(self):
+        """Tests that logging to a logger with a structured formatter
+        via the traditional logging interface works as expected."""
+        self.logger.info("%s %s %d", "Message", "number", 1)
+        self.logger.error("Message number 2")
+        self.logger.debug(
+            "Message with %s",
+            "some extras",
+            extra={"params": {"action": "mozlog_test_output", "is_failure": False}},
+        )
+        message_one_expected = {
+            "_namespace": "test.Logger",
+            "_level": "INFO",
+            "_message": "Message number 1",
+        }
+        message_two_expected = {
+            "_namespace": "test.Logger",
+            "_level": "ERROR",
+            "_message": "Message number 2",
+        }
+        message_three_expected = {
+            "_namespace": "test.Logger",
+            "_level": "DEBUG",
+            "_message": "Message with some extras",
+            "action": "mozlog_test_output",
+            "is_failure": False,
+        }
+
+        message_one_actual = json.loads(self.handler.messages[0])
+        message_two_actual = json.loads(self.handler.messages[1])
+        message_three_actual = json.loads(self.handler.messages[2])
+
+        self.check_messages(message_one_expected, message_one_actual)
+        self.check_messages(message_two_expected, message_two_actual)
+        self.check_messages(message_three_expected, message_three_actual)
+
+    def message_callback(self):
+        if len(self.handler.messages) == 3:
+            message_one_expected = {
+                "_namespace": "test.Logger",
+                "_level": "DEBUG",
+                "_message": "socket message one",
+                "action": "test_message",
+            }
+            message_two_expected = {
+                "_namespace": "test.Logger",
+                "_level": "DEBUG",
+                "_message": "socket message two",
+                "action": "test_message",
+            }
+            message_three_expected = {
+                "_namespace": "test.Logger",
+                "_level": "DEBUG",
+                "_message": "socket message three",
+                "action": "test_message",
+            }
+
+            message_one_actual = json.loads(self.handler.messages[0])
+
+            message_two_actual = json.loads(self.handler.messages[1])
+
+            message_three_actual = json.loads(self.handler.messages[2])
+
+            self.check_messages(message_one_expected, message_one_actual)
+            self.check_messages(message_two_expected, message_two_actual)
+            self.check_messages(message_three_expected, message_three_actual)
+
+    def test_log_listener(self):
+        connection = "127.0.0.1", 0
+        log_server = mozlog.LogMessageServer(
+            connection, self.logger, message_callback=self.message_callback, timeout=0.5
+        )
+
+        message_string_one = json.dumps(
+            {
+                "_message": "socket message one",
+                "action": "test_message",
+                "_level": "DEBUG",
+            }
+        )
+        message_string_two = json.dumps(
+            {
+                "_message": "socket message two",
+                "action": "test_message",
+                "_level": "DEBUG",
+            }
+        )
+
+        message_string_three = json.dumps(
+            {
+                "_message": "socket message three",
+                "action": "test_message",
+                "_level": "DEBUG",
+            }
+        )
+
+        message_string = (
+            message_string_one +
+            "\n" +
+            message_string_two +
+            "\n" +
+            message_string_three +
+            "\n"
+        )
+
+        server_thread = threading.Thread(target=log_server.handle_request)
+        server_thread.start()
+
+        host, port = log_server.server_address
+
+        sock = socket.socket()
+        sock.connect((host, port))
+
+        # Sleeps prevent listener from receiving entire message in a single call
+        # to recv in order to test reconstruction of partial messages.
+        sock.sendall(message_string[:8].encode())
+        time.sleep(0.01)
+        sock.sendall(message_string[8:32].encode())
+        time.sleep(0.01)
+        sock.sendall(message_string[32:64].encode())
+        time.sleep(0.01)
+        sock.sendall(message_string[64:128].encode())
+        time.sleep(0.01)
+        sock.sendall(message_string[128:].encode())
+
+        sock.close()
+        log_server.server_close()
+        server_thread.join()
+
+
+class Loggable(mozlog.LoggingMixin):
+    """Trivial class inheriting from LoggingMixin"""
+
+    pass
+
+
+class TestLoggingMixin(unittest.TestCase):
+    """Tests basic use of LoggingMixin"""
+
+    def test_mixin(self):
+        loggable = Loggable()
+        self.assertTrue(not hasattr(loggable, "_logger"))
+        loggable.log(mozlog.INFO, "This will instantiate the logger")
+        self.assertTrue(hasattr(loggable, "_logger"))
+        self.assertEqual(loggable._logger.name, "test_logger.Loggable")
+
+        self.assertRaises(ValueError, loggable.set_logger, "not a logger")
+
+        logger = mozlog.MozLogger("test.mixin")
+        handler = ListHandler()
+        logger.addHandler(handler)
+        loggable.set_logger(logger)
+        self.assertTrue(isinstance(loggable._logger.handlers[0], ListHandler))
+        self.assertEqual(loggable._logger.name, "test.mixin")
+
+        loggable.log(mozlog.WARN, 'message for "log" method')
+        loggable.info('message for "info" method')
+        loggable.error('message for "error" method')
+        loggable.log_structured(
+            "test_message",
+            params={"_message": "message for " + '"log_structured" method'},
+        )
+
+        expected_messages = [
+            'message for "log" method',
+            'message for "info" method',
+            'message for "error" method',
+            'message for "log_structured" method',
+        ]
+
+        actual_messages = loggable._logger.handlers[0].messages
+        self.assertEqual(expected_messages, actual_messages)
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logtypes.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logtypes.py
new file mode 100644
index 00000000000..a041489cfd6
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_logtypes.py
@@ -0,0 +1,106 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+
+from mozlog.logtypes import Any, Dict, Int, List, TestList as LogTypeTestList, Tuple, Unicode
+
+
+class TestContainerTypes(unittest.TestCase):
+    def test_dict_type_basic(self):
+        d = Dict("name")
+        with self.assertRaises(ValueError):
+            d({"foo": "bar"})
+
+        d = Dict(Any, "name")
+        d({"foo": "bar"})  # doesn't raise
+
+    def test_dict_type_with_dictionary_item_type(self):
+        d = Dict({Int: Int}, "name")
+        with self.assertRaises(ValueError):
+            d({"foo": 1})
+
+        with self.assertRaises(ValueError):
+            d({1: "foo"})
+
+        d({1: 2})  # doesn't raise
+
+    def test_dict_type_with_recursive_item_types(self):
+        d = Dict(Dict({Unicode: List(Int)}), "name")
+        with self.assertRaises(ValueError):
+            d({"foo": "bar"})
+
+        with self.assertRaises(ValueError):
+            d({"foo": {"bar": "baz"}})
+
+        with self.assertRaises(ValueError):
+            d({"foo": {"bar": ["baz"]}})
+
+        d({"foo": {"bar": [1]}})  # doesn't raise
+
+    def test_list_type_basic(self):
+        lst = List("name")
+        with self.assertRaises(ValueError):
+            lst(["foo"])
+
+        lst = List(Any, "name")
+        lst(["foo", 1])  # doesn't raise
+
+    def test_list_type_with_recursive_item_types(self):
+        lst = List(Dict(List(Tuple((Unicode, Int)))), "name")
+        with self.assertRaises(ValueError):
+            lst(["foo"])
+
+        with self.assertRaises(ValueError):
+            lst([{"foo": "bar"}])
+
+        with self.assertRaises(ValueError):
+            lst([{"foo": ["bar"]}])
+
+        lst([{"foo": [("bar", 1)]}])  # doesn't raise
+
+    def test_tuple_type_basic(self):
+        t = Tuple("name")
+        with self.assertRaises(ValueError):
+            t((1,))
+
+        t = Tuple(Any, "name")
+        t((1,))  # doesn't raise
+
+    def test_tuple_type_with_tuple_item_type(self):
+        t = Tuple((Unicode, Int))
+        with self.assertRaises(ValueError):
+            t(("foo", "bar"))
+
+        t(("foo", 1))  # doesn't raise
+
+    def test_tuple_type_with_recursive_item_types(self):
+        t = Tuple((Dict(List(Any)), List(Dict(Any)), Unicode), "name")
+        with self.assertRaises(ValueError):
+            t(({"foo": "bar"}, [{"foo": "bar"}], "foo"))
+
+        with self.assertRaises(ValueError):
+            t(({"foo": ["bar"]}, ["foo"], "foo"))
+
+        t(({"foo": ["bar"]}, [{"foo": "bar"}], "foo"))  # doesn't raise
+
+
+class TestDataTypes(unittest.TestCase):
+    def test_test_list(self):
+        t = LogTypeTestList("name")
+        with self.assertRaises(ValueError):
+            t("foo")
+
+        with self.assertRaises(ValueError):
+            t({"foo": 1})
+
+        d1 = t({"default": ["bar"]})  # doesn't raise
+        d2 = t(["bar"])  # doesn't raise
+
+        self.assertEqual(d1, d2)
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_structured.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_structured.py
new file mode 100644
index 00000000000..ba991c56331
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_structured.py
@@ -0,0 +1,1160 @@
+# -*- coding: utf-8 -*-
+
+import argparse
+import contextlib
+import json
+import optparse
+import os
+import sys
+import tempfile
+import unittest
+from io import StringIO
+
+from mozlog import commandline, formatters, handlers, reader, stdadapter, structuredlog
+
+
+class LogHandler:
+    def __init__(self):
+        self.items = []
+
+    def __call__(self, data):
+        self.items.append(data)
+
+    @property
+    def last_item(self):
+        return self.items[-1]
+
+    @property
+    def empty(self):
+        return not self.items
+
+
+class BaseStructuredTest(unittest.TestCase):
+    def setUp(self):
+        self.logger = structuredlog.StructuredLogger("test")
+        self.handler = LogHandler()
+        self.logger.add_handler(self.handler)
+
+    def pop_last_item(self):
+        return self.handler.items.pop()
+
+    def assert_log_equals(self, expected, actual=None):
+        if actual is None:
+            actual = self.pop_last_item()
+
+        all_expected = {"pid": os.getpid(), "thread": "MainThread", "source": "test"}
+        specials = set(["time"])
+
+        all_expected.update(expected)
+        for key, value in all_expected.items():
+            self.assertEqual(actual[key], value)
+
+        self.assertEqual(set(all_expected.keys()) | specials, set(actual.keys()))
+
+
+class TestStatusHandler(BaseStructuredTest):
+    def setUp(self):
+        super(TestStatusHandler, self).setUp()
+        self.handler = handlers.StatusHandler()
+        self.logger.add_handler(self.handler)
+
+    def test_failure_run(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "sub1", status="PASS")
+        self.logger.test_status("test1", "sub2", status="TIMEOUT")
+        self.logger.test_status(
+            "test1", "sub3", status="FAIL", expected="PASS", known_intermittent=["FAIL"]
+        )
+        self.logger.test_end("test1", status="OK")
+        self.logger.suite_end()
+        summary = self.handler.summarize()
+        self.assertIn("TIMEOUT", summary.unexpected_statuses)
+        self.assertEqual(1, summary.unexpected_statuses["TIMEOUT"])
+        self.assertIn("PASS", summary.expected_statuses)
+        self.assertEqual(1, summary.expected_statuses["PASS"])
+        self.assertIn("OK", summary.expected_statuses)
+        self.assertEqual(1, summary.expected_statuses["OK"])
+        self.assertIn("FAIL", summary.expected_statuses)
+        self.assertEqual(1, summary.expected_statuses["FAIL"])
+        self.assertIn("FAIL", summary.known_intermittent_statuses)
+        self.assertEqual(1, summary.known_intermittent_statuses["FAIL"])
+        self.assertEqual(3, summary.action_counts["test_status"])
+        self.assertEqual(1, summary.action_counts["test_end"])
+
+    def test_precondition_failed_run(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", status="PRECONDITION_FAILED")
+        self.logger.test_start("test2")
+        self.logger.test_status("test2", "sub1", status="PRECONDITION_FAILED")
+        self.logger.test_end("test2", status="OK")
+        self.logger.suite_end()
+        summary = self.handler.summarize()
+        self.assertEqual(1, summary.expected_statuses["OK"])
+        self.assertEqual(2, summary.unexpected_statuses["PRECONDITION_FAILED"])
+
+    def test_error_run(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.error("ERRR!")
+        self.logger.test_end("test1", status="OK")
+        self.logger.test_start("test2")
+        self.logger.test_end("test2", status="OK")
+        self.logger.suite_end()
+        summary = self.handler.summarize()
+        self.assertIn("ERROR", summary.log_level_counts)
+        self.assertEqual(1, summary.log_level_counts["ERROR"])
+        self.assertIn("OK", summary.expected_statuses)
+        self.assertEqual(2, summary.expected_statuses["OK"])
+
+
+class TestSummaryHandler(BaseStructuredTest):
+    def setUp(self):
+        super(TestSummaryHandler, self).setUp()
+        self.handler = handlers.SummaryHandler()
+        self.logger.add_handler(self.handler)
+
+    def test_failure_run(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "sub1", status="PASS")
+        self.logger.test_status("test1", "sub2", status="TIMEOUT")
+        self.logger.assertion_count("test1", 5, 1, 10)
+        self.logger.assertion_count("test1", 5, 10, 15)
+        self.logger.test_end("test1", status="OK")
+        self.logger.suite_end()
+
+        counts = self.handler.current["counts"]
+        self.assertIn("timeout", counts["subtest"]["unexpected"])
+        self.assertEqual(1, counts["subtest"]["unexpected"]["timeout"])
+        self.assertIn("pass", counts["subtest"]["expected"])
+        self.assertEqual(1, counts["subtest"]["expected"]["pass"])
+        self.assertIn("ok", counts["test"]["expected"])
+        self.assertEqual(1, counts["test"]["expected"]["ok"])
+        self.assertIn("pass", counts["assert"]["unexpected"])
+        self.assertEqual(1, counts["assert"]["unexpected"]["pass"])
+        self.assertIn("fail", counts["assert"]["expected"])
+        self.assertEqual(1, counts["assert"]["expected"]["fail"])
+
+        logs = self.handler.current["unexpected_logs"]
+        self.assertEqual(1, len(logs))
+        self.assertIn("test1", logs)
+        self.assertEqual(1, len(logs["test1"]))
+        self.assertEqual("sub2", logs["test1"][0]["subtest"])
+
+    def test_precondition_failed_run(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "sub1", status="PASS")
+        self.logger.test_end("test1", status="PRECONDITION_FAILED")
+        self.logger.test_start("test2")
+        self.logger.test_status("test2", "sub1", status="PRECONDITION_FAILED")
+        self.logger.test_status("test2", "sub2", status="PRECONDITION_FAILED")
+        self.logger.test_end("test2", status="OK")
+        self.logger.suite_end()
+
+        counts = self.handler.current["counts"]
+        self.assertIn("precondition_failed", counts["test"]["unexpected"])
+        self.assertEqual(1, counts["test"]["unexpected"]["precondition_failed"])
+        self.assertIn("pass", counts["subtest"]["expected"])
+        self.assertEqual(1, counts["subtest"]["expected"]["pass"])
+        self.assertIn("ok", counts["test"]["expected"])
+        self.assertEqual(1, counts["test"]["expected"]["ok"])
+        self.assertIn("precondition_failed", counts["subtest"]["unexpected"])
+        self.assertEqual(2, counts["subtest"]["unexpected"]["precondition_failed"])
+
+
+class TestStructuredLog(BaseStructuredTest):
+    def test_suite_start(self):
+        self.logger.suite_start(["test"], "logtest")
+        self.assert_log_equals(
+            {"action": "suite_start", "name": "logtest", "tests": {"default": ["test"]}}
+        )
+        self.logger.suite_end()
+
+    def test_suite_end(self):
+        self.logger.suite_start([])
+        self.logger.suite_end()
+        self.assert_log_equals({"action": "suite_end"})
+
+    def test_add_subsuite(self):
+        self.logger.suite_start([])
+        self.logger.add_subsuite("other")
+        self.assert_log_equals(
+            {
+                "action": "add_subsuite",
+                "name": "other",
+                "run_info": {"subsuite": "other"},
+            }
+        )
+        self.logger.suite_end()
+
+    def test_add_subsuite_duplicate(self):
+        self.logger.suite_start([])
+        self.logger.add_subsuite("other")
+        # This should be a no-op
+        self.logger.add_subsuite("other")
+        self.assert_log_equals(
+            {
+                "action": "add_subsuite",
+                "name": "other",
+                "run_info": {"subsuite": "other"},
+            }
+        )
+        self.assert_log_equals({"action": "suite_start", "tests": {"default": []}})
+
+        self.logger.suite_end()
+
+    def test_start(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.assert_log_equals({"action": "test_start", "test": "test1"})
+
+        self.logger.test_start(("test1", "==", "test1-ref"), path="path/to/test")
+        self.assert_log_equals(
+            {
+                "action": "test_start",
+                "test": ("test1", "==", "test1-ref"),
+                "path": "path/to/test",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_start_inprogress(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_start("test1")
+        self.assert_log_equals(
+            {
+                "action": "log",
+                "message": "test_start for test1 logged while in progress.",
+                "level": "ERROR",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_start_inprogress_subsuite(self):
+        self.logger.suite_start([])
+        self.logger.add_subsuite("other")
+        self.logger.test_start("test1")
+        self.logger.test_start("test1", subsuite="other")
+        self.assert_log_equals(
+            {
+                "action": "test_start",
+                "test": "test1",
+                "subsuite": "other",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_status(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status(
+            "test1", "subtest name", "fail", expected="FAIL", message="Test message"
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "message": "Test message",
+                "test": "test1",
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_status_1(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "subtest name", "fail")
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "expected": "PASS",
+                "test": "test1",
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_status_2(self):
+        self.assertRaises(
+            ValueError,
+            self.logger.test_status,
+            "test1",
+            "subtest name",
+            "XXXUNKNOWNXXX",
+        )
+
+    def test_status_extra(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status(
+            "test1", "subtest name", "FAIL", expected="PASS", extra={"data": 42}
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "expected": "PASS",
+                "test": "test1",
+                "extra": {"data": 42},
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_status_stack(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status(
+            "test1",
+            "subtest name",
+            "FAIL",
+            expected="PASS",
+            stack="many\nlines\nof\nstack",
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "expected": "PASS",
+                "test": "test1",
+                "stack": "many\nlines\nof\nstack",
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_status_known_intermittent(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status(
+            "test1", "subtest name", "fail", known_intermittent=["FAIL"]
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "expected": "PASS",
+                "known_intermittent": ["FAIL"],
+                "test": "test1",
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_status_not_started(self):
+        self.logger.test_status("test_UNKNOWN", "subtest", "PASS")
+        self.assertTrue(
+            self.pop_last_item()["message"].startswith(
+                "test_status for test_UNKNOWN logged while not in progress. Logged with data: {"
+            )
+        )
+
+    def test_remove_optional_defaults(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status(
+            "test1", "subtest name", "fail", message=None, stack=None
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "subtest": "subtest name",
+                "status": "FAIL",
+                "expected": "PASS",
+                "test": "test1",
+            }
+        )
+        self.logger.test_end("test1", "OK")
+        self.logger.suite_end()
+
+    def test_remove_optional_defaults_raw_log(self):
+        self.logger.log_raw({"action": "suite_start", "tests": [1], "name": None})
+        self.assert_log_equals({"action": "suite_start", "tests": {"default": ["1"]}})
+        self.logger.suite_end()
+
+    def test_end(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", "fail", message="Test message")
+        self.assert_log_equals(
+            {
+                "action": "test_end",
+                "status": "FAIL",
+                "expected": "OK",
+                "message": "Test message",
+                "test": "test1",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_end_1(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end("test1", "PASS", expected="PASS", extra={"data": 123})
+        self.assert_log_equals(
+            {
+                "action": "test_end",
+                "status": "PASS",
+                "extra": {"data": 123},
+                "test": "test1",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_end_2(self):
+        self.assertRaises(ValueError, self.logger.test_end, "test1", "XXXUNKNOWNXXX")
+
+    def test_end_stack(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_end(
+            "test1", "PASS", expected="PASS", stack="many\nlines\nof\nstack"
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_end",
+                "status": "PASS",
+                "test": "test1",
+                "stack": "many\nlines\nof\nstack",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_end_no_start(self):
+        self.logger.test_end("test1", "PASS", expected="PASS")
+        self.assertTrue(
+            self.pop_last_item()["message"].startswith(
+                "test_end for test1 logged while not in progress. Logged with data: {"
+            )
+        )
+        self.logger.suite_end()
+
+    def test_end_no_start_subsuite(self):
+        self.logger.suite_start([])
+        self.logger.add_subsuite("other")
+        self.logger.test_start("test1", subsuite="other")
+        self.logger.test_end("test1", "PASS", expected="PASS")
+        self.assertTrue(
+            self.pop_last_item()["message"].startswith(
+                "test_end for test1 logged while not in progress. Logged with data: {"
+            )
+        )
+        self.logger.test_end("test1", "OK", subsuite="other")
+        self.assert_log_equals(
+            {
+                "action": "test_end",
+                "status": "OK",
+                "test": "test1",
+                "subsuite": "other",
+            }
+        )
+        self.logger.suite_end()
+
+    def test_end_twice(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test2")
+        self.logger.test_end("test2", "PASS", expected="PASS")
+        self.assert_log_equals(
+            {"action": "test_end", "status": "PASS", "test": "test2"}
+        )
+        self.logger.test_end("test2", "PASS", expected="PASS")
+        last_item = self.pop_last_item()
+        self.assertEqual(last_item["action"], "log")
+        self.assertEqual(last_item["level"], "ERROR")
+        self.assertTrue(
+            last_item["message"].startswith(
+                "test_end for test2 logged while not in progress. Logged with data: {"
+            )
+        )
+        self.logger.suite_end()
+
+    def test_suite_start_twice(self):
+        self.logger.suite_start([])
+        self.assert_log_equals({"action": "suite_start", "tests": {"default": []}})
+        self.logger.suite_start([])
+        last_item = self.pop_last_item()
+        self.assertEqual(last_item["action"], "log")
+        self.assertEqual(last_item["level"], "ERROR")
+        self.logger.suite_end()
+
+    def test_suite_end_no_start(self):
+        self.logger.suite_start([])
+        self.assert_log_equals({"action": "suite_start", "tests": {"default": []}})
+        self.logger.suite_end()
+        self.assert_log_equals({"action": "suite_end"})
+        self.logger.suite_end()
+        last_item = self.pop_last_item()
+        self.assertEqual(last_item["action"], "log")
+        self.assertEqual(last_item["level"], "ERROR")
+
+    def test_multiple_loggers_suite_start(self):
+        logger1 = structuredlog.StructuredLogger("test")
+        self.logger.suite_start([])
+        logger1.suite_start([])
+        last_item = self.pop_last_item()
+        self.assertEqual(last_item["action"], "log")
+        self.assertEqual(last_item["level"], "ERROR")
+
+    def test_multiple_loggers_test_start(self):
+        logger1 = structuredlog.StructuredLogger("test")
+        self.logger.suite_start([])
+        self.logger.test_start("test")
+        logger1.test_start("test")
+        last_item = self.pop_last_item()
+        self.assertEqual(last_item["action"], "log")
+        self.assertEqual(last_item["level"], "ERROR")
+
+    def test_process(self):
+        self.logger.process_output(1234, "test output")
+        self.assert_log_equals(
+            {"action": "process_output", "process": "1234", "data": "test output"}
+        )
+
+    def test_process_start(self):
+        self.logger.process_start(1234)
+        self.assert_log_equals({"action": "process_start", "process": "1234"})
+
+    def test_process_exit(self):
+        self.logger.process_exit(1234, 0)
+        self.assert_log_equals(
+            {"action": "process_exit", "process": "1234", "exitcode": 0}
+        )
+
+    def test_log(self):
+        for level in ["critical", "error", "warning", "info", "debug"]:
+            getattr(self.logger, level)("message")
+            self.assert_log_equals(
+                {"action": "log", "level": level.upper(), "message": "message"}
+            )
+
+    def test_logging_adapter(self):
+        import logging
+
+        logging.basicConfig(level="DEBUG")
+        old_level = logging.root.getEffectiveLevel()
+        logging.root.setLevel("DEBUG")
+
+        std_logger = logging.getLogger("test")
+        std_logger.setLevel("DEBUG")
+
+        logger = stdadapter.std_logging_adapter(std_logger)
+
+        try:
+            for level in ["critical", "error", "warning", "info", "debug"]:
+                getattr(logger, level)("message")
+                self.assert_log_equals(
+                    {"action": "log", "level": level.upper(), "message": "message"}
+                )
+        finally:
+            logging.root.setLevel(old_level)
+
+    def test_add_remove_handlers(self):
+        handler = LogHandler()
+        self.logger.add_handler(handler)
+        self.logger.info("test1")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "test1"})
+
+        self.assert_log_equals(
+            {"action": "log", "level": "INFO", "message": "test1"},
+            actual=handler.last_item,
+        )
+
+        self.logger.remove_handler(handler)
+        self.logger.info("test2")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "test2"})
+
+        self.assert_log_equals(
+            {"action": "log", "level": "INFO", "message": "test1"},
+            actual=handler.last_item,
+        )
+
+    def test_wrapper(self):
+        file_like = structuredlog.StructuredLogFileLike(self.logger)
+
+        file_like.write("line 1")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "line 1"})
+
+        file_like.write("line 2\n")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "line 2"})
+
+        file_like.write("line 3\r")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "line 3"})
+
+        file_like.write("line 4\r\n")
+
+        self.assert_log_equals({"action": "log", "level": "INFO", "message": "line 4"})
+
+    def test_shutdown(self):
+        # explicit shutdown
+        log = structuredlog.StructuredLogger("test 1")
+        log.add_handler(self.handler)
+        log.info("line 1")
+        self.assert_log_equals(
+            {"action": "log", "level": "INFO", "message": "line 1", "source": "test 1"}
+        )
+        log.shutdown()
+        self.assert_log_equals({"action": "shutdown", "source": "test 1"})
+        with self.assertRaises(structuredlog.LoggerShutdownError):
+            log.info("bad log")
+        with self.assertRaises(structuredlog.LoggerShutdownError):
+            log.log_raw({"action": "log", "level": "info", "message": "bad log"})
+
+        # shutdown still applies to new instances
+        del log
+        log = structuredlog.StructuredLogger("test 1")
+        with self.assertRaises(structuredlog.LoggerShutdownError):
+            log.info("bad log")
+
+        # context manager shutdown
+        with structuredlog.StructuredLogger("test 2") as log:
+            log.add_handler(self.handler)
+            log.info("line 2")
+            self.assert_log_equals(
+                {
+                    "action": "log",
+                    "level": "INFO",
+                    "message": "line 2",
+                    "source": "test 2",
+                }
+            )
+        self.assert_log_equals({"action": "shutdown", "source": "test 2"})
+
+        # shutdown prevents logging across instances
+        log1 = structuredlog.StructuredLogger("test 3")
+        log2 = structuredlog.StructuredLogger("test 3", component="bar")
+        log1.shutdown()
+        with self.assertRaises(structuredlog.LoggerShutdownError):
+            log2.info("line 3")
+
+
+class TestTypeConversions(BaseStructuredTest):
+    def test_raw(self):
+        self.logger.log_raw({"action": "suite_start", "tests": [1], "time": "1234"})
+        self.assert_log_equals(
+            {"action": "suite_start", "tests": {"default": ["1"]}, "time": 1234}
+        )
+        self.logger.suite_end()
+
+    def test_tuple(self):
+        self.logger.suite_start([])
+        self.logger.test_start(
+            (
+                b"\xf0\x90\x8d\x84\xf0\x90\x8c\xb4\xf0\x90"
+                b"\x8d\x83\xf0\x90\x8d\x84".decode(),
+                42,
+                u"\u16a4",
+            )
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_start",
+                "test": (u"\U00010344\U00010334\U00010343\U00010344", u"42", u"\u16a4"),
+            }
+        )
+        self.logger.suite_end()
+
+    def test_non_string_messages(self):
+        self.logger.suite_start([])
+        self.logger.info(1)
+        self.assert_log_equals({"action": "log", "message": "1", "level": "INFO"})
+        self.logger.info([1, (2, "3"), "s", "s" + chr(255)])
+        self.assert_log_equals(
+            {
+                "action": "log",
+                "message": "[1, (2, '3'), 's', 's\xff']",
+                "level": "INFO",
+            }
+        )
+
+        self.logger.suite_end()
+
+    def test_utf8str_write(self):
+        with tempfile.NamedTemporaryFile() as logfile:
+            _fmt = formatters.TbplFormatter()
+            _handler = handlers.StreamHandler(logfile, _fmt)
+            self.logger.add_handler(_handler)
+            self.logger.suite_start([])
+            self.logger.info("☺")
+            logfile.seek(0)
+            data = logfile.readlines()[-1].strip()
+            self.assertEqual(data.decode(), "☺")
+            self.logger.suite_end()
+            self.logger.remove_handler(_handler)
+
+    def test_arguments(self):
+        self.logger.info(message="test")
+        self.assert_log_equals({"action": "log", "message": "test", "level": "INFO"})
+
+        self.logger.suite_start([], run_info={})
+        self.assert_log_equals(
+            {"action": "suite_start", "tests": {"default": []}, "run_info": {}}
+        )
+        self.logger.test_start(test="test1")
+        self.logger.test_status("subtest1", "FAIL", test="test1", status="PASS")
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "subtest": "subtest1",
+                "status": "PASS",
+                "expected": "FAIL",
+            }
+        )
+        self.logger.process_output(123, "data", "test")
+        self.assert_log_equals(
+            {
+                "action": "process_output",
+                "process": "123",
+                "command": "test",
+                "data": "data",
+            }
+        )
+        self.assertRaises(
+            TypeError,
+            self.logger.test_status,
+            subtest="subtest2",
+            status="FAIL",
+            expected="PASS",
+        )
+        self.assertRaises(
+            TypeError,
+            self.logger.test_status,
+            "test1",
+            "subtest1",
+            "PASS",
+            "FAIL",
+            "message",
+            "stack",
+            {},
+            [],
+            None,
+            "unexpected",
+        )
+        self.assertRaises(TypeError, self.logger.test_status, "test1", test="test2")
+        self.logger.suite_end()
+
+
+class TestComponentFilter(BaseStructuredTest):
+    def test_filter_component(self):
+        component_logger = structuredlog.StructuredLogger(
+            self.logger.name, "test_component"
+        )
+        component_logger.component_filter = handlers.LogLevelFilter(lambda x: x, "info")
+
+        self.logger.debug("Test")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log", "level": "DEBUG", "message": "Test"})
+        self.assertTrue(self.handler.empty)
+
+        component_logger.info("Test 1")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals(
+            {
+                "action": "log",
+                "level": "INFO",
+                "message": "Test 1",
+                "component": "test_component",
+            }
+        )
+
+        component_logger.debug("Test 2")
+        self.assertTrue(self.handler.empty)
+
+        component_logger.component_filter = None
+
+        component_logger.debug("Test 3")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals(
+            {
+                "action": "log",
+                "level": "DEBUG",
+                "message": "Test 3",
+                "component": "test_component",
+            }
+        )
+
+    def test_filter_default_component(self):
+        component_logger = structuredlog.StructuredLogger(
+            self.logger.name, "test_component"
+        )
+
+        self.logger.debug("Test")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log", "level": "DEBUG", "message": "Test"})
+
+        self.logger.component_filter = handlers.LogLevelFilter(lambda x: x, "info")
+
+        self.logger.debug("Test 1")
+        self.assertTrue(self.handler.empty)
+
+        component_logger.debug("Test 2")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals(
+            {
+                "action": "log",
+                "level": "DEBUG",
+                "message": "Test 2",
+                "component": "test_component",
+            }
+        )
+
+        self.logger.component_filter = None
+
+        self.logger.debug("Test 3")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log", "level": "DEBUG", "message": "Test 3"})
+
+    def test_filter_message_mutuate(self):
+        def filter_mutate(msg):
+            if msg["action"] == "log":
+                msg["message"] = "FILTERED! %s" % msg["message"]
+            return msg
+
+        self.logger.component_filter = filter_mutate
+        self.logger.debug("Test")
+        self.assert_log_equals(
+            {"action": "log", "level": "DEBUG", "message": "FILTERED! Test"}
+        )
+        self.logger.component_filter = None
+
+
+class TestCommandline(unittest.TestCase):
+    @contextlib.contextmanager
+    def get_logfile(self):
+        temp_file = tempfile.NamedTemporaryFile(delete=False)
+        temp_file.close()
+        try:
+            yield temp_file
+        finally:
+            # This will fail on Windows, because file is not closed
+            # in StreamHandler.
+            os.unlink(temp_file.name)
+
+    def loglines(self, logfile):
+        close = False
+        if logfile.closed:
+            close = True
+            logfile = open(logfile.name, "rb")
+        try:
+            logfile.seek(0)
+            return [line.rstrip() for line in logfile.readlines()]
+        finally:
+            if close:
+                logfile.close()
+
+    def test_setup_logging(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser)
+        args = parser.parse_args(["--log-raw=-"])
+        logger = commandline.setup_logging("test_setup_logging", args, {})
+        self.assertEqual(len(logger.handlers), 1)
+
+    def test_setup_logging_optparse(self):
+        parser = optparse.OptionParser()
+        commandline.add_logging_group(parser)
+        args, _ = parser.parse_args(["--log-raw=-"])
+        logger = commandline.setup_logging("test_optparse", args, {})
+        self.assertEqual(len(logger.handlers), 1)
+        self.assertIsInstance(logger.handlers[0], handlers.StreamHandler)
+
+    def test_limit_formatters(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser, include_formatters=["raw"])
+        other_formatters = [fmt for fmt in commandline.log_formatters if fmt != "raw"]
+        # check that every formatter except raw is not present
+        for fmt in other_formatters:
+            with self.assertRaises(SystemExit):
+                parser.parse_args(["--log-%s=-" % fmt])
+            with self.assertRaises(SystemExit):
+                parser.parse_args(["--log-%s-level=error" % fmt])
+        # raw is still ok
+        args = parser.parse_args(["--log-raw=-"])
+        logger = commandline.setup_logging("test_setup_logging2", args, {})
+        self.assertEqual(len(logger.handlers), 1)
+
+    def test_setup_logging_optparse_unicode(self):
+        parser = optparse.OptionParser()
+        commandline.add_logging_group(parser)
+        args, _ = parser.parse_args([u"--log-raw=-"])
+        logger = commandline.setup_logging("test_optparse_unicode", args, {})
+        self.assertEqual(len(logger.handlers), 1)
+        self.assertEqual(logger.handlers[0].stream, sys.stdout)
+        self.assertIsInstance(logger.handlers[0], handlers.StreamHandler)
+
+    @unittest.skip("Failed on Windows")
+    def test_logging_defaultlevel(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser)
+
+        with self.get_logfile() as logfile:
+            args = parser.parse_args(["--log-tbpl=%s" % logfile.name])
+            logger = commandline.setup_logging("test_logging_defaultlevel", args, {})
+            logger.info("INFO message")
+            logger.debug("DEBUG message")
+            logger.error("ERROR message")
+            # The debug level is not logged by default.
+            self.assertEqual([b"INFO message", b"ERROR message"], self.loglines(logfile))
+
+    @unittest.skip("Failed on Windows")
+    def test_logging_errorlevel(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser)
+        with self.get_logfile() as logfile:
+            args = parser.parse_args(
+                ["--log-tbpl=%s" % logfile.name, "--log-tbpl-level=error"]
+            )
+            logger = commandline.setup_logging("test_logging_errorlevel", args, {})
+            logger.info("INFO message")
+            logger.debug("DEBUG message")
+            logger.error("ERROR message")
+
+            # Only the error level and above were requested.
+            self.assertEqual([b"ERROR message"], self.loglines(logfile))
+
+    @unittest.skip("Failed on Windows")
+    def test_logging_debuglevel(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser)
+        with self.get_logfile() as logfile:
+            args = parser.parse_args(
+                ["--log-tbpl=%s" % logfile.name, "--log-tbpl-level=debug"]
+            )
+            logger = commandline.setup_logging("test_logging_debuglevel", args, {})
+            logger.info("INFO message")
+            logger.debug("DEBUG message")
+            logger.error("ERROR message")
+            # Requesting a lower log level than default works as expected.
+            self.assertEqual(
+                [b"INFO message", b"DEBUG message", b"ERROR message"], self.loglines(logfile)
+            )
+
+    def test_unused_options(self):
+        parser = argparse.ArgumentParser()
+        commandline.add_logging_group(parser)
+        args = parser.parse_args(["--log-tbpl-level=error"])
+        self.assertRaises(
+            ValueError, commandline.setup_logging, "test_unused_options", args, {}
+        )
+
+
+class TestBuffer(BaseStructuredTest):
+    def assert_log_equals(self, expected, actual=None):
+        if actual is None:
+            actual = self.pop_last_item()
+
+        all_expected = {
+            "pid": os.getpid(),
+            "thread": "MainThread",
+            "source": "testBuffer",
+        }
+        specials = set(["time"])
+
+        all_expected.update(expected)
+        for key, value in all_expected.items():
+            self.assertEqual(actual[key], value)
+
+        self.assertEqual(set(all_expected.keys()) | specials, set(actual.keys()))
+
+    def setUp(self):
+        self.logger = structuredlog.StructuredLogger("testBuffer")
+        self.handler = handlers.BufferHandler(LogHandler(), message_limit=4)
+        self.logger.add_handler(self.handler)
+
+    def tearDown(self):
+        self.logger.remove_handler(self.handler)
+
+    def pop_last_item(self):
+        return self.handler.inner.items.pop()
+
+    def test_buffer_messages(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.send_message("buffer", "off")
+        self.logger.test_status("test1", "sub1", status="PASS")
+        # Even for buffered actions, the buffer does not interfere if
+        # buffering is turned off.
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "status": "PASS",
+                "subtest": "sub1",
+            }
+        )
+        self.logger.send_message("buffer", "on")
+        self.logger.test_status("test1", "sub2", status="PASS")
+        self.logger.test_status("test1", "sub3", status="PASS")
+        self.logger.test_status("test1", "sub4", status="PASS")
+        self.logger.test_status("test1", "sub5", status="PASS")
+        self.logger.test_status("test1", "sub6", status="PASS")
+        self.logger.test_status("test1", "sub7", status="PASS")
+        self.logger.test_end("test1", status="OK")
+        self.logger.send_message("buffer", "clear")
+        self.assert_log_equals({"action": "test_end", "test": "test1", "status": "OK"})
+        self.logger.suite_end()
+
+    def test_buffer_size(self):
+        self.logger.suite_start([])
+        self.logger.test_start("test1")
+        self.logger.test_status("test1", "sub1", status="PASS")
+        self.logger.test_status("test1", "sub2", status="PASS")
+        self.logger.test_status("test1", "sub3", status="PASS")
+        self.logger.test_status("test1", "sub4", status="PASS")
+        self.logger.test_status("test1", "sub5", status="PASS")
+        self.logger.test_status("test1", "sub6", status="PASS")
+        self.logger.test_status("test1", "sub7", status="PASS")
+
+        # No test status messages made it to the underlying handler.
+        self.assert_log_equals({"action": "test_start", "test": "test1"})
+
+        # The buffer's actual size never grows beyond the specified limit.
+        self.assertEqual(len(self.handler._buffer), 4)
+
+        self.logger.test_status("test1", "sub8", status="FAIL")
+        # The number of messages deleted comes back in a list.
+        self.assertEqual([4], self.logger.send_message("buffer", "flush"))
+
+        # When the buffer is dumped, the failure is the last thing logged
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "subtest": "sub8",
+                "status": "FAIL",
+                "expected": "PASS",
+            }
+        )
+        # Three additional messages should have been retained for context
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "status": "PASS",
+                "subtest": "sub7",
+            }
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "status": "PASS",
+                "subtest": "sub6",
+            }
+        )
+        self.assert_log_equals(
+            {
+                "action": "test_status",
+                "test": "test1",
+                "status": "PASS",
+                "subtest": "sub5",
+            }
+        )
+        self.assert_log_equals({"action": "suite_start", "tests": {"default": []}})
+
+
+class TestReader(unittest.TestCase):
+    def to_file_like(self, obj):
+        data_str = "\n".join(json.dumps(item) for item in obj)
+        return StringIO(data_str)
+
+    def test_read(self):
+        data = [
+            {"action": "action_0", "data": "data_0"},
+            {"action": "action_1", "data": "data_1"},
+        ]
+
+        f = self.to_file_like(data)
+        self.assertEqual(data, list(reader.read(f)))
+
+    def test_imap_log(self):
+        data = [
+            {"action": "action_0", "data": "data_0"},
+            {"action": "action_1", "data": "data_1"},
+        ]
+
+        f = self.to_file_like(data)
+
+        def f_action_0(item):
+            return ("action_0", item["data"])
+
+        def f_action_1(item):
+            return ("action_1", item["data"])
+
+        res_iter = reader.imap_log(
+            reader.read(f), {"action_0": f_action_0, "action_1": f_action_1}
+        )
+        self.assertEqual(
+            [("action_0", "data_0"), ("action_1", "data_1")], list(res_iter)
+        )
+
+    def test_each_log(self):
+        data = [
+            {"action": "action_0", "data": "data_0"},
+            {"action": "action_1", "data": "data_1"},
+        ]
+
+        f = self.to_file_like(data)
+
+        count = {"action_0": 0, "action_1": 0}
+
+        def f_action_0(item):
+            count[item["action"]] += 1
+
+        def f_action_1(item):
+            count[item["action"]] += 2
+
+        reader.each_log(
+            reader.read(f), {"action_0": f_action_0, "action_1": f_action_1}
+        )
+
+        self.assertEqual({"action_0": 1, "action_1": 2}, count)
+
+    def test_handler(self):
+        data = [
+            {"action": "action_0", "data": "data_0"},
+            {"action": "action_1", "data": "data_1"},
+        ]
+
+        f = self.to_file_like(data)
+
+        test = self
+
+        class ReaderHandler(reader.LogHandler):
+            def __init__(self):
+                self.action_0_count = 0
+                self.action_1_count = 0
+
+            def action_0(self, item):
+                test.assertEqual(item["action"], "action_0")
+                self.action_0_count += 1
+
+            def action_1(self, item):
+                test.assertEqual(item["action"], "action_1")
+                self.action_1_count += 1
+
+        handler = ReaderHandler()
+        reader.handle_log(reader.read(f), handler)
+
+        self.assertEqual(handler.action_0_count, 1)
+        self.assertEqual(handler.action_1_count, 1)
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_terminal_colors.py b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_terminal_colors.py
new file mode 100644
index 00000000000..8294c9e743d
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party_modified/mozlog/tests/test_terminal_colors.py
@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import sys
+from io import StringIO
+
+import pytest
+from mozterm import Terminal
+
+
+@pytest.fixture
+def terminal():
+    blessed = pytest.importorskip("blessed")
+
+    kind = "xterm-256color"
+    try:
+        term = Terminal(stream=StringIO(), force_styling=True, kind=kind)
+    except blessed.curses.error:
+        pytest.skip("terminal '{}' not found".format(kind))
+
+    return term
+
+
+EXPECTED_DICT = {
+    "log_test_status_fail": "\x1b[31mlog_test_status_fail\x1b(B\x1b[m",
+    "log_process_output": "\x1b[34mlog_process_output\x1b(B\x1b[m",
+    "log_test_status_pass": "\x1b[32mlog_test_status_pass\x1b(B\x1b[m",
+    "log_test_status_unexpected_fail": "\x1b[31mlog_test_status_unexpected_fail\x1b(B\x1b[m",
+    "log_test_status_known_intermittent": "\x1b[33mlog_test_status_known_intermittent\x1b(B\x1b[m",
+    "time": "\x1b[36mtime\x1b(B\x1b[m",
+    "action": "\x1b[33maction\x1b(B\x1b[m",
+    "pid": "\x1b[36mpid\x1b(B\x1b[m",
+    "heading": "\x1b[1m\x1b[33mheading\x1b(B\x1b[m",
+    "sub_heading": "\x1b[33msub_heading\x1b(B\x1b[m",
+    "error": "\x1b[31merror\x1b(B\x1b[m",
+    "warning": "\x1b[33mwarning\x1b(B\x1b[m",
+    "bold": "\x1b[1mbold\x1b(B\x1b[m",
+    "grey": "\x1b[38;2;190;190;190mgrey\x1b(B\x1b[m",
+    "normal": "\x1b[90mnormal\x1b(B\x1b[m",
+    "bright_black": "\x1b[90mbright_black\x1b(B\x1b[m",
+}
+
+
+@pytest.mark.skipif(
+    not sys.platform.startswith("win"),
+    reason="Only do ANSI Escape Sequence comparisons on Windows.",
+)
+def test_terminal_colors(terminal):
+    from mozlog.formatters.machformatter import TerminalColors, color_dict
+
+    actual_dict = TerminalColors(terminal, color_dict)
+
+    for key in color_dict:
+        assert getattr(actual_dict, key)(key) == EXPECTED_DICT[key]
+
+
+if __name__ == "__main__":
+    import mozunit
+    mozunit.main()
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
index d8185d8e660..a9637c9cfa4 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
@@ -93,6 +93,7 @@ class BidiSession:
         self.browser = modules.Browser(self)
         self.browsing_context = modules.BrowsingContext(self)
         self.input = modules.Input(self)
+        self.network = modules.Network(self)
         self.script = modules.Script(self)
         self.session = modules.Session(self)
 
@@ -178,32 +179,31 @@ class BidiSession:
 
     async def on_message(self, data: Mapping[str, Any]) -> None:
         """Handle a message from the remote server"""
-        if "id" in data:
+        if data["type"] in ["error", "success"]:
             # This is a command response or error
             future = self.pending_commands.get(data["id"])
             if future is None:
                 raise ValueError(f"No pending command with id {data['id']}")
-            if "result" in data:
+            if data["type"] == "success":
+                assert isinstance(data["result"], dict)
                 future.set_result(data["result"])
-            elif "error" in data and "message" in data:
+            else:
                 assert isinstance(data["error"], str)
                 assert isinstance(data["message"], str)
                 exception = from_error_details(data["error"],
                                                data["message"],
                                                data.get("stacktrace"))
                 future.set_exception(exception)
-            else:
-                raise ValueError(f"Unexpected message: {data!r}")
-        elif "method" in data and "params" in data:
+        elif data["type"] == "event":
             # This is an event
-            method = data["method"]
-            params = data["params"]
+            assert isinstance(data["method"], str)
+            assert isinstance(data["params"], dict)
 
-            listeners = self.event_listeners.get(method, [])
+            listeners = self.event_listeners.get(data["method"], [])
             if not listeners:
                 listeners = self.event_listeners.get(None, [])
             for listener in listeners:
-                await listener(method, params)
+                await listener(data["method"], data["params"])
         else:
             raise ValueError(f"Unexpected message: {data!r}")
 
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py
index 4a9b4ba9db9..d3e318d1705 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py
@@ -43,6 +43,10 @@ class MoveTargetOutOfBoundsException(BidiException):
     error_code = "move target out of bounds"
 
 
+class NoSuchAlertException(BidiException):
+    error_code = "no such alert"
+
+
 class NoSuchElementException(BidiException):
     error_code = "no such element"
 
@@ -51,6 +55,10 @@ class NoSuchFrameException(BidiException):
     error_code = "no such frame"
 
 
+class NoSuchInterceptException(BidiException):
+    error_code = "no such intercept"
+
+
 class NoSuchHandleException(BidiException):
     error_code = "no such handle"
 
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
index da5c14c4bf3..acbe117902e 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
@@ -3,5 +3,6 @@
 from .browser import Browser
 from .browsing_context import BrowsingContext
 from .input import Input
+from .network import Network
 from .script import Script
 from .session import Session
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
index 8aca3e6f67f..35ad93e191a 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
@@ -98,6 +98,19 @@ class BrowsingContext(BidiModule):
 
         return result["contexts"]
 
+    @command
+    def handle_user_prompt(self,
+                           context: str,
+                           accept: Optional[bool] = None,
+                           user_text: Optional[str] = None) -> Mapping[str, Any]:
+        params: MutableMapping[str, Any] = {"context": context}
+
+        if accept is not None:
+            params["accept"] = accept
+        if user_text is not None:
+            params["userText"] = user_text
+        return params
+
     @command
     def navigate(self,
                  context: str,
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/network.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/network.py
new file mode 100644
index 00000000000..940aa7cffdd
--- /dev/null
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/network.py
@@ -0,0 +1,63 @@
+from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Union
+
+from ._module import BidiModule, command
+
+
+class URLPatternPattern(Dict[str, Any]):
+    def __init__(
+        self,
+        protocol: Optional[str] = None,
+        hostname: Optional[str] = None,
+        port: Optional[str] = None,
+        pathname: Optional[str] = None,
+        search: Optional[str] = None,
+    ):
+        dict.__init__(self, type="pattern")
+
+        if protocol is not None:
+            self["protocol"] = protocol
+
+        if hostname is not None:
+            self["hostname"] = hostname
+
+        if port is not None:
+            self["port"] = port
+
+        if pathname is not None:
+            self["pathname"] = pathname
+
+        if search is not None:
+            self["search"] = search
+
+
+class URLPatternString(Dict[str, Any]):
+    def __init__(self, pattern: str):
+        dict.__init__(self, type="string", pattern=pattern)
+
+
+URLPattern = Union[URLPatternPattern, URLPatternString]
+
+
+class Network(BidiModule):
+    @command
+    def add_intercept(
+        self, phases: List[str], url_patterns: Optional[List[URLPattern]] = None
+    ) -> Mapping[str, Any]:
+        params: MutableMapping[str, Any] = {
+            "phases": phases,
+        }
+
+        if url_patterns is not None:
+            params["urlPatterns"] = url_patterns
+
+        return params
+
+    @add_intercept.result
+    def _add_intercept(self, result: Mapping[str, Any]) -> Any:
+        assert result["intercept"] is not None
+        return result["intercept"]
+
+    @command
+    def remove_intercept(self, intercept: str) -> Mapping[str, Any]:
+        params: MutableMapping[str, Any] = {"intercept": intercept}
+        return params
diff --git a/tests/wpt/tests/tools/wpt/browser.py b/tests/wpt/tests/tools/wpt/browser.py
index 5e8bfdab160..a8c0d169587 100644
--- a/tests/wpt/tests/tools/wpt/browser.py
+++ b/tests/wpt/tests/tools/wpt/browser.py
@@ -28,6 +28,11 @@ from .wpt import venv_dir
 
 uname = platform.uname()
 
+# The root URL for Chrome for Testing API endpoints.
+CHROME_FOR_TESTING_ROOT_URL = "https://googlechromelabs.github.io/chrome-for-testing/"
+# File name containing a matching ChromeDriver download URL for a specific Chrome download.
+CHROMEDRIVER_SAVED_DOWNLOAD_FILE = "matching_chromedriver_url.txt"
+
 # the rootUrl for the firefox-ci deployment of Taskcluster
 FIREFOX_CI_ROOT_URL = 'https://firefox-ci-tc.services.mozilla.com'
 
@@ -926,6 +931,11 @@ class Chromium(ChromeChromiumBase):
         return False
 
 
+class DownloadNotFoundError(Exception):
+    """Raised when a download is not found for browser/webdriver installation."""
+    pass
+
+
 class Chrome(ChromeChromiumBase):
     """Chrome-specific interface.
 
@@ -939,44 +949,252 @@ class Chrome(ChromeChromiumBase):
     product = "chrome"
 
     @property
-    def _chromedriver_api_platform_string(self):
-        """chromedriver.storage.googleapis.com has a different filename for M1 binary,
-        while the snapshot URL has a different directory but the same filename."""
-        if self.platform == "Mac" and uname.machine == "arm64":
-            return "mac_arm64"
-        return self._chromedriver_platform_string
+    def _chrome_platform_string(self):
+        """A string that represents the platform-based suffix
+        of the Chrome for Testing downloads.
+        """
+        if self.platform in ("Linux", "Win"):
+            bits = "64" if uname.machine == "x86_64" else "32"
+        elif self.platform == "Mac":
+            bits = "-arm64" if uname.machine == "arm64" else "-x64"
+        else:
+            bits = ""
+        return f"{self.platform.lower()}{bits}"
 
-    def _get_webdriver_url(self, version, revision=None):
-        """Get a ChromeDriver API URL to download a version of ChromeDriver that matches
-        the browser binary version. Version selection is described here:
-        https://chromedriver.chromium.org/downloads/version-selection"""
-        filename = f"chromedriver_{self._chromedriver_api_platform_string}.zip"
+    @property
+    def _chrome_package_name(self):
+        return f"chrome-{self._chrome_platform_string}"
 
-        version = self._remove_version_suffix(version)
+    def _get_build_version(self, version):
+        """Convert a Chrome/ChromeDriver version into MAJOR.MINOR.BUILD format."""
+        version_parts = version.split(".")
+        if len(version_parts) < 3:
+            self.logger.info(f"Version {version} could not be formatted for build matching.")
+            return None
+        return ".".join(version_parts[0:3])
 
-        parts = version.split(".")
-        assert len(parts) == 4
+    def _get_webdriver_url(self, version, channel):
+        """Get a ChromeDriver URL to download a version of ChromeDriver that matches
+        the browser binary version.
+
+        Raises: ValueError if the given version string could not be formatted.
+
+        Returns: A ChromeDriver download URL that matches the given Chrome version.
+        """
+        # Remove version suffix if it exists.
+        if version:
+            version = self._remove_version_suffix(version)
+
+        formatted_version = self._get_build_version(version)
+        if formatted_version is None:
+            raise ValueError(f"Unknown version format: {version}")
+        major_version = version.split(".")[0]
+
+        # Chrome for Testing only has ChromeDriver downloads available for Chrome 115+.
+        # If we are matching an older version of Chrome, use the old ChromeDriver source.
+        if int(major_version) < 115:
+            return self._get_old_webdriver_url(formatted_version)
+
+        # Check if a file exists containing the matching ChromeDriver version download URL.
+        # This is generated when installing Chrome for Testing using the install command.
+        download_url_reference_file = os.path.join(
+            self._get_browser_binary_dir(None, channel), CHROMEDRIVER_SAVED_DOWNLOAD_FILE)
+        if os.path.isfile(download_url_reference_file):
+            self.logger.info("Download info for matching ChromeDriver version found.")
+            with open(download_url_reference_file, "r") as f:
+                return f.read()
+
+        # If no ChromeDriver download URL reference file exists,
+        # try to find a download URL based on the build version.
+        self.logger.info(f"Searching for ChromeDriver downloads for version {version}.")
+        return self._get_webdriver_url_by_build(formatted_version)
+
+    def _get_old_webdriver_url(self, version):
+        """Find a ChromeDriver download URL for Chrome version <= 114
+
+        Raises: DownloadNotFoundError if no ChromeDriver download URL is found
+                to match the given Chrome binary.
+
+        Returns: A ChromeDriver download URL that matches the given Chrome version.
+        """
         latest_url = ("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_"
-                      f"{'.'.join(parts[:-1])}")
+                      f"{version}")
         try:
             latest = get(latest_url).text.strip()
-        except requests.RequestException:
-            latest_url = f"https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{parts[0]}"
-            try:
-                latest = get(latest_url).text.strip()
-            except requests.RequestException:
-                # We currently use the latest Chromium revision to get a compatible Chromedriver
-                # version for Chrome Dev, since it is not available through the ChromeDriver API.
-                # If we've gotten to this point, it is assumed that this is Chrome Dev.
-                filename = f"chromedriver_{self._chromedriver_platform_string}.zip"
-                revision = self._get_chromium_revision(filename, version)
-                return self._build_snapshots_url(revision, filename)
+        except requests.RequestException as e:
+            raise DownloadNotFoundError("No matching ChromeDriver download"
+                                        f" found for version {version}.", e)
+
+        filename = f"chromedriver_{self._chromedriver_platform_string}.zip"
         return f"https://chromedriver.storage.googleapis.com/{latest}/{filename}"
 
-    def download(self, dest=None, channel=None, rename=None):
-        raise NotImplementedError("Downloading of Chrome browser binary not implemented.")
+    def _get_webdriver_url_by_build(self, version):
+        """Find a ChromeDriver download URL based on a MAJOR.MINOR.BUILD version.
+
+        Raises: RequestException if a bad responses is received from
+                Chrome for Testing sources.
+
+        Returns: Download URL string or None if no matching build is found.
+        """
+        try:
+            # Get a list of builds with download URLs from Chrome for Testing.
+            resp = get(f"{CHROME_FOR_TESTING_ROOT_URL}"
+                       "latest-patch-versions-per-build-with-downloads.json")
+        except requests.RequestException as e:
+            raise requests.RequestException(
+                "Chrome for Testing versions not found", e)
+        builds_json = resp.json()
+        builds_dict = builds_json["builds"]
+        if version not in builds_dict:
+            self.logger.info(f"No builds found for version {version}.")
+            return None
+        download_info = builds_dict[version]["downloads"]
+        if "chromedriver" not in download_info:
+            self.logger.info(f"No ChromeDriver download found for build {version}")
+            return None
+        downloads_for_platform = [d for d in download_info["chromedriver"]
+                                  if d["platform"] == self._chrome_platform_string]
+        if len(downloads_for_platform) == 0:
+            self.logger.info(f"No ChromeDriver download found for build {version}"
+                             f"of platform {self.platform}")
+            return None
+        return downloads_for_platform[0]["url"]
+
+    def _get_download_urls_by_version(self, version):
+        """Find Chrome for Testing and ChromeDriver download URLs matching a specific version.
+
+        Raises: DownloadNotFoundError if no download is found for the given version or platform.
+                RequestException if a bad responses is received from
+                Chrome for Testing sources.
+
+        Returns: Both binary downloads for Chrome and ChromeDriver.
+        """
+        try:
+            # Get a list of versions with download URLs from Chrome for Testing.
+            resp = get(f"{CHROME_FOR_TESTING_ROOT_URL}"
+                       "known-good-versions-with-downloads.json")
+        except requests.RequestException as e:
+            raise requests.RequestException(
+                "Chrome for Testing versions not found", e)
+        versions_json = resp.json()
+        versions_list = versions_json["versions"]
+        # Attempt to find a version match in the list of available downloads.
+        matching_versions = [v for v in versions_list if v["version"] == version]
+        if len(matching_versions) == 0:
+            raise DownloadNotFoundError(f"No Chrome for Testing download found for {version}")
+
+        download_info = matching_versions[0]["downloads"]
+        # Find the download url that matches the current platform.
+        browser_download_urls = [d for d in download_info["chrome"]
+                                 if d["platform"] == self._chrome_platform_string]
+        if len(browser_download_urls) == 0:
+            raise DownloadNotFoundError(
+                f"No Chrome for Testing download found for {self.platform} of version {version}")
+        browser_download_url = browser_download_urls[0]["url"]
+
+        # Get the corresponding ChromeDriver download URL for later use.
+        chromedriver_download_urls = [d for d in download_info["chromedriver"]
+                                      if d["platform"] == self._chrome_platform_string]
+        if len(chromedriver_download_urls) == 0:
+            # Some older versions of Chrome for Testing
+            # do not have a matching ChromeDriver download.
+            raise DownloadNotFoundError(
+                f"ChromeDriver download does not exist for version {version}")
+        chromedriver_url = chromedriver_download_urls[0]["url"]
+
+        return browser_download_url, chromedriver_url
+
+    def _get_download_urls_by_channel(self, channel):
+        """Find Chrome for Testing and ChromeDriver download URLs matching the given channel.
+
+        Raises: DownloadNotFoundError if no download is found for the given channel or platform.
+                RequestException if a bad responses is received from Chrome for Testing sources.
+
+        Returns: Both binary downloads for Chrome and ChromeDriver.
+        """
+        try:
+            resp = get(f"{CHROME_FOR_TESTING_ROOT_URL}"
+                       "last-known-good-versions-with-downloads.json")
+        except requests.RequestException as e:
+            raise requests.RequestException(
+                "Chrome for Testing versions not found", e)
+        channels_json = resp.json()
+        download_info = channels_json["channels"][channel.capitalize()]["downloads"]["chrome"]
+
+        # Find the download URL that matches the current platform.
+        matching_download_urls = [d for d in download_info
+                                  if d["platform"] == self._chrome_platform_string]
+        if len(matching_download_urls) == 0:
+            raise DownloadNotFoundError("No matching download for platform "
+                                        f"{self.platform} of channel \"{channel}\".")
+
+        browser_download_url = matching_download_urls[0]["url"]
+
+        # Get the corresponding ChromeDriver download URL for later use.
+        chromedriver_download_info = (
+            channels_json["channels"][channel.capitalize()]["downloads"]["chromedriver"])
+
+        matching_chromedriver_urls = [d for d in chromedriver_download_info
+                                      if d["platform"] == self._chrome_platform_string]
+        if len(matching_chromedriver_urls) == 0:
+            raise DownloadNotFoundError(
+                f"No ChromeDriver download found in Chrome for Testing {channel}.")
+        chromedriver_url = matching_chromedriver_urls[0]["url"]
+
+        return browser_download_url, chromedriver_url
+
+    def _save_chromedriver_download_info(self, dest, url):
+        """Save the download URL of a ChromeDriver binary that matches the browser.
+        This will allow for easy version matching, even in separate CLI invocations.
+        """
+        with open(os.path.join(dest, CHROMEDRIVER_SAVED_DOWNLOAD_FILE), "w") as f:
+            f.write(url)
+
+    def download(self, dest=None, channel="canary", rename=None, version=None):
+        """Download Chrome for Testing. For more information,
+        see: https://github.com/GoogleChromeLabs/chrome-for-testing
+        """
+        dest = self._get_browser_binary_dir(None, channel)
+        filename = f"{self._chrome_package_name}.zip"
+
+        # If a version has been supplied, try to find a download to match that version.
+        # Otherwise, find a download for the specified channel.
+        if version is not None:
+            download_url, chromedriver_url = self._get_download_urls_by_version(version)
+        else:
+            download_url, chromedriver_url = self._get_download_urls_by_channel(channel)
+
+        self.logger.info(f"Downloading Chrome for Testing from {download_url}")
+        resp = get(download_url)
+        installer_path = os.path.join(dest, filename)
+        with open(installer_path, "wb") as f:
+            f.write(resp.content)
+
+        # Save the ChromeDriver download URL for use if a matching ChromeDriver
+        # needs to be downloaded in a separate install invocation.
+        self._save_chromedriver_download_info(dest, chromedriver_url)
+
+        return installer_path
+
+    def _find_binary_in_directory(self, directory):
+        """Search for Chrome for Testing browser binary in a given directory."""
+        if uname[0] == "Darwin":
+            return which(
+                "Google Chrome for Testing",
+                path=os.path.join(directory,
+                                  self._chrome_package_name,
+                                  "Google Chrome for Testing.app",
+                                  "Contents",
+                                  "MacOS"))
+        # "which" will add .exe on Windows automatically.
+        return which("chrome", path=os.path.join(directory, self._chrome_package_name))
 
     def find_binary(self, venv_path=None, channel=None):
+        # Check for binary in venv first.
+        path = self._find_binary_in_directory(self._get_browser_binary_dir(venv_path, channel))
+        if path is not None:
+            return path
+
         if uname[0] == "Linux":
             name = "google-chrome"
             if channel == "stable":
@@ -1005,10 +1223,15 @@ class Chrome(ChromeChromiumBase):
         self.logger.warning("Unable to find the browser binary.")
         return None
 
-    def install(self, dest=None, channel=None):
-        raise NotImplementedError("Installing of Chrome browser binary not implemented.")
+    def install(self, dest=None, channel=None, version=None):
+        dest = self._get_browser_binary_dir(dest, channel)
+        installer_path = self.download(dest=dest, channel=channel, version=version)
+        with open(installer_path, "rb") as f:
+            unzip(f, dest)
+        os.remove(installer_path)
+        return self._find_binary_in_directory(dest)
 
-    def install_webdriver(self, dest=None, channel=None, browser_binary=None, revision=None):
+    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
         if dest is None:
             dest = os.pwd
 
@@ -1028,43 +1251,101 @@ class Chrome(ChromeChromiumBase):
             raise ValueError(f"Unable to detect browser version from binary at {browser_binary}. "
                              " Cannot install ChromeDriver without a valid version to match.")
 
-        chromedriver_path = self.install_webdriver_by_version(version, dest, revision)
+        chromedriver_path = self.install_webdriver_by_version(version, dest, channel)
 
         return chromedriver_path
 
+    def install_webdriver_by_version(self, version, dest, channel):
+        # Set the destination to a specific "chrome" folder to not overwrite or remove
+        # ChromeDriver versions used for Chromium.
+        dest = os.path.join(dest, self.product)
+        self._remove_existing_chromedriver_binary(dest)
+
+        url = self._get_webdriver_url(version, channel)
+        if url is None:
+            raise DownloadNotFoundError(
+                f"No ChromeDriver download found to match browser version {version}")
+        self.logger.info(f"Downloading ChromeDriver from {url}")
+        unzip(get(url).raw, dest)
+
+        chromedriver_dir = os.path.join(
+            dest, f"chromedriver-{self._chrome_platform_string}")
+        chromedriver_path = which("chromedriver", path=chromedriver_dir)
+
+        if chromedriver_path is not None:
+            shutil.move(chromedriver_path, dest)
+            rmtree(chromedriver_dir)
+
+        chromedriver_path = which("chromedriver", path=dest)
+        if chromedriver_path is None:
+            raise FileNotFoundError("ChromeDriver could not be detected after installation.")
+        return chromedriver_path
+
     def webdriver_supports_browser(self, webdriver_binary, browser_binary, browser_channel):
         """Check that the browser binary and ChromeDriver versions are a valid match."""
-        # TODO(DanielRyanSmith): The procedure for matching the browser and ChromeDriver
-        #     versions here is too loose. More strict rules for version matching
-        #     should be in place. (#33231)
+        browser_version = self.version(browser_binary)
         chromedriver_version = self.webdriver_version(webdriver_binary)
+
         if not chromedriver_version:
             self.logger.warning("Unable to get version for ChromeDriver "
                                 f"{webdriver_binary}, rejecting it")
             return False
 
-        browser_version = self.version(browser_binary)
+        # TODO(DanielRyanSmith): Determine if this version logic fail case is
+        # still necessary and remove it if it isn't.
         if not browser_version:
             # If we can't get the browser version,
             # we just have to assume the ChromeDriver is good.
             return True
 
-        # Check that the ChromeDriver version matches the Chrome version.
-        chromedriver_major = int(chromedriver_version.split('.')[0])
-        browser_major = int(browser_version.split('.')[0])
-        if chromedriver_major != browser_major:
-            # There is no official ChromeDriver release for the dev channel -
-            # it switches between beta and tip-of-tree, so we accept version+1
-            # too for dev.
-            if browser_channel == "dev" and chromedriver_major == (browser_major + 1):
-                self.logger.debug(f"Accepting ChromeDriver {chromedriver_version} "
-                                  f"for Chrome/Chromium Dev {browser_version}")
-                return True
-            self.logger.warning(f"ChromeDriver {chromedriver_version} does not match "
-                                f"Chrome/Chromium {browser_version}")
+        # Format versions for comparison.
+        browser_version = self._get_build_version(browser_version)
+        chromedriver_version = self._get_build_version(chromedriver_version)
+
+        # Chrome and ChromeDriver versions should match on the same MAJOR.MINOR.BUILD version.
+        if browser_version is not None and browser_version != chromedriver_version:
+            self.logger.warning(
+                f"ChromeDriver {chromedriver_version} does not match Chrome {browser_version}")
             return False
         return True
 
+    def version(self, binary=None, webdriver_binary=None):
+        """Get version string from browser binary."""
+        if not binary:
+            self.logger.warning("No browser binary provided.")
+            return None
+
+        if uname[0] == "Windows":
+            return _get_fileversion(binary, self.logger)
+
+        try:
+            version_string = call(binary, "--version").strip()
+        except (subprocess.CalledProcessError, OSError) as e:
+            self.logger.warning(f"Failed to call {binary}: {e}")
+            return None
+        m = re.match(r"(?:Google Chrome for Testing|Google Chrome) (.*)", version_string)
+        if not m:
+            self.logger.warning(f"Failed to extract version from: {version_string}")
+            return None
+        return m.group(1)
+
+    def webdriver_version(self, webdriver_binary):
+        """Get version string from ChromeDriver binary."""
+        if webdriver_binary is None:
+            self.logger.warning("No valid webdriver supplied to detect version.")
+            return None
+
+        try:
+            version_string = call(webdriver_binary, "--version").strip()
+        except (subprocess.CalledProcessError, OSError) as e:
+            self.logger.warning(f"Failed to call {webdriver_binary}: {e}")
+            return None
+        m = re.match(r"ChromeDriver ([0-9][0-9.]*)", version_string)
+        if not m:
+            self.logger.warning(f"Failed to extract version from: {version_string}")
+            return None
+        return m.group(1)
+
 
 class ContentShell(Browser):
     """Interface for the Chromium content shell.
diff --git a/tests/wpt/tests/tools/wpt/install.py b/tests/wpt/tests/tools/wpt/install.py
index 5bcbb7a7c33..13b0ae81d8d 100644
--- a/tests/wpt/tests/tools/wpt/install.py
+++ b/tests/wpt/tests/tools/wpt/install.py
@@ -7,7 +7,7 @@ latest_channels = {
     'android_weblayer': 'dev',
     'android_webview': 'dev',
     'firefox': 'nightly',
-    'chrome': 'nightly',
+    'chrome': 'canary',
     'chrome_android': 'dev',
     'chromium': 'nightly',
     'edgechromium': 'dev',
diff --git a/tests/wpt/tests/tools/wpt/run.py b/tests/wpt/tests/tools/wpt/run.py
index 15be2af2d3d..c737c057966 100644
--- a/tests/wpt/tests/tools/wpt/run.py
+++ b/tests/wpt/tests/tools/wpt/run.py
@@ -335,7 +335,7 @@ class FirefoxAndroid(BrowserSetup):
 class Chrome(BrowserSetup):
     name = "chrome"
     browser_cls: ClassVar[Type[browser.ChromeChromiumBase]] = browser.Chrome
-    experimental_channels: ClassVar[Tuple[str, ...]] = ("dev", "canary", "nightly")
+    experimental_channels: ClassVar[Tuple[str, ...]] = ("dev", "canary")
 
     def setup_kwargs(self, kwargs):
         browser_channel = kwargs["browser_channel"]
diff --git a/tests/wpt/tests/tools/wpt/tests/test_browser.py b/tests/wpt/tests/tools/wpt/tests/test_browser.py
index b317925ba00..bbaaaae996e 100644
--- a/tests/wpt/tests/tools/wpt/tests/test_browser.py
+++ b/tests/wpt/tests/tools/wpt/tests/test_browser.py
@@ -96,7 +96,8 @@ def test_chrome_webdriver_supports_browser():
 
     # Browser version matches.
     chrome = browser.Chrome(logger)
-    chrome.webdriver_version = mock.MagicMock(return_value='70.0.1')
+    # Versions should be an exact match to be compatible.
+    chrome.webdriver_version = mock.MagicMock(return_value='70.1.5')
     chrome.version = mock.MagicMock(return_value='70.1.5')
     assert chrome.webdriver_supports_browser('/usr/bin/chromedriver', '/usr/bin/chrome', 'stable')
 
@@ -106,14 +107,14 @@ def test_chrome_webdriver_supports_browser():
     chrome.version = mock.MagicMock(return_value='69.0.1')
     assert not chrome.webdriver_supports_browser('/usr/bin/chromedriver', '/usr/bin/chrome', 'stable')
 
-    # The dev channel switches between beta and ToT ChromeDriver, so is sometimes
-    # a version behind its ChromeDriver. As such, we accept browser version + 1 there.
+    # ChromeDriver version should match for MAJOR.MINOR.BUILD version.
     chrome = browser.Chrome(logger)
-    chrome.webdriver_version = mock.MagicMock(return_value='70.0.1')
-    chrome.version = mock.MagicMock(return_value='70.1.0')
-    assert chrome.webdriver_supports_browser('/usr/bin/chromedriver', '/usr/bin/chrome', 'dev')
-    chrome.webdriver_version = mock.MagicMock(return_value='71.0.1')
+    chrome.webdriver_version = mock.MagicMock(return_value='70.0.1.0')
+    chrome.version = mock.MagicMock(return_value='70.0.1.1 dev')
     assert chrome.webdriver_supports_browser('/usr/bin/chromedriver', '/usr/bin/chrome', 'dev')
+    # Mismatching minor version should not match.
+    chrome.webdriver_version = mock.MagicMock(return_value='70.9.1')
+    assert not chrome.webdriver_supports_browser('/usr/bin/chromedriver', '/usr/bin/chrome', 'dev')
 
 
 def test_chromium_webdriver_supports_browser():
diff --git a/tests/wpt/tests/tools/wpt/tests/test_install.py b/tests/wpt/tests/tools/wpt/tests/test_install.py
index 6726081746c..a91658cdeea 100644
--- a/tests/wpt/tests/tools/wpt/tests/test_install.py
+++ b/tests/wpt/tests/tools/wpt/tests/test_install.py
@@ -39,8 +39,28 @@ def test_install_chromium():
 @pytest.mark.slow
 @pytest.mark.remote_network
 def test_install_chrome():
-    with pytest.raises(NotImplementedError):
-        wpt.main(argv=["install", "chrome", "browser"])
+    venv_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir())
+    channel = "dev"
+    dest = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", channel)
+    if sys.platform == "win32":
+        chrome_path = os.path.join(dest, "chrome-win32")
+    elif sys.platform == "darwin":
+        chrome_path = os.path.join(dest, "chrome-mac-x64")
+    else:
+        chrome_path = os.path.join(dest, "chrome-linux64")
+
+    if os.path.exists(chrome_path):
+        utils.rmtree(chrome_path)
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["install", "--channel", channel, "chrome", "browser"])
+    assert excinfo.value.code == 0
+    assert os.path.exists(chrome_path)
+
+    chrome = browser.Chrome(logging.getLogger("Chrome"))
+    binary = chrome.find_binary(venv_path, channel)
+    assert binary is not None and os.path.exists(binary)
+
+    utils.rmtree(chrome_path)
 
 
 @pytest.mark.slow
@@ -60,7 +80,8 @@ def test_install_chrome_chromedriver_by_version():
     if os.path.exists(chromedriver_path):
         os.unlink(chromedriver_path)
     # This is a stable version.
-    binary_path = chrome.install_webdriver_by_version(dest=dest, version="111.0.5563.146")
+    binary_path = chrome.install_webdriver_by_version(
+        dest=dest, version="115.0.5790.170", channel="stable")
     assert path_fn(binary_path) == path_fn(chromedriver_path)
     assert os.path.exists(chromedriver_path)
     os.unlink(chromedriver_path)
diff --git a/tests/wpt/tests/tools/wpt/virtualenv.py b/tests/wpt/tests/tools/wpt/virtualenv.py
index c5e45033141..742f572c34a 100644
--- a/tests/wpt/tests/tools/wpt/virtualenv.py
+++ b/tests/wpt/tests/tools/wpt/virtualenv.py
@@ -81,7 +81,8 @@ class Virtualenv:
             if IS_WIN:
                 site_packages = os.path.join(base, "Lib", "site-packages")
             else:
-                site_packages = os.path.join(base, "lib", f"python{sys.version[:3]}", "site-packages")
+                version = f"{sys.version_info.major}.{sys.version_info.minor}"
+                site_packages = os.path.join(base, "lib", f"python{version}", "site-packages")
 
         return site_packages
 
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
index abbfd9a40a3..0bb6812e6e4 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
@@ -1,4 +1,4 @@
-marionette_driver==3.3.0
+marionette_driver==3.4.0
 mozcrash==2.2.0
 mozdevice==4.1.1
 mozinstall==2.1.0
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
index 5b590adf254..adf665c1992 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
@@ -347,14 +347,20 @@ class WebDriverBrowser(Browser):
         self._output_handler.after_process_start(self._proc.pid)
 
         try:
-            wait_for_service(self.logger, self.host, self.port,
-                             timeout=self.init_timeout)
+            wait_for_service(
+                self.logger,
+                self.host,
+                self.port,
+                timeout=self.init_timeout,
+                server_process=self._proc,
+            )
         except Exception:
             self.logger.error(
                 "WebDriver was not accessible "
                 f"within the timeout:\n{traceback.format_exc()}")
             raise
-        self._output_handler.start(group_metadata=group_metadata, **kwargs)
+        finally:
+            self._output_handler.start(group_metadata=group_metadata, **kwargs)
         self.logger.debug("_run complete")
 
     def stop(self, force=False):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
index f3630f3abbc..380f0848a73 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -2,7 +2,7 @@
 # DO NOT EDIT MANUALLY.
 
 # tools/certs/web-platform.test.pem
-WPT_FINGERPRINT = 'MbajVIHePcSR9G165yc/9ke/pq3AcwawOHR0ds9GOjE='
+WPT_FINGERPRINT = 'Be2q39hn/OSyGxIOIDwkKYzGmG+Z82YfIX9bvqg0lwY='
 
 # signed-exchange/resources/127.0.0.1.sxg.pem
 SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 13755932858..096f851f9d0 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -72,6 +72,17 @@ def get_timeout_multiplier(test_type, run_info_data, **kwargs):
             return 4 * multiplier
         else:
             return 2 * multiplier
+    elif test_type == "wdspec":
+        if (run_info_data.get("asan") or
+            run_info_data.get("ccov") or
+            run_info_data.get("debug")):
+            return 4 * multiplier
+        elif run_info_data.get("tsan"):
+            return 8 * multiplier
+
+        if run_info_data["os"] == "android":
+            return 4 * multiplier
+        return 1 * multiplier
     elif (run_info_data["debug"] or
           run_info_data.get("asan") or
           run_info_data.get("tsan")):
@@ -226,7 +237,7 @@ def run_info_browser_version(**kwargs):
 
 
 def update_properties():
-    return (["os", "debug", "fission", "processor", "swgl", "domstreams", "editorLegacyDirectionMode"],
+    return (["os", "debug", "fission", "processor", "swgl", "asan", "tsan", "editorLegacyDirectionMode"],
             {"os": ["version"], "processor": ["bits"]})
 
 
@@ -668,7 +679,6 @@ class ProfileCreator:
             # TODO: Remove preferences once Firefox 64 is stable (Bug 905404)
             "network.proxy.type": 0,
             "places.history.enabled": False,
-            "network.preload": True,
         })
         if self.e10s:
             profile.set_preferences({"browser.tabs.remote.autostart": True})
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index bf69e8f6083..298b5f27407 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -124,7 +124,6 @@ class ProfileCreator(FirefoxProfileCreator):
             "dom.disable_open_during_load": False,
             "places.history.enabled": False,
             "dom.send_after_paint_to_content": True,
-            "network.preload": True,
             "browser.tabs.remote.autostart": True,
         })
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
index bea6808221a..9e217eda482 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
@@ -311,14 +311,22 @@ class TestEnvironment:
         return failed, pending
 
 
-def wait_for_service(logger, host, port, timeout=60):
+def wait_for_service(logger, host, port, timeout=60, server_process=None):
     """Waits until network service given as a tuple of (host, port) becomes
-    available or the `timeout` duration is reached, at which point
-    ``socket.error`` is raised."""
+    available, `timeout` duration is reached, or the `server_process` exits at
+    which point ``socket.error`` is raised."""
     addr = (host, port)
     logger.debug(f"Trying to connect to {host}:{port}")
     end = time.time() + timeout
     while end > time.time():
+        if server_process is not None and server_process.poll() is not None:
+            returncode = server_process.poll()
+            logger.debug(
+                f"Server process {server_process.pid} exited with "
+                f"{returncode}, giving up trying to connect"
+            )
+            break
+
         so = socket.socket()
         try:
             so.connect(addr)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
index 8ca0a7a9a60..8a183bafcbd 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
@@ -12,12 +12,15 @@ import json
 class CrashError(BaseException):
     pass
 
+class LeakError(BaseException):
+    pass
 
-def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_crash=True):
+def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_crash_leak=True):
     """Reads a single line from the io queue. The read must succeed before `deadline` or
     a TimeoutError is raised. The line is returned as a bytestring or optionally with the
-    specified `encoding`. If `raise_crash` is set, a CrashError is raised if the line
-    happens to be a crash message.
+    specified `encoding`. If `raise_crash_leak` is set, a CrashError is raised if the line
+    happens to be a crash message, or a LeakError is raised if the line happens to be a
+    leak message.
     """
     current_time = time()
 
@@ -26,8 +29,10 @@ def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_cr
 
     try:
         line = io_queue.get(True, deadline - current_time if deadline else None)
-        if raise_crash and line.startswith(b"#CRASHED"):
+        if raise_crash_leak and line.startswith(b"#CRASHED"):
             raise CrashError()
+        if raise_crash_leak and line.startswith(b"#LEAK"):
+            raise LeakError()
     except Empty:
         raise TimeoutError()
 
@@ -114,7 +119,7 @@ class ContentShellTestPart(ProtocolPart):
         result = bytearray()
 
         while True:
-            line = _read_line(self.stdout_queue, deadline, raise_crash=False)
+            line = _read_line(self.stdout_queue, deadline, raise_crash_leak=False)
             excess = len(line) + len(result) - content_length
 
             if excess > 0:
@@ -211,6 +216,11 @@ def _convert_exception(test, exception, errors):
         return (test.result_cls("EXTERNAL-TIMEOUT", errors), [])
     if isinstance(exception, CrashError):
         return (test.result_cls("CRASH", errors), [])
+    if isinstance(exception, LeakError):
+        # TODO: the internal error is to force a restart, but it doesn't correctly
+        # describe what the issue is. Need to find a way to return a "FAIL",
+        # and restart the content_shell after the test run.
+        return (test.result_cls("INTERNAL-ERROR", errors), [])
     raise exception
 
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
index 7715289a624..f29aebac4b9 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -177,6 +177,7 @@ class BrowserManager:
 
         self.started = False
 
+        self.browser_pid = None
         self.init_timer = None
         self.command_queue = command_queue
 
@@ -271,7 +272,7 @@ class TestRunnerManager(threading.Thread):
                  test_implementation_by_type, stop_flag, rerun=1,
                  pause_after_test=False, pause_on_unexpected=False,
                  restart_on_unexpected=True, debug_info=None,
-                 capture_stdio=True, restart_on_new_group=True, recording=None):
+                 capture_stdio=True, restart_on_new_group=True, recording=None, max_restarts=5):
         """Thread that owns a single TestRunner process and any processes required
         by the TestRunner (e.g. the Firefox binary).
 
@@ -343,7 +344,7 @@ class TestRunnerManager(threading.Thread):
 
         self.timer = None
 
-        self.max_restarts = 5
+        self.max_restarts = max_restarts
 
         self.browser = None
 
@@ -513,16 +514,10 @@ class TestRunnerManager(threading.Thread):
         self.browser.update_settings(self.state.test)
 
         result = self.browser.init(self.state.group_metadata)
-        if result is Stop:
-            return RunnerManagerState.error()
-        elif not result:
-            return RunnerManagerState.initializing(self.state.test_type,
-                                                   self.state.test,
-                                                   self.state.test_group,
-                                                   self.state.group_metadata,
-                                                   self.state.failure_count + 1)
-        else:
-            self.start_test_runner()
+        if not result:
+            return self.init_failed()
+
+        self.start_test_runner()
 
     def start_test_runner(self):
         # Note that we need to be careful to start the browser before the
@@ -913,7 +908,8 @@ class ManagerGroup:
                  debug_info=None,
                  capture_stdio=True,
                  restart_on_new_group=True,
-                 recording=None):
+                 recording=None,
+                 max_restarts=5):
         self.suite_name = suite_name
         self.test_source_cls = test_source_cls
         self.test_source_kwargs = test_source_kwargs
@@ -927,6 +923,7 @@ class ManagerGroup:
         self.restart_on_new_group = restart_on_new_group
         self.recording = recording
         assert recording is not None
+        self.max_restarts = max_restarts
 
         self.pool = set()
         # Event that is polled by threads so that they can gracefully exit in the face
@@ -960,7 +957,8 @@ class ManagerGroup:
                                         self.debug_info,
                                         self.capture_stdio,
                                         self.restart_on_new_group,
-                                        recording=self.recording)
+                                        recording=self.recording,
+                                        max_restarts=self.max_restarts)
             manager.start()
             self.pool.add(manager)
         self.wait()
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py
new file mode 100644
index 00000000000..a3d804336e1
--- /dev/null
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py
@@ -0,0 +1,52 @@
+# mypy: allow-untyped-defs
+
+import sys
+from os.path import dirname, join
+from unittest import mock
+
+import pytest
+
+sys.path.insert(0, join(dirname(__file__), "..", "..", ".."))
+
+from mozlog import structuredlog
+
+from wptrunner.browsers import base
+
+
+class MozLogTestHandler(object):
+    def __init__(self):
+        self.items = []
+
+    def __call__(self, data):
+        self.items.append(data)
+
+
+@pytest.mark.skipif(
+    sys.platform == "win32",
+    reason="Relies on echo, which isn't an executable on Windows",
+)
+def test_logging_immediate_exit():
+    logger = structuredlog.StructuredLogger("test")
+    handler = MozLogTestHandler()
+    logger.add_handler(handler)
+
+    class CustomException(Exception):
+        pass
+
+    with mock.patch.object(base, "wait_for_service", side_effect=CustomException):
+        browser = base.WebDriverBrowser(
+            logger, webdriver_binary="echo", webdriver_args=["sample output"]
+        )
+        try:
+            with pytest.raises(CustomException):
+                browser.start(group_metadata={})
+        finally:
+            # Ensure the `echo` process actually exits
+            browser._proc.wait()
+
+    process_output_actions = [
+        data for data in handler.items if data["action"] == "process_output"
+    ]
+
+    assert len(process_output_actions) == 1
+    assert process_output_actions[0]["data"] == "sample output"
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
index a9d11fc9d91..bfb8e53b745 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
@@ -1,5 +1,6 @@
 # mypy: allow-untyped-defs
 
+import gc
 import logging
 import sys
 from unittest import mock
@@ -17,6 +18,12 @@ from wptserve.config import ConfigBuilder
 logger = logging.getLogger()
 
 
+def setup_module(module):
+    # Do a full GC collection, as mozprocess often creates garbage which then
+    # breaks when its __del__ is called while subprocess.Popen is mocked below.
+    gc.collect()
+
+
 def test_sauceconnect_success():
     with mock.patch.object(sauce.SauceConnect, "upload_prerun_exec"),\
             mock.patch.object(sauce.subprocess, "Popen") as Popen,\
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
index 6c7294e81e7..bc664b08ca0 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -64,6 +64,8 @@ scheme host and port.""")
                         "directory")
     parser.add_argument("--processes", action="store", type=int, default=None,
                         help="Number of simultaneous processes to use")
+    parser.add_argument("--max-restarts", action="store", type=int, default=5,
+                        help="Maximum number of browser restart retries")
 
     parser.add_argument("--no-capture-stdio", action="store_true", default=False,
                         help="Don't capture stdio and write to logging")
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
index 1ea44041d93..4bfb4158d13 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -270,7 +270,9 @@ def run_test_iteration(test_status, test_loader, test_source_kwargs, test_source
                           kwargs["debug_info"],
                           not kwargs["no_capture_stdio"],
                           kwargs["restart_on_new_group"],
-                          recording=recording) as manager_group:
+                          recording=recording,
+                          max_restarts=kwargs["max_restarts"],
+                          ) as manager_group:
             try:
                 handle_interrupt_signals()
                 manager_group.run(tests_to_run)
diff --git a/tests/wpt/tests/url/resources/urltestdata.json b/tests/wpt/tests/url/resources/urltestdata.json
index ec189871d90..287a84b467a 100644
--- a/tests/wpt/tests/url/resources/urltestdata.json
+++ b/tests/wpt/tests/url/resources/urltestdata.json
@@ -7851,7 +7851,6 @@
     "input": "blob:file://host/path",
     "base": null,
     "href": "blob:file://host/path",
-    "origin": "null",
     "protocol": "blob:",
     "username": "",
     "password": "",
diff --git a/tests/wpt/tests/wai-aria/role/listbox-roles.html b/tests/wpt/tests/wai-aria/role/listbox-roles.html
new file mode 100644
index 00000000000..50208229278
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/listbox-roles.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+    <title>Listbox-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<p>Tests <a href="https://w3c.github.io/aria/#listbox">listbox</a> and related roles.</p>
+
+<div role="listbox" data-testname="div role is listbox" data-expectedrole="listbox" class="ex">
+    <div role="option" data-testname="role is option (in div listbox)" data-expectedrole="option" class="ex">x</div>
+    <div role="group" data-testname="role is group (in div listbox)" data-expectedrole="group" class="ex">
+        <span role="option" data-testname="role is option (in group, in div listbox)" data-expectedrole="option" class="ex">x</span>
+        <span role="option">x</span>
+    </div>
+    <div role="option">x</div>
+</div>
+
+<ul role="listbox" data-testname="ul role is listbox" data-expectedrole="listbox" class="ex">
+    <li role="option" data-testname="li role is option (in ul listbox)" data-expectedrole="option" class="ex">
+        x
+    </li>
+    <li role="option">
+        x
+    </li>
+</ul>
+
+<nav role="option" data-testname="orphaned option outside the context of listbox" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/wai-aria/scripts/aria-utils.js b/tests/wpt/tests/wai-aria/scripts/aria-utils.js
index 4fbc96aab3b..feb71b83984 100644
--- a/tests/wpt/tests/wai-aria/scripts/aria-utils.js
+++ b/tests/wpt/tests/wai-aria/scripts/aria-utils.js
@@ -55,6 +55,66 @@ const AriaUtils = {
   },
 
 
+  /*
+  Tests computed ROLE of selected elements matching selector
+  against the string value of provided roles array.
+
+  Ex: <foo
+        data-testname="verify fooRole or barRole role on span"
+        class="ex-foo-or-bar">
+
+      AriaUtils.verifyRoleOrVariantRolesBySelector(".ex-foo-or-bar", ["fooRole", "barRole"]);
+
+  See also helper function verifyGenericRolesBySelector shorthand of the above using ["generic", "", "none"].
+
+  Note: This function should not be used to circumvent unexpected interop differences in implementations.
+  It should only be used in specific cases (like "generic") determined by ARIA WG or other spec maintainers to be acceptable for the purposes of testing.
+
+  */
+  verifyRoleOrVariantRolesBySelector: function(selector, roles) {
+    const els = document.querySelectorAll(selector);
+    if (!els.length) {
+      throw `Selector "${selector}" should match at least one element.`;
+    }
+    if (!roles.length || roles.length < 2) {
+      throw `Roles array ["${roles.join('", "')}"] should include at least two strings, a primary role and at least one acceptable implementation-specific variant. E.g. ["generic", "", "none"]…`;
+    }
+    for (const el of els) {
+      let testName = el.getAttribute("data-testname");
+      promise_test(async t => {
+        const expectedRoles = roles;
+        const computedRole = await test_driver.get_computed_role(el);
+        for (role of roles){
+          if (computedRole === role) {
+            return assert_equals(computedRole, role, `Computed Role: "${computedRole}" matches one of the acceptable role strings in ["${roles.join('", "')}"]: ${el.outerHTML}`);
+          }
+        }
+        return assert_false(true, `Computed Role: "${computedRole}" does not match any of the acceptable role strings in ["${roles.join('", "')}"]: ${el.outerHTML}`);
+      }, `${testName}`);
+    }
+  },
+
+
+  /*
+  Helper function for "generic" ROLE tests.
+
+  Ex: <span
+        data-testname="verify generic, none, or empty computed role on span"
+        class="ex-generic">
+
+      AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+
+   This helper function is equivalant to AriaUtils.verifyRoleOrVariantRolesBySelector(".ex-generic", ["generic", "", "none"]);
+   See various issues and discussions linked from https://github.com/web-platform-tests/interop-2023-accessibility-testing/issues/48
+
+  */
+  verifyGenericRolesBySelector: function(selector) {
+    // ARIA WG determined implementation variants "none" (Chromium), and the empty string "" (WebKit), are sufficiently equivalent to "generic" for WPT test verification of HTML-AAM.
+    // See various discussions linked from https://github.com/web-platform-tests/interop-2023-accessibility-testing/issues/48
+    this.verifyRoleOrVariantRolesBySelector(selector, ["generic", "", "none"]);
+  },
+
+
   /*
   Tests computed LABEL of all elements matching selector
   against the string value of their data-expectedlabel attribute.
diff --git a/tests/wpt/tests/webcodecs/video-decoder.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
index c68315261fb..431ac4f34a9 100644
--- a/tests/wpt/tests/webcodecs/video-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
@@ -35,11 +35,21 @@ invalidConfigs.forEach(entry => {
           entry.comment);
 });
 
+const arrayBuffer = new ArrayBuffer(12583);
+const arrayBufferView = new DataView(arrayBuffer);
+
 const validButUnsupportedConfigs = [
   {
     comment: 'Unrecognized codec',
     config: {codec: 'bogus'},
   },
+  {
+    comment: 'Unrecognized codec with dataview description',
+    config: {
+      codec: '7󠎢ﷺ۹.9',
+      description: arrayBufferView,
+    },
+  },
   {
     comment: 'Audio codec',
     config: {codec: 'vorbis'},
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py
index c8e27ab31d1..402c23f164d 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py
@@ -11,6 +11,7 @@ DOM_CONTENT_LOADED_EVENT = "browsingContext.domContentLoaded"
 
 
 async def test_unsubscribe(bidi_session, inline, top_context):
+    # test
     await bidi_session.session.subscribe(events=[DOM_CONTENT_LOADED_EVENT])
     await bidi_session.session.unsubscribe(events=[DOM_CONTENT_LOADED_EVENT])
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/invalid.py
new file mode 100644
index 00000000000..fd3c31a7864
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/invalid.py
@@ -0,0 +1,39 @@
+import pytest
+import webdriver.bidi.error as error
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_context_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.browsing_context.handle_user_prompt(context=value)
+
+
+@pytest.mark.parametrize("value", ["", "somestring"])
+async def test_params_context_invalid_value(bidi_session, value):
+    with pytest.raises(error.NoSuchFrameException):
+        await bidi_session.browsing_context.handle_user_prompt(context=value)
+
+
+@pytest.mark.parametrize("value", ["foo", 42, {}, []])
+async def test_params_accept_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.browsing_context.handle_user_prompt(
+            context=top_context["context"], accept=value
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_user_text_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.browsing_context.handle_user_prompt(
+            context=top_context["context"], user_text=value
+        )
+
+
+async def test_no_alert(bidi_session, top_context):
+    with pytest.raises(error.NoSuchAlertException):
+        await bidi_session.browsing_context.handle_user_prompt(
+            context=top_context["context"]
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py
new file mode 100644
index 00000000000..dc15d5ea904
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py
@@ -0,0 +1,171 @@
+import pytest
+import webdriver.bidi.error as error
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("value", [None, "foo", False, 42, {}])
+async def test_params_phases_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=value)
+
+
+async def test_params_phases_invalid_value_empty_array(bidi_session):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=[])
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_phases_entry_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=[value])
+
+
+@pytest.mark.parametrize("value", ["foo", "responseCompleted"])
+async def test_params_phases_entry_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=[value])
+
+
+@pytest.mark.parametrize("value", ["foo", False, 42, {}])
+async def test_params_url_patterns_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"], url_patterns=value
+        )
+
+
+@pytest.mark.parametrize("value", [None, "foo", False, 42, []])
+async def test_params_url_patterns_entry_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"], url_patterns=[value]
+        )
+
+
+@pytest.mark.parametrize("value", [{}, {"type": "foo"}])
+async def test_params_url_patterns_entry_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"], url_patterns=[value]
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, [], {}])
+async def test_params_url_patterns_string_pattern_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "string", "pattern": value}],
+        )
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "foo",
+        "*",
+        "(",
+        ")",
+        "{",
+        "}",
+        "http\\{s\\}://example.com",
+        "https://example.com:port/",
+    ],
+)
+async def test_params_url_patterns_string_pattern_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "string", "pattern": value}],
+        )
+
+
+@pytest.mark.parametrize(
+    "property", ["protocol", "hostname", "port", "pathname", "search"]
+)
+@pytest.mark.parametrize("value", [False, 42, [], {}])
+async def test_params_url_patterns_pattern_property_invalid_type(
+    bidi_session, property, value
+):
+    with pytest.raises(error.InvalidArgumentException):
+        url_pattern = {"type": "pattern"}
+        url_pattern[property] = value
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[url_pattern],
+        )
+
+
+@pytest.mark.parametrize(
+    "property", ["protocol", "hostname", "port", "pathname", "search"]
+)
+@pytest.mark.parametrize("value", ["*", "(", ")", "{", "}"])
+async def test_params_url_patterns_pattern_property_unescaped_character(
+    bidi_session, property, value
+):
+    with pytest.raises(error.InvalidArgumentException):
+        url_pattern = {"type": "pattern"}
+        url_pattern[property] = value
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[url_pattern],
+        )
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "http/",
+        "http\\*",
+        "http\\(",
+        "http\\)",
+        "http\\{",
+        "http\\}",
+        "http#",
+        "http@",
+        "http%",
+    ],
+)
+async def test_params_url_patterns_pattern_protocol_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "protocol": value}],
+        )
+
+
+@pytest.mark.parametrize("value", ["abc/com/", "abc?com", "abc#com", "abc:com", "::1"])
+async def test_params_url_patterns_pattern_hostname_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "hostname": value}],
+        )
+
+
+@pytest.mark.parametrize("value", ["abcd", "-1", "80 ", "1.3", ":80", "65536"])
+async def test_params_url_patterns_pattern_port_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "port": value}],
+        )
+
+
+@pytest.mark.parametrize("value", ["path?", "path#"])
+async def test_params_url_patterns_pattern_pathname_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "pathname": value}],
+        )
+
+
+@pytest.mark.parametrize("value", ["search#"])
+async def test_params_url_patterns_pattern_search_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "search": value}],
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py
new file mode 100644
index 00000000000..d6063d22ec3
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py
@@ -0,0 +1,28 @@
+import pytest
+import webdriver.bidi.error as error
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_intercept_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.remove_intercept(intercept=value)
+
+
+@pytest.mark.parametrize("value", ["foo"])
+async def test_params_intercept_invalid_value(bidi_session, value):
+    with pytest.raises(error.NoSuchInterceptException):
+        await bidi_session.network.remove_intercept(intercept=value)
+
+
+async def test_params_intercept_removed_intercept(bidi_session):
+    intercept = await bidi_session.network.add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": "https://example.com"}],
+    )
+
+    await bidi_session.network.remove_intercept(intercept=intercept)
+
+    with pytest.raises(error.NoSuchInterceptException):
+        await bidi_session.network.remove_intercept(intercept=intercept)
diff --git a/tests/wpt/tests/webrtc/RTCDtlsTransport-state.html b/tests/wpt/tests/webrtc/RTCDtlsTransport-state.html
index ca49fcc95f2..31c185b70bc 100644
--- a/tests/wpt/tests/webrtc/RTCDtlsTransport-state.html
+++ b/tests/wpt/tests/webrtc/RTCDtlsTransport-state.html
@@ -72,8 +72,13 @@ promise_test(async t => {
   const dtlsTransport2 = pc2.getTransceivers()[0].sender.transport;
   await Promise.all([resolveWhen(t, dtlsTransport1, 'connected'),
                      resolveWhen(t, dtlsTransport2, 'connected')]);
+  let fired = false;
+  dtlsTransport1.onstatechange = t.step_func(() => fired = true);
+  dtlsTransport1.addEventListener('statechange', t.step_func(() => fired = true));
   pc1.close();
   assert_equals(dtlsTransport1.state, 'closed');
+  await new Promise(r => t.step_timeout(r, 10));
+  assert_false(fired, 'close() should not see a statechange event on close');
 }, 'close() causes the local transport to close immediately');
 
 promise_test(async t => {
@@ -128,13 +133,7 @@ promise_test(async t => {
   stoppedTransceiver.stop();
   await onended;
 
-  assert_equals(
-      pc1.getReceivers().length, 1,
-      'getReceivers does not expose a receiver of a stopped transceiver');
-  assert_equals(
-      pc1.getSenders().length, 1,
-      'getSenders does not expose a sender of a stopped transceiver');
-  assert_equals(audioTc.sender, pc1.getSenders()[0]); // sanity
+  assert_equals(audioTc.sender, pc1.getSenders()[1]); // sanity
   assert_equals(audioTc.sender.transport, audioTp); // sanity
   assert_equals(audioTp.state, 'connected');
 }, 'stop bundled transceiver retains dtls transport state');
diff --git a/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js b/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js
index e0bc5076371..1594decd370 100644
--- a/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js
+++ b/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js
@@ -1,5 +1,5 @@
-for (;) // should cause onerror to be invoked, but onerror is null, so
-        // the error is "not handled". should fire an ErrorEvent on the
-        // worker.
-  break;
-postMessage(1); // shouldn't do anything since the script doesn't compile
\ No newline at end of file
+// Throw a runtime error, the UA must report the error for that script.
+// https://html.spec.whatwg.org/#runtime-script-errors-2
+for (;;)
+  throw new Error("error from onerror.js");
+postMessage(1); // shouldn't do anything since the script doesn't compile
diff --git a/tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html
index 20b03a72766..6e0051aa14e 100644
--- a/tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html
+++ b/tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html
@@ -86,6 +86,17 @@ import_csp_test(
     "worker-src 'self' directive should override script-src * directive and " +
         "disallow cross origin static import.");
 
+// For static imports on workers, the effective directive should be 'worker-src'.
+// https://w3c.github.io/webappsec-csp/#effective-directive-for-a-request
+//
+// The directive fallback list of 'worker-src' doesn't contain 'script-src-elem'
+// https://w3c.github.io/webappsec-csp/#directive-fallback-list
+import_csp_test(
+    "script-src-elem 'self' 'unsafe-inline'",
+    "static",
+    ["export-on-load-script.js"],
+    "script-src-elem 'self' directive should not take effect on static import.");
+
 // Tests for dynamic import.
 //
 // Dynamic import should obey the script-src directive instead of the worker-src
@@ -105,6 +116,14 @@ import_csp_test(
     ['ERROR'],
     "script-src 'self' directive should disallow cross origin dynamic import.");
 
+// For dynamic imports, the effective directive should be 'script-src-elem'.
+// https://w3c.github.io/webappsec-csp/#effective-directive-for-a-request
+import_csp_test(
+    "script-src-elem 'self' 'unsafe-inline'",
+    "dynamic",
+    ['ERROR'],
+    "script-src-elem 'self' directive should disallow cross origin dynamic import.");
+
 import_csp_test(
     "script-src * 'unsafe-inline'",
     "dynamic",
@@ -116,5 +135,4 @@ import_csp_test(
     "dynamic",
     ["export-on-load-script.js"],
     "worker-src 'self' directive should not take effect on dynamic import.");
-
 </script>
diff --git a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
index 9571dd686f7..77eb67d4ae6 100644
--- a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
@@ -1,5 +1,6 @@
 [read-pixels-test.html]
   bug: https://github.com/servo/servo/issues/12859
+  expected: TIMEOUT
   [WebGL test #49: getError expected: INVALID_OPERATION. Was INVALID_ENUM : Should not be able to read as ALPHA / UNSIGNED_BYTE]
     expected: FAIL