diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html.ini
new file mode 100644
index 00000000000..cb3c1c2dd8d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html.ini
@@ -0,0 +1,2 @@
+[border-image-displayed-with-transparent-border-color.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/hsl-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/hsl-008.html.ini
new file mode 100644
index 00000000000..f6800f69984
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/hsl-008.html.ini
@@ -0,0 +1,2 @@
+[hsl-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rgba-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rgba-004.html.ini
new file mode 100644
index 00000000000..119e9824653
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rgba-004.html.ini
@@ -0,0 +1,2 @@
+[rgba-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-item-flex-percentage-min-width.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-item-flex-percentage-min-width.html.ini
new file mode 100644
index 00000000000..219a9e04af7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-item-flex-percentage-min-width.html.ini
@@ -0,0 +1,2 @@
+[table-item-flex-percentage-min-width.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-serialization.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-serialization.html.ini
new file mode 100644
index 00000000000..ee4c6f21e11
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-serialization.html.ini
@@ -0,0 +1,10 @@
+[advance-override-serialization.html]
+  [One parameter should be serialized as one parameter]
+    expected: FAIL
+
+  [Two different parameters should be serialized as two parameters]
+    expected: FAIL
+
+  [Two identical parameters should be simplified into one parameter]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-vertical-upright.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-vertical-upright.html.ini
new file mode 100644
index 00000000000..54e70a100a5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/advance-override-vertical-upright.html.ini
@@ -0,0 +1,2 @@
+[advance-override-vertical-upright.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-computed-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-computed-value-001.html.ini
new file mode 100644
index 00000000000..681cae172e5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-computed-value-001.html.ini
@@ -0,0 +1,34 @@
+[tab-size-computed-value-001.html]
+  [testing tab-size: 4]
+    expected: FAIL
+
+  [testing tab-size: 0.5in]
+    expected: FAIL
+
+  [testing tab-size: 2.54cm]
+    expected: FAIL
+
+  [testing tab-size: 25.4mm]
+    expected: FAIL
+
+  [testing tab-size: 18pt]
+    expected: FAIL
+
+  [testing tab-size: 5pc]
+    expected: FAIL
+
+  [testing tab-size: 101.6Q]
+    expected: FAIL
+
+  [testing tab-size: 7px]
+    expected: FAIL
+
+  [testing tab-size: 1em]
+    expected: FAIL
+
+  [testing tab-size: 2ex]
+    expected: FAIL
+
+  [testing tab-size: 3rem]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/parsing/scale-parsing-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/parsing/scale-parsing-valid.html.ini
index ff37dc8223b..f6d96991e03 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/parsing/scale-parsing-valid.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/parsing/scale-parsing-valid.html.ini
@@ -1,4 +1,7 @@
 [scale-parsing-valid.html]
+  [e.style['scale'\] = "100 100 2" should set the property value]
+    expected: FAIL
+
   [e.style['scale'\] = "1%" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-values/calc-infinity-nan-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-values/calc-infinity-nan-computed.html.ini
new file mode 100644
index 00000000000..c7015794c9a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-values/calc-infinity-nan-computed.html.ini
@@ -0,0 +1,46 @@
+[calc-infinity-nan-computed.html]
+  [Property width value 'calc(NaN * 1px)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1cm)']
+    expected: FAIL
+
+  [Property width value 'calc(NaN * 1rem)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px - infinity * 1%)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px + infinity * 1%)']
+    expected: FAIL
+
+  [Property width value 'calc(min(NaN * 1px, infinity * 1px) + max(infinity * 1px, -infinity * 1px))']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px - max(infinity * 1%, 0%))']
+    expected: FAIL
+
+  [Property width value 'calc(max(infinity * 1px, 10px))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1px)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(min(1px, -infinity * 1%))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1%)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(max(10000px, 0px) + min(-infinity * 1px, infinity * 1px))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1px - infinity * 1px)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(min(-infinity * 1px, 10px))']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/selectors/user-valid.html.ini b/tests/wpt/metadata-layout-2020/css/selectors/user-valid.html.ini
new file mode 100644
index 00000000000..2edbcc3bf55
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/selectors/user-valid.html.ini
@@ -0,0 +1,4 @@
+[user-valid.html]
+  [:user-valid selector should be supported]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 576cfc2e4e2..632078efe1f 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,24 +309,18 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 8d0261f22a0..8456d88e4f3 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -59,3 +59,6 @@
   [separate text/javascript; charset=windows-1252 text/javascript]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2a63e3b7f..8e2b6af33d8 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,8 +1,8 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
+  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d81ae5a4949..3538891dae8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,14 +4,14 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-row-height.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-row-height.html.ini
new file mode 100644
index 00000000000..cf21f0ef4ff
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-row-height.html.ini
@@ -0,0 +1,2 @@
+[table-row-height.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
new file mode 100644
index 00000000000..82574a53e6d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
@@ -0,0 +1,4 @@
+[picture-aspect-ratio.html]
+  [Computed style]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [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/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index e440122bf8e..b3643f7f51e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -5,48 +5,21 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -59,9 +32,27 @@
   [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart out of range a second time (must not fire select)]
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index ff5513c7b6d..b1aa0f1f1c4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,5 +1,4 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
@@ -7,8 +6,8 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/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/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..b4d4b898636 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,9 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_array_in_object]
+    expected: FAIL
+
+  [test_object_in_array]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 33bf693e985..50d91009b4c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -21258,57 +21258,6 @@
         {}
        ]
       ]
-     },
-     "mouse-events": {
-      "click-on-body-manual.html": [
-       "30b6646afff4b6d3e50a21fa8a96d7341b256076",
-       [
-        null,
-        {}
-       ]
-      ],
-      "click-on-div-manual.html": [
-       "173e520a17eeb9ea6da189c217fe3af98df11a6b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "click-on-html-manual.html": [
-       "7f3514fdd02ed5e05d988c35593928a7a80698f6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "click-order-manual.html": [
-       "7d31a5f8dbb066af7cb9ff89b99347e1c68ec7a3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "mouseevents-mousemove-manual.htm": [
-       "8ed9c1c28486168580610458c48b3793329a4dda",
-       [
-        null,
-        {}
-       ]
-      ],
-      "mousemove-across-manual.html": [
-       "8b0e7171a54f7311464e65cc7c2de2e6e16bc5ba",
-       [
-        null,
-        {}
-       ]
-      ],
-      "mousemove-between-manual.html": [
-       "89b5db92ca94435964cf434d7a56445b5a1cb732",
-       [
-        null,
-        {}
-       ]
-      ]
      }
     }
    },
@@ -79322,6 +79271,19 @@
         {}
        ]
       ],
+      "margin-collapsing-dynamic.html": [
+       "f1b8ee5ddb6a095e6d0e4b9653b577bec2aa6391",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "margin-collapsing-in-table-caption-001.html": [
        "c06d73724282e061290c8a5b086b84bb9ca03032",
        [
@@ -125780,6 +125742,19 @@
        {}
       ]
      ],
+     "border-image-displayed-with-transparent-border-color.html": [
+      "859dc2f5f55000c1f24580210bb5bc1c414f03ef",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-image-image-type-003.htm": [
       "e59785df9292cf5a74f268d8a93dbada42b5db00",
       [
@@ -128268,6 +128243,32 @@
        {}
       ]
      ],
+     "out-of-flow-in-multicolumn-019.html": [
+      "6506236ebe3d5703283649bb4672d822567c52a4",
+      [
+       null,
+       [
+        [
+         "/css/css-break/out-of-flow-in-multicolumn-019-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-020.html": [
+      "89f8d4d6882c24b192be78850995dec32ff7870e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflowed-block-with-no-room-after-000.html": [
       "084e16fb38de072fb83f92ba01302a2e404cdd97",
       [
@@ -129196,12 +129197,12 @@
       ]
      ],
      "hex-001.html": [
-      "4ff5cdbd9ce1d95e932853d78344425a6b8f55bb",
+      "0c90f877874316689e55623a69b1776646bef12d",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129209,12 +129210,12 @@
       ]
      ],
      "hex-002.html": [
-      "5e0d48a23d3734cc80c112a0a573103d0fa2ce6d",
+      "ee3f5a45eec5f30d1b408ccbb53380e9110c268f",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129222,7 +129223,7 @@
       ]
      ],
      "hex-003.html": [
-      "a6a19ad61913e826fe011362dec56a5be41d7536",
+      "2ee4ec61e5df8a91c48fb656280bc88e5a54702c",
       [
        null,
        [
@@ -129235,7 +129236,7 @@
       ]
      ],
      "hex-004.html": [
-      "074fb1d4760aab7e209fb75c2f929be7e458c5d5",
+      "39e12ffee1ee9185396e5a8afc3b7c5bcd38eba7",
       [
        null,
        [
@@ -129248,12 +129249,12 @@
       ]
      ],
      "hsl-001.html": [
-      "842dbb9e71343e5a0f1614a9584d20588052ff40",
+      "a71ce6bad650dd6ee5d57c7c08eba1eeab873815",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129261,12 +129262,12 @@
       ]
      ],
      "hsl-002.html": [
-      "91750d426aa1ca87be0e30f08b1fc3c691986b09",
+      "fae6126fdc7153a2947f2cc9347f7beeeef4aa9c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129274,12 +129275,12 @@
       ]
      ],
      "hsl-003.html": [
-      "5b6bb4b1c9ab783fbcc80c4b97637cf42b62d130",
+      "e175e2a2ffdb7e2228528eff6cbaf944d24e021a",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129287,12 +129288,12 @@
       ]
      ],
      "hsl-004.html": [
-      "483c821aeca77d403f506e064ee7bed1e559b2e0",
+      "2af529158e0ef84a6dc5c236e54b3207c7e63786",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129300,12 +129301,12 @@
       ]
      ],
      "hsl-005.html": [
-      "b0970c316f37f2651cd7437e152087cbd051a668",
+      "7dc793595b7f2e641c7e120e5b6cf147299e75b9",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129313,12 +129314,12 @@
       ]
      ],
      "hsl-006.html": [
-      "389c5a49d4f3e534eeb0419c9500f5b34cc3b691",
+      "348a8a80c6c777c3563b9ddac92ad696ace9406c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129326,12 +129327,12 @@
       ]
      ],
      "hsl-007.html": [
-      "18bbe405922478b91eb959f77a1c2ef5d64c3912",
+      "9e1bc08add141969b258495b14d0815a2e9c712c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129339,7 +129340,7 @@
       ]
      ],
      "hsl-008.html": [
-      "89b962171a3a62ddd7ac0b33be4cb2347695f8ab",
+      "bcef8002ee381ce2bf236ab9d6beab8762de2bd4",
       [
        null,
        [
@@ -129352,12 +129353,12 @@
       ]
      ],
      "hsla-001.html": [
-      "9e5bbfa47726222660c177165f1aba51ea05ab46",
+      "c3b2633a0a9af9814818f9e671c9f5c7db978524",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129365,12 +129366,12 @@
       ]
      ],
      "hsla-002.html": [
-      "8b9cff818f256870a9c682cc354fdf70774f70d9",
+      "a51c5f2b96b260341e57e18dcfa370e222ae3d79",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129378,12 +129379,12 @@
       ]
      ],
      "hsla-003.html": [
-      "3aadd8e5b0a475b448271ab6df863c6fbc420626",
+      "c9845934364a0aadf325fe6cc8f0a48e485e8e9c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129391,12 +129392,12 @@
       ]
      ],
      "hsla-004.html": [
-      "e68669fdeac7de87832bd7d5c72cce2d44cc9741",
+      "aa095cafa552fb4a3caae6a369fe8f00edbe0b3d",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129404,12 +129405,12 @@
       ]
      ],
      "hsla-005.html": [
-      "4efeb1912c0a78d4b448d4fe08157f51407f52cc",
+      "ab88515c57b33bb7bec472871304dbca80a3cd64",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129417,12 +129418,12 @@
       ]
      ],
      "hsla-006.html": [
-      "e440ebe5bdb7be456f655e35ca199d830f4312bb",
+      "f9a93cd2c4ee1dbe9e1da3b506e85885f1909b5e",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129430,12 +129431,12 @@
       ]
      ],
      "hsla-007.html": [
-      "ba647ae7514128bcf75ea7fc8c0ae47ac13c25aa",
+      "8c583fcda019c89916184f0b8899b0a01e30af0b",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -129443,12 +129444,12 @@
       ]
      ],
      "hsla-008.html": [
-      "8f78f88656ed536b833f348f8e75dcffe452da34",
+      "e5aaa243736fdc9e1edf3c976902dedefeb1f99e",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130067,12 +130068,12 @@
       ]
      ],
      "rgb-001.html": [
-      "30603faa9c5b70956d97139d7bb86cc9cb2fd9e3",
+      "3e5900167789039a0497dc87ff1a7277514e745c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130080,12 +130081,12 @@
       ]
      ],
      "rgb-002.html": [
-      "a50620b9b14f2e176577d04d5750f0752e0a179c",
+      "c87f7878d995a255e97349e82fcac88669d0da40",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130093,12 +130094,12 @@
       ]
      ],
      "rgb-003.html": [
-      "8355f7768f2362054b497635ccc52e01ffb5966a",
+      "5fc0fbfe2895179bed2b9bc0ec596c88ed0ca769",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130106,12 +130107,12 @@
       ]
      ],
      "rgb-004.html": [
-      "7bace000ab37470b6a3dd191f6074fe4f5ef9f6f",
+      "d4078f30e474a3c752dd528d05a7bf79181a4954",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130119,12 +130120,12 @@
       ]
      ],
      "rgb-005.html": [
-      "199eddcbbab6a112a4236b52e3da821924cb8ef9",
+      "ec5e2f5b94615e14456b8add89e47d4e69f1969f",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130132,12 +130133,12 @@
       ]
      ],
      "rgb-006.html": [
-      "5ccb8ea135fa44ac8e2d224ef3587ee9081db674",
+      "45b11138e3ef7821caa1f0efac985e2e323c753d",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130145,12 +130146,12 @@
       ]
      ],
      "rgb-007.html": [
-      "a09b71317093de74ca3f802702e3963655d752ac",
+      "fd881c3184f9f33301e26c4b3002bd6ef8e0b272",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130158,12 +130159,12 @@
       ]
      ],
      "rgb-008.html": [
-      "bd3215d89fca4680f8db855a0e3af30c99b003af",
+      "868427535677a53e734e2a2defb8c066f1023058",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130171,12 +130172,12 @@
       ]
      ],
      "rgba-001.html": [
-      "8fb383fca8dda7ad5e6f499c2d83a84a34d721f7",
+      "3f9989a4131b4626c1e0b9c798d5cbb34bdf919e",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130184,12 +130185,12 @@
       ]
      ],
      "rgba-002.html": [
-      "14dd2b56e7ff8a9513afd3cca7b5e59fb43085dd",
+      "3a734bdc3036ce406a09312b9aed6dc146514ff8",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130197,12 +130198,12 @@
       ]
      ],
      "rgba-003.html": [
-      "49200d039fc21589a89e99bf37e26267c9564166",
+      "5204931df55ec909466f84a4f453209571d11183",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130210,7 +130211,7 @@
       ]
      ],
      "rgba-004.html": [
-      "22e5854e1a04ad0506f87392ac75aa73facf7c87",
+      "91d31731e35f8124ff5364c6eb0cd061e3cccb1e",
       [
        null,
        [
@@ -130223,12 +130224,12 @@
       ]
      ],
      "rgba-005.html": [
-      "1e72b1db97a7e31a06edab78ff832d23c5c92c10",
+      "579b57a0683315e2316fc42ba2f8bd064739b27c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130236,12 +130237,12 @@
       ]
      ],
      "rgba-006.html": [
-      "3b397ab31112cf0a9546df523e59b3f19fef3e06",
+      "b7b371952a61a96978f9465c94294bef5f83215c",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130249,12 +130250,12 @@
       ]
      ],
      "rgba-007.html": [
-      "5b316a2a369cf7e2cae0e0eb593473cf7527267e",
+      "cca349781b7d2a96d9056c732900841e975112b5",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -130262,12 +130263,12 @@
       ]
      ],
      "rgba-008.html": [
-      "65eab55794c39e47d6afb5b71e5fea4b9b671b37",
+      "8d6c85116648e4cbeebc983532c720d9f7196a7e",
       [
        null,
        [
         [
-         "/css/css-color/greentext-ref.html",
+         "/css/css-color/greensquare-ref.html",
          "=="
         ]
        ],
@@ -152312,6 +152313,19 @@
        {}
       ]
      ],
+     "table-item-flex-percentage-min-width.html": [
+      "a67e4fe15f65aab403c376cff6ecda5a25da51bf",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/table-item-flex-percentage-min-width-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "table-item-flex-percentage-width.html": [
       "f21b5f0c6562c3970ae95202f5e3adf7a3deb489",
       [
@@ -152407,6 +152421,19 @@
      ]
     },
     "css-fonts": {
+     "advance-override-vertical-upright.html": [
+      "b9712bcdba979c6b27d15ce678f5261bc1871d5b",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/advance-override-vertical-upright-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "advance-override.html": [
       "2b4a6ca3823921aece94c8d597e34a3907f6d2cd",
       [
@@ -155673,6 +155700,45 @@
         {}
        ]
       ],
+      "positioned-grid-items-negative-indices-001.html": [
+       "f723b2486c14bf993bfaf8bf4639f79fbac18e97",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "positioned-grid-items-negative-indices-002.html": [
+       "4a023e1c62de988a0d36e5333becbf6fb3defef4",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "positioned-grid-items-negative-indices-003.html": [
+       "099dd9ca068d0d7bea479430a6c8e86d73f00a68",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "positioned-grid-items-sizing-001.html": [
        "7fb303c0dd0df39d614f8bee8bd003494fcd233c",
        [
@@ -187687,7 +187753,7 @@
        ]
       ],
       "replaced-element-032.html": [
-       "afa483dd3158910136392e405e363294033e02d6",
+       "022a2d797b1bb6ad9cde6c383ad054f1bd835400",
        [
         null,
         [
@@ -205794,7 +205860,7 @@
        ]
       ],
       "transform-interpolation-skew.html": [
-       "4f8aa52fd10d662d15582b48e7ad1b2a1f1a05d9",
+       "95277d4b8cf753ea3c67147ad348985c47d9ec27",
        [
         null,
         [
@@ -205803,7 +205869,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             3000
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "transform-interpolation-translate-em.html": [
@@ -216133,6 +216215,45 @@
         ],
         {}
        ]
+      ],
+      "translate-and-transform-attribute-in-svg.html": [
+       "6fd8027964df68a199ca496786f93630a341434e",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "translate-and-transform-css-property-in-svg.html": [
+       "e44fd145060a519ddde74ab933db718eafa0ae0a",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "translate-in-svg.html": [
+       "6652f543f47bf9b90159062c5a484b184b9aebc9",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/translate/reference/translate-in-svg-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "translate-optional-second-001.html": [
@@ -249921,6 +250042,19 @@
          {}
         ]
        ],
+       "table-row-height.html": [
+        "8ecc0dd454496a8bf67cbcbc6db719180a6e29af",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/tables/table-row-height-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "table-width-150percent.html": [
         "9a5e108505ed4543c892b1319b4638541bd78f17",
         [
@@ -266185,7 +266319,7 @@
      []
     ],
     "Makefile": [
-     "81ef75c4681410fbc2ca3bcf8514a340a47defa9",
+     "f7774341cb50ef3acb37b20d9d8874e8dd8edfea",
      []
     ],
     "README.md": [
@@ -283691,7 +283825,7 @@
      []
     ],
     "messages.json": [
-     "0feb59bd4caad4b5c557b86dadf31192baa0d2d8",
+     "e6504aa24b504af48904ccbd63724882c563f110",
      []
     ],
     "select": {
@@ -285198,7 +285332,7 @@
       []
      ],
      "script-src-strict_dynamic_hashes.html.headers": [
-      "f48fca3ec49dff99741b4ef9ac032f6a2e225519",
+      "0d824d8b0e1a1441cebd4f9a9a7265a9ca07c6dd",
       []
      ],
      "script-src-strict_dynamic_in_img-src.html.headers": [
@@ -304875,6 +305009,10 @@
       "f827ca7fd0b9f4e1e06334fcb475e38938a29237",
       []
      ],
+     "border-image-displayed-with-transparent-border-color-ref.html": [
+      "0d02257c6e6a193ceb6cc744f3a5e38fde56b5d0",
+      []
+     ],
      "border-image-outset-003-ref.html": [
       "4d55cddd1ccd4c128938b846704cfbcdd7776da5",
       []
@@ -305949,6 +306087,10 @@
       "6388a1864443571ea24e6174459c5205440ab030",
       []
      ],
+     "out-of-flow-in-multicolumn-019-ref.html": [
+      "8321333458316b7b1fe9df40a29abb81e585a1f0",
+      []
+     ],
      "reference": {
       "widows-001-ref.html": [
        "4f822f8fd67aed18355177a5e9de18d8a63f895e",
@@ -306048,7 +306190,7 @@
       []
      ],
      "META.yml": [
-      "a0e70aa6539e88373bc8615c3f4e1453010e85d5",
+      "287f1f32a77a69afee10c5f548b078f9a8ef0610",
       []
      ],
      "a98rgb-003-ref.html": [
@@ -306120,7 +306262,7 @@
       []
      ],
      "hex-003-ref.html": [
-      "613528e92604bd26d3cbce54445c68d653a588ea",
+      "dc7e324e0edbd096f5ac6a31346836377e366c8d",
       []
      ],
      "htaccess": [
@@ -310585,6 +310727,10 @@
       "2f40b6c49fdcee593a160c82c381d4c14f377a38",
       []
      ],
+     "table-item-flex-percentage-min-width-ref.html": [
+      "ee2cc9af5af24c42a73f8ff43a042c8f0717b47a",
+      []
+     ],
      "table-item-flex-percentage-width-ref.html": [
       "e598475fddf54274f93609de94b0f950618bc8e2",
       []
@@ -310631,6 +310777,10 @@
       "81109083b3c1b9408f5a61300b24ece61ede19ee",
       []
      ],
+     "advance-override-vertical-upright-ref.html": [
+      "811ad27f1e68df4f29752ec48f6c0d303d2329b3",
+      []
+     ],
      "alternates-order-ref.html": [
       "fdb477fe168c17d21f5eecaf4d6a7aa6de4581ae",
       []
@@ -317850,6 +318000,18 @@
        "2633ac41aa392da22d5c5b73c8013563947c3e21",
        []
       ],
+      "positioned-grid-items-negative-indices-001-ref.html": [
+       "2bbc3a95136e0e61191ec10fe5ff1ca901e799b9",
+       []
+      ],
+      "positioned-grid-items-negative-indices-002-ref.html": [
+       "a5ee066e8403f60cbe2c2cbaadacc789c71fde22",
+       []
+      ],
+      "positioned-grid-items-negative-indices-003-ref.html": [
+       "4e8e9a4314cbc6d35102ff52e073af22a9ec443d",
+       []
+      ],
       "positioned-grid-items-sizing-001-ref.html": [
        "cd0e378e3bf0e1d78ba9e3d1ba3035ea6d1d5458",
        []
@@ -329542,6 +329704,18 @@
        "svg-translate-relative-ref.html": [
         "bd22fefaaae97d6350ccf20069651cf70a4db84f",
         []
+       ],
+       "translate-and-transform-attribute-in-svg-ref.html": [
+        "1f60f3fcb0b2f45fadff1dcbb00643647ce35243",
+        []
+       ],
+       "translate-and-transform-css-property-in-svg-ref.html": [
+        "cce3f40477de4c697a6a5630c6bb76570abc29e5",
+        []
+       ],
+       "translate-in-svg-ref.html": [
+        "ed185a63b693c32bc68029b8006c459e3862ada3",
+        []
        ]
       }
      },
@@ -335600,7 +335774,7 @@
       []
      ],
      "computed-testcommon.js": [
-      "43851cb87fccb7d09cb985b294ae27d14317aedd",
+      "1db50b0c10702f456fecc4cac8a52a40873fd8b8",
       []
      ],
      "green.ico": [
@@ -337614,7 +337788,7 @@
       []
      ],
      "testharness.md": [
-      "7cf7f73a868e0a084bebb2c17757054773e5683f",
+      "49060bdd8e6cd7f29f851affdea83506cd6ca144",
       []
      ],
      "tools.md": [
@@ -338442,7 +338616,7 @@
       []
      ],
      "delete.js": [
-      "7fa2c4cfdfc46a7fc4e2f2294af3882cc7de3a68",
+      "138a749500b7a438811eec7f9c56f94e3436b421",
       []
      ],
      "fontname.js": [
@@ -338462,7 +338636,7 @@
       []
      ],
      "forwarddelete.js": [
-      "90310f8c2c8bc311ec799f1f36e8214773b99fe6",
+      "cc67b35c27e3ff9b7ef9c9de90d5073e5c79c246",
       []
      ],
      "hilitecolor.js": [
@@ -341426,7 +341600,7 @@
       []
      ],
      "activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html": [
-      "bc78e6e0538c4dd22a3563f1b56bc755d468e767",
+      "7d47e7ecb9b19364396c02365307bc7a08079651",
       []
      ],
      "activeelement-after-immediately-focusing-different-site-iframe-inner.html": [
@@ -341442,7 +341616,7 @@
       []
      ],
      "activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html": [
-      "bc78e6e0538c4dd22a3563f1b56bc755d468e767",
+      "7d47e7ecb9b19364396c02365307bc7a08079651",
       []
      ],
      "activeelement-after-immediately-focusing-same-site-iframe-inner.html": [
@@ -345628,7 +345802,7 @@
         []
        ],
        "dispatcher.py": [
-        "bdce9485f138f869ee6bb38efcdf68c20e71e26e",
+        "697d1de9775017e9cda316e1bbe457d0701b1e9c",
         []
        ],
        "executor.html": [
@@ -345821,10 +345995,6 @@
       "universal-worker.js": [
        "5d46edcde24c1854c19069d967038c493d7e24f0",
        []
-      ],
-      "worker-owner-frame.html": [
-       "092fed9604eac35e1ffd31b7c98bcbde5735d088",
-       []
       ]
      },
      "sandbox.https.html.headers": [
@@ -346054,7 +346224,7 @@
       },
       "resources": {
        "dispatcher.js": [
-        "ade25ee15327a4ee66b13a5874c3458121fc4762",
+        "45225a7f263de4ac7700febf2f99b91c473f8a8d",
         []
        ],
        "dispatcher.py": [
@@ -346062,7 +346232,7 @@
         []
        ],
        "executor.html": [
-        "e97e18aca4bd6fdff1181310aa2d543110980cc9",
+        "9f38ebe21592199aa4db6f1a4b6c17c1434cdb8b",
         []
        ],
        "redirect.py": [
@@ -350635,6 +350805,10 @@
         "e5279080f0875ef323774a4c1d83e4242f47b3fa",
         []
        ],
+       "table-row-height-ref.html": [
+        "63f882c68948fe188451412afe872c6aa36b817a",
+        []
+       ],
        "table-row-pagination-001-print-ref.html": [
         "2aa94109ad6db97080b978572e44e14f9d0ed52d",
         []
@@ -355899,7 +356073,7 @@
      []
     ],
     "cors-rfc1918.idl": [
-     "d392a679ff2cca25dae7ad406d6e57fd3ac25cef",
+     "b470f3f5a153f37ecf3607ee85e6ea2c511a237c",
      []
     ],
     "credential-management.idl": [
@@ -356303,7 +356477,7 @@
      []
     ],
     "sanitizer-api.tentative.idl": [
-     "129c2962b31039d2a579b510ffb53b39225e19ff",
+     "e130e4ecb05c46bc0c7c8519d3f10fb66d6e5af2",
      []
     ],
     "savedata.idl": [
@@ -356756,7 +356930,7 @@
     ]
    },
    "lint.ignore": [
-    "689b94586f4255629770c307f4b76280aee2ff46",
+    "bcf58ea5cfe0f668aef0087a398677f56e05f210",
     []
    ],
    "loading": {
@@ -357770,6 +357944,14 @@
      "239ad2bd08c21ca783b83cd0245951fecdab6a64",
      []
     ],
+    "test-1s.mp4": [
+     "76d6820007c2334e8abdbb65b7410fc1d38dfc19",
+     []
+    ],
+    "test-1s.webm": [
+     "772e264ff903d50cd66e11ba449438f2a92f59c8",
+     []
+    ],
     "test-a-128k-44100Hz-1ch.webm": [
      "c5b064deb9f8026bd11a3eb7148f7d33c09a1919",
      []
@@ -358534,7 +358716,7 @@
     },
     "resources": {
      "support.js": [
-      "bf7cf5a02468eb769c6493a8c5c79eebc455f292",
+      "69d5fc86c835bb4e79abdcfee1416d407ae823f3",
       []
      ]
     }
@@ -359588,7 +359770,7 @@
     },
     "resources": {
      "iframe-touch-action-none-subframe.html": [
-      "bcfb5e06588e67205e3039103086bcd05fb48c9c",
+      "0a894d4401e80a7e3528e38e16a06b0cdcbf7acd",
       []
      ],
      "pointerevent_attributes_hoverable_pointers-iframe.html": [
@@ -359895,7 +360077,7 @@
      []
     ],
     "link-header-preload.html.headers": [
-     "83758fb9cdc128d291b96c2a9a7e8abb3958dc64",
+     "7ab20ab8d7fd029045193277896610e921b4201d",
      []
     ],
     "preload-in-data-doc-ref.html": [
@@ -361685,7 +361867,7 @@
    },
    "resource-timing": {
     "CodingConventions.md": [
-     "461cae421e66c34c17171f33f15933b4f99afe6d",
+     "e8cb33a51e49a8c4b2b20da93d7156a52d17ad16",
      []
     ],
     "META.yml": [
@@ -363986,6 +364168,14 @@
        "e6597ccb8acb0dceb4a990c3148debe3c4ff8f21",
        []
       ],
+      "basic-module-2.js": [
+       "189b1c87fee75c86ca08351872e402b84b8b844f",
+       []
+      ],
+      "basic-module.js": [
+       "789a89bc630847e4cdc115f0d29f103c97bedeeb",
+       []
+      ],
       "blank.html": [
        "a3c3a4689a62b45b1e429f6b7a94690e556a1259",
        []
@@ -364506,6 +364696,10 @@
        "d8a94ad46befb085791d13f21e6870e09284abe0",
        []
       ],
+      "import-echo-cookie-worker-module.py": [
+       "8f0b68e5a3aae677ff0181e8c536dab88d65a838",
+       []
+      ],
       "import-echo-cookie-worker.js": [
        "f5eac9508c9a2b533c6af11682ac24e3621ca5d6",
        []
@@ -364746,6 +364940,10 @@
        "ef0ed8fc704ceaa81f1eef8d4ed75fd041baae6d",
        []
       ],
+      "no-dynamic-import.js": [
+       "ecedd6c5d75c7d667543a2cbd2ea849194d31bc8",
+       []
+      ],
       "notification_icon.py": [
        "da479fcd9b8352e21f95695b990d4efdac3b055b",
        []
@@ -367480,7 +367678,7 @@
       []
      ],
      "sourcefile.py": [
-      "5b99f90e458a29906b13eec0ba0ab9a4f6e0d493",
+      "34e679eb8b73b755223c783d7527ac630f032083",
       []
      ],
      "testpaths.py": [
@@ -367591,7 +367789,7 @@
      []
     ],
     "requirements_mypy.txt": [
-     "5df717758aaabeb2b871b91d9bfd50952cfc6667",
+     "1c850658579c333fa509678d096b826b60de1373",
      []
     ],
     "runner": {
@@ -367684,7 +367882,7 @@
       []
      ],
      "serve.py": [
-      "644a8a93f704f0632759777af841aff2a8bbeee3",
+      "8e1aaa8dc73c1a7447a6e63d0b9603a9a0b97097",
       []
      ],
      "test_functional.py": [
@@ -375649,7 +375847,7 @@
        []
       ],
       "test_wpt.py": [
-       "eb0377760c77795ac65a37b28ee2d3e407469a40",
+       "32e3e2a70b9f6a1f4d332f85f1c3a369813a233d",
        []
       ]
      },
@@ -376652,7 +376850,7 @@
         []
        ],
        "test_handlers.py": [
-        "0acfac4d1945f7ee6ef7ae91a468cd5583a57162",
+        "1dc2a9ba7bb3e56e8fdd6268d96e3d412ef8ac5b",
         []
        ],
        "test_input_file.py": [
@@ -377328,7 +377526,7 @@
       []
      ],
      "urltestdata.json": [
-      "f55a40338a30ddfbac47f84457dc89f2db628acc",
+      "b136020e8ba8ea1d0c8ce93e3847d5d9152ec2c2",
       []
      ]
     }
@@ -377336,7 +377534,7 @@
    "urlpattern": {
     "resources": {
      "urlpatterntestdata.json": [
-      "fe38505ddf0f985772d356fd05a9d5652982c7cc",
+      "a4b2c3281f0a057e1d0ce0a73b6e87b8ac5f348d",
       []
      ]
     }
@@ -377743,12 +377941,16 @@
      []
     ],
     "resources": {
+     "check-sec-fetch-dest-header-and-return-bundle.py": [
+      "da36e49320369ddc94405d298746db562be50045",
+      []
+     ],
      "cross-origin-no-cors.har": [
-      "983024bf63f462549052e33b39d46215525c45ea",
+      "c31a0963fd3fe3150623620ebe8a8a8664e75a73",
       []
      ],
      "cross-origin.har": [
-      "2197dea3beb6b7672e14458e0a8941b93652191e",
+      "2c33449cbe25b65087962518615635a8dfc8ad1f",
       []
      ],
      "dynamic1": {
@@ -377796,7 +377998,7 @@
       ]
      },
      "generate-test-wbns.sh": [
-      "36a8078194f0c73768ec5024e6029f7ad0b71745",
+      "3c244398e2a122b79f13c3e0f579e6a692ccd3df",
       []
      ],
      "location": {
@@ -377811,7 +378013,7 @@
      },
      "nested": {
       "nested-sub.wbn": [
-       "eabd994ff8bceaf4ef52b329b4faa158c292af12",
+       "7041160d30f7a09d3414aa35a6b4df1513f3a9e4",
        []
       ],
       "resource.js": [
@@ -377926,7 +378128,7 @@
         []
        ],
        "cross-origin.wbn": [
-        "8043ba7df2dacb0d0b1cbdce27da0a43d0390d52",
+        "942ddb6d348c92d8b32a9936002328f1f527a680",
         []
        ]
       },
@@ -377957,23 +378159,23 @@
        ]
       },
       "dynamic1-crossorigin.wbn": [
-       "597b6ee90be8094535a6e0bade4c7cbb22ba61a2",
+       "ab96d3597efa1d7686b4d86ed3db934a66635d0d",
        []
       ],
       "dynamic1.wbn": [
-       "9ba161e20558c1f34c902bfd11b2e2f872a01213",
+       "2fb02b199197d39546844b22336f983864f3cabc",
        []
       ],
       "dynamic2.wbn": [
-       "798da2e499dd07a2e185b6b7be41e84e88c75c4b",
+       "6698b37b1735fd600ab05b1a63229b1767f5130d",
        []
       ],
       "location.wbn": [
-       "f2b1e5333bdcaf88ed8b40246caeb57c3b1be8df",
+       "9a3045880867c665d2a83edeb9f67da9e6745407",
        []
       ],
       "nested-main.wbn": [
-       "1f9278148313ad4b401a1025b5396a5b9bd60ff3",
+       "cceb3e36fbc14cdc83843d635d480a7c42623acc",
        []
       ],
       "no-cors": {
@@ -377982,12 +378184,12 @@
         []
        ],
        "cross-origin.wbn": [
-        "7004673039a7de46bff23eeb7b7f3f2dd3848f6a",
+        "4ceb691a9f2b425cfa31a83a6d24a1c37326ded4",
         []
        ]
       },
       "path-restriction.wbn": [
-       "e861469e122afd141bcec8d394a0d4504898208c",
+       "66381aaaf416c034eb09eafb1cab0dd80afbf0aa",
        []
       ],
       "static-element": {
@@ -378035,11 +378237,11 @@
        }
       },
       "static-element.wbn": [
-       "112f4f363f48d4985a449b3e9b245b03bd9d7573",
+       "e58aa20a0da1b7afa935acc163e594727d49acd8",
        []
       ],
       "subresource.wbn": [
-       "eabd994ff8bceaf4ef52b329b4faa158c292af12",
+       "7041160d30f7a09d3414aa35a6b4df1513f3a9e4",
        []
       ],
       "urn-uuid.wbn": [
@@ -379263,7 +379465,7 @@
      []
     ],
     "RTCPeerConnection-helper.js": [
-     "cdfe63e792c6f7bcaa3d23a987d2fa7a8e87db97",
+     "1521277418fabddf5c11e79114e4c9fa41320f8b",
      []
     ],
     "RTCPeerConnection-perfect-negotiation-helper.js": [
@@ -382397,7 +382599,7 @@
        []
       ],
       "export-on-load-script.py": [
-       "6cca411e8a85a7fa0d78ced6b32011bda890b7c3",
+       "901434191538a68e41570d8a794155c4e7f671c3",
        []
       ],
       "export-on-static-import-script.js": [
@@ -402547,6 +402749,13 @@
        {}
       ]
      ],
+     "subsumption_algorithm-source_list-wildcards.html": [
+      "0f77a4462137eea13334a4b69e48804f31731e44",
+      [
+       null,
+       {}
+      ]
+     ],
      "subsumption_algorithm-strict_dynamic.html": [
       "424e1bf9bab35f9a6ab264374e753e3f868c5b1e",
       [
@@ -403117,7 +403326,7 @@
       ]
      ],
      "generic-0_8_1.sub.html": [
-      "a0b74160c4ffe1ba1f1513cd3ed0df8835d551f2",
+      "c326af0e5465b6981f556ff5ddf44e12cf4b7b0a",
       [
        null,
        {}
@@ -404442,7 +404651,7 @@
       ]
      ],
      "script-src-strict_dynamic_hashes.html": [
-      "acb9f00d80809de50132c7a5af761d8bbfd3235a",
+      "e4ce1e59446b1e1ed4ad3aa43c46a46d6ce333d1",
       [
        null,
        {}
@@ -413222,6 +413431,13 @@
      ]
     },
     "css-fonts": {
+     "advance-override-serialization.html": [
+      "0e23d21e00bd6c2b3f2c1b60a555f04f99f3e6ed",
+      [
+       null,
+       {}
+      ]
+     ],
      "animations": {
       "font-size-adjust-interpolation.html": [
        "fd89da3b969c2ad2f8fb522c600bddc740d8146b",
@@ -419090,6 +419306,34 @@
        null,
        {}
       ]
+     ],
+     "scrollbar-gutter-001.html": [
+      "fe1e95482857613cfbcee112c8fbfb7e42b5aaf0",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-rtl-001.html": [
+      "446195098e240f9cfccde79f72e5c98388909b62",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-vertical-lr-001.html": [
+      "27ac8f4c39362641a51b6a914494ab61ee1b4571",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-vertical-rl-001.html": [
+      "d4eab0bd698c8c587be6b1707abdbdc7d4769a88",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-overscroll-behavior": {
@@ -423014,6 +423258,13 @@
        {}
       ]
      ],
+     "chrome-rowspan-bug.html": [
+      "faf54671cf98634ba2a3ae10533dd108b5f8bb11",
+      [
+       null,
+       {}
+      ]
+     ],
      "column-track-merging.html": [
       "6dba9e6f6079863a7b810715b2e2fcdc0952c38d",
       [
@@ -423306,6 +423557,13 @@
         {}
        ]
       ],
+      "col-collapse-table-size.html": [
+       "a28a1e204a9d81a0c048b47a1c08d46bc9d958d2",
+       [
+        null,
+        {}
+       ]
+      ],
       "colspan-redistribution.html": [
        "e440728e1004bc952a5725bc50206b316a8e7450",
        [
@@ -423327,6 +423585,13 @@
         {}
        ]
       ],
+      "table-fixed-minmax.html": [
+       "7c15b2a749dce5419e26784a585c540051c3799c",
+       [
+        null,
+        {}
+       ]
+      ],
       "table-height-redistribution.html": [
        "9c587e31b4f638abbc3733cf9ab1acfe28c77b7c",
        [
@@ -425500,6 +425765,13 @@
       ]
      },
      "tab-size": {
+      "tab-size-computed-value-001.html": [
+       "3eb94c54d3b1415b119749ef8a43c37536ea5089",
+       [
+        null,
+        {}
+       ]
+      ],
       "tab-size.html": [
        "d9b1b57fec50a19de45a471cd8682feff3a326f5",
        [
@@ -426248,7 +426520,7 @@
        ]
       ],
       "scale-parsing-valid.html": [
-       "9055e7dfd5f4b9ea03683ff546317198f7946c3a",
+       "46bb91c8ba055f4b29a96d2c088a1509dd06d5b3",
        [
         null,
         {}
@@ -429940,6 +430212,13 @@
        {}
       ]
      ],
+     "calc-infinity-nan-computed.html": [
+      "7443ddb645c5defda1b81ed8caea3febe9f32469",
+      [
+       null,
+       {}
+      ]
+     ],
      "calc-infinity-nan.html": [
       "1feadcd9849a9e97caf3ec6d09aa3ab586f40f3e",
       [
@@ -434614,7 +434893,14 @@
       ]
      ],
      "user-invalid.html": [
-      "05cf2b679039c61732054217cf562bfeb7c3d23a",
+      "1f3ad22a231a5dd8c8b5ed663c454cc9396cee61",
+      [
+       null,
+       {}
+      ]
+     ],
+     "user-valid.html": [
+      "36ca7afe14116389ba960c0e30ec3a71d57ed55e",
       [
        null,
        {}
@@ -464090,7 +464376,7 @@
      ]
     ],
     "activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html": [
-     "4cb3c68db63b907013f42ff4c1bad3af1e172345",
+     "8c3a9d119576aaca24209f938b989fb920329648",
      [
       null,
       {}
@@ -464104,7 +464390,7 @@
      ]
     ],
     "activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html": [
-     "81dbfd28d038723f08f33af989162141cfd184bc",
+     "2f6a8ac853c029cb6e6ea74fa20e084717b0e406",
      [
       null,
       {}
@@ -485926,6 +486212,34 @@
         null,
         {}
        ]
+      ],
+      "image.tentative.https.html": [
+       "d0cbf472a3ce07781457967c385eb73503922f0b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "link.tentative.https.html": [
+       "17085d0faceb33b7ddd3a3d6fd0a6df4e44f5297",
+       [
+        null,
+        {}
+       ]
+      ],
+      "script.tentative.https.html": [
+       "b6ec0b96386372c19a2d10f429eb0a8c54406d84",
+       [
+        null,
+        {}
+       ]
+      ],
+      "video.tentative.https.html": [
+       "04c050df795c54a93ef337bdb83c80a7e1d74f89",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "cross-origin-isolated-permission.https.html": [
@@ -486059,15 +486373,6 @@
        }
       ]
      ],
-     "reporting-to-owner.https.html": [
-      "03f7b3197dab5c4b97c0bfd91836ec3018c92443",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
      "require-corp-about-blank.https.html": [
       "945333b83d54cf2148070f1a842e11155a14434c",
       [
@@ -489967,6 +490272,13 @@
          {}
         ]
        ],
+       "picture-aspect-ratio.html": [
+        "3f4221b7148bbbb4a2fa6a695bf37c583ebd164d",
+        [
+         null,
+         {}
+        ]
+       ],
        "video-aspect-ratio.html": [
         "bfa91081e26ac8dc755262ecee5e87a876461dce",
         [
@@ -494762,7 +495074,7 @@
         ]
        ],
        "invisible-image.html": [
-        "ee9ae25e402e81a8ec6591532e4715a59ea1ecf6",
+        "35ebbaa11a54ac3045a14d6481cb8c0dd5beb418",
         [
          null,
          {}
@@ -495054,6 +495366,13 @@
          null,
          {}
         ]
+       ],
+       "video_size_preserved_after_ended.html": [
+        "9b2783c930ac23ba3ffe9e3b58585da31ca1f9f3",
+        [
+         null,
+         {}
+        ]
        ]
       }
      },
@@ -512856,7 +513175,7 @@
      ]
     ],
     "close_sync.tentative.https.any.js": [
-     "f2de6d571a4c2817f778fe145475e296ecde1c8b",
+     "a0abf5ca4e05f9d7d5d3e241adb131ed4dc6bb40",
      [
       "native-io/close_sync.tentative.https.any.worker.html",
       {
@@ -513411,7 +513730,7 @@
      ]
     },
     "delete_async_basic.tentative.https.any.js": [
-     "84da14b005ad0deabad165146e5089315c29417a",
+     "149ce2a63f4fbffd0bccf2e31dad5fe3877c4e3e",
      [
       "native-io/delete_async_basic.tentative.https.any.html",
       {
@@ -513474,7 +513793,7 @@
      ]
     ],
     "delete_sync_basic.tentative.https.any.js": [
-     "55c113acbed4e219a5ccebc0c7b868102f6b6efe",
+     "49a8292c55c0d9e59c40515612867e80c1a6c3db",
      [
       "native-io/delete_sync_basic.tentative.https.any.worker.html",
       {
@@ -513492,7 +513811,7 @@
      ]
     ],
     "flush_async_basic.tentative.https.any.js": [
-     "2202e55621506cee0598740d3d76b220f1259e90",
+     "9219725c4c2aec5a6c4e41f2eb593027a5a7369c",
      [
       "native-io/flush_async_basic.tentative.https.any.html",
       {
@@ -513591,7 +513910,7 @@
      ]
     ],
     "flush_sync_basic.tentative.https.any.js": [
-     "c5a1268e0d2154058cf3e13e83dfeaddd7db82f7",
+     "4aa22267f61026b0a8d2f137c01bb47a718b4c7f",
      [
       "native-io/flush_sync_basic.tentative.https.any.worker.html",
       {
@@ -513613,7 +513932,7 @@
      ]
     ],
     "getLength_setLength_async_basic.tentative.https.any.js": [
-     "f99d2875fc0009ff49eb95dc9958402c08261189",
+     "38ebcc29409dbf4a950039277608bef2a82cccab",
      [
       "native-io/getLength_setLength_async_basic.tentative.https.any.html",
       {
@@ -513692,7 +514011,7 @@
      ]
     ],
     "getLength_setLength_sync_basic.tentative.https.any.js": [
-     "f65cd44510ef09c91e3e813f85001836050c36f7",
+     "28057c9db7e7e17271d1b7803949a07e2bac1e06",
      [
       "native-io/getLength_setLength_sync_basic.tentative.https.any.worker.html",
       {
@@ -513714,7 +514033,7 @@
      ]
     ],
     "open_getAll_async_basic.tentative.https.any.js": [
-     "0487ef5e2f2f2908b82d78994ba2675cf9e1c2df",
+     "6cb7704003c83bacf09d7ffa48999a0d188f6cbb",
      [
       "native-io/open_getAll_async_basic.tentative.https.any.html",
       {
@@ -513777,7 +514096,7 @@
      ]
     ],
     "open_getAll_sync_basic.tentative.https.any.js": [
-     "fc73a0471cf05c74599aca3de6830c359e2f0366",
+     "dd7d029fb0d3fbfae4ceea20b0b1ed8565794a71",
      [
       "native-io/open_getAll_sync_basic.tentative.https.any.worker.html",
       {
@@ -513795,7 +514114,7 @@
      ]
     ],
     "read_write_async_basic.tentative.https.any.js": [
-     "cf2a3f56bc5db287b43c4b8c1ad81b6ed4ba8720",
+     "a0273242144fffc1ac9948fddbf89616bb02bc2a",
      [
       "native-io/read_write_async_basic.tentative.https.any.html",
       {
@@ -513858,7 +514177,7 @@
      ]
     ],
     "read_write_sync_basic.tentative.https.any.js": [
-     "d46e0120b68d6deca1fe675dde7dfefba5c0e797",
+     "61c5e3f3225f01ac3e23109dceab6c7f0146fde2",
      [
       "native-io/read_write_sync_basic.tentative.https.any.worker.html",
       {
@@ -513876,7 +514195,7 @@
      ]
     ],
     "rename_async_basic.tentative.https.any.js": [
-     "8829b5b3104df0139afccb580758eab135e253ff",
+     "47c9ffc6b919417dfbc47499b8029d13788cd8bf",
      [
       "native-io/rename_async_basic.tentative.https.any.html",
       {
@@ -513939,7 +514258,7 @@
      ]
     ],
     "rename_async_failure_handling.tentative.https.any.js": [
-     "125f49cdf895b7660c7371a9933dc5daf2300cf7",
+     "546ba7a9ecc7c906ce7d276251fdcf49d687b304",
      [
       "native-io/rename_async_failure_handling.tentative.https.any.html",
       {
@@ -514038,7 +514357,7 @@
      ]
     ],
     "rename_sync_basic.tentative.https.any.js": [
-     "af04885dfd72cd864f192d8f96602bc4c2fed206",
+     "e5183143c3b1179fc0812c799a209cd666193a6b",
      [
       "native-io/rename_sync_basic.tentative.https.any.worker.html",
       {
@@ -514056,7 +514375,7 @@
      ]
     ],
     "rename_sync_failure_handling.tentative.https.any.js": [
-     "8097932f23ac7c6b2ef090cfec9d003a25f01d8a",
+     "b86efa8acd02a693375a35f209153a11cafc58ed",
      [
       "native-io/rename_sync_failure_handling.tentative.https.any.worker.html",
       {
@@ -514179,7 +514498,7 @@
      ]
     ],
     "trustworthy_origin_failure.tentative.http.any.js": [
-     "ae01ac420158ef1f9633f8ef8f6c5f4e15d9cb0a",
+     "42637160937582a13a06137da70b23ce70c3c26b",
      [
       "native-io/trustworthy_origin_failure.tentative.http.any.html",
       {
@@ -514212,7 +514531,7 @@
      ]
     ],
     "write_getLength_async_basic.tentative.https.any.js": [
-     "bf886cca3973087527ef6eb747794d7dba72c28b",
+     "5fb48acb42f2bb70cb16e625911f01c6e164cd59",
      [
       "native-io/write_getLength_async_basic.tentative.https.any.html",
       {
@@ -514275,7 +514594,7 @@
      ]
     ],
     "write_getLength_sync_basic.tentative.https.any.js": [
-     "e0fead326a5718af1acb3cb2b37f587b7dc0042b",
+     "72b70fa69cd2fac663b61ee22be8eef057d92013",
      [
       "native-io/write_getLength_sync_basic.tentative.https.any.worker.html",
       {
@@ -518287,7 +518606,7 @@
      ]
     ],
     "pointerevent_iframe-touch-action-none_touch.html": [
-     "1c9651d8c162ff1ea71677f8fd3296c5c65fcad9",
+     "109aec8dcd38cfadd8d8055b0a9b7d3b5a6dc791",
      [
       null,
       {
@@ -518349,6 +518668,30 @@
       }
      ]
     ],
+    "pointerevent_movementxy.html": [
+     "cb69c5c95e013190961a765b806ef7569d245fed",
+     [
+      "pointerevents/pointerevent_movementxy.html?mouse",
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ],
+     [
+      "pointerevents/pointerevent_movementxy.html?pen",
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ],
+     [
+      "pointerevents/pointerevent_movementxy.html?touch",
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
     "pointerevent_on_event_handlers.html": [
      "d8cfa7a0f4c482be606e4e98f9a7900a0340a477",
      [
@@ -518961,16 +519304,6 @@
        }
       ]
      ],
-     "pointerevent_movementxy.html": [
-      "eb944460192cfd3a3ef1e11d6ab1f58efbb8983b",
-      [
-       null,
-       {
-        "testdriver": true,
-        "timeout": "long"
-       }
-      ]
-     ],
      "pointerevent_movementxy_with_pointerlock.html": [
       "00a2b85f597f20e99192df199fc4e1565d85f9d8",
       [
@@ -519492,7 +519825,7 @@
      ]
     ],
     "link-header-preload.html": [
-     "8ad528d0e7c46cc7613461665f0eafed472f54c9",
+     "f4a819be8e9d5091d02f1d5c69a8828d1ffc60a5",
      [
       null,
       {}
@@ -535796,7 +536129,7 @@
       ]
      ],
      "credentials.https.html": [
-      "9d615eda1dd8c7b994ad8aa20cfe2bcacade4da8",
+      "0a90dc2897c27323682a6e16bfd6aaa5370855e0",
       [
        null,
        {}
@@ -536252,13 +536585,6 @@
        {}
       ]
      ],
-     "import-module-scripts.https.html": [
-      "7bca8de64f5bc9664911bd1c5dc883567681afb8",
-      [
-       null,
-       {}
-      ]
-     ],
      "import-scripts-cross-origin.https.html": [
       "773708a9fbce32a6b17f22d88b9fb6ebc3553710",
       [
@@ -536522,6 +536848,34 @@
        {}
       ]
      ],
+     "no-dynamic-import-in-module.any.js": [
+      "84b17629ccddc984003f266d6a0d1bee09d29c5a",
+      [
+       "service-workers/service-worker/no-dynamic-import-in-module.any.serviceworker-module.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "serviceworker-module"
+         ]
+        ]
+       }
+      ]
+     ],
+     "no-dynamic-import.any.js": [
+      "25b370b7094bf8f92cc347693c9ac5a1fa664845",
+      [
+       "service-workers/service-worker/no-dynamic-import.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "serviceworker"
+         ]
+        ]
+       }
+      ]
+     ],
      "onactivate-script-error.https.html": [
       "f5e80bb9a456bc57f2a821e1fd69114e6ae8638a",
       [
@@ -547988,6 +548342,15 @@
         "timeout": "long"
        }
       ]
+     ],
+     "mousemove_prevent_default_action.tentative.html": [
+      "b87385d79c5c20aed8c1ce79465c532d36e10908",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
      ]
     },
     "order-of-events": {
@@ -548028,6 +548391,69 @@
         }
        ]
       ],
+      "click-on-body.html": [
+       "45453c75ca89356f750af873ba4dce2f42d03425",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "click-on-div.html": [
+       "bf06d8251cf6c956b2a1c351d2f6a45cd449bea3",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "click-on-html.html": [
+       "e93acc674970f62cf835a43d57731044dd0aa0c6",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "click-order.html": [
+       "1285a31efc69022cebafc67cd4a9b291149f3f0a",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "mouseevents-mousemove.htm": [
+       "98a35bbcf6b74a748a3f7d32f5eadcff7c500978",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "mousemove-across.html": [
+       "52d5a93cf9afe7e4963b8c3f6902e9f3456e17d9",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "mousemove-between.html": [
+       "1ddab541586b3990dec003314887865e0427b539",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "mouseover-out.html": [
        "f10518c7f15fb60e43eee66f15dd39c1fe843f17",
        [
@@ -554926,71 +555352,85 @@
    },
    "web-bundle": {
     "subresource-loading": {
-     "link-web-bundle.tentative.html": [
-      "2f10cd6b3fdd4dd94dc5767df663583cd8d81071",
+     "link-web-bundle-no-secure.tentative.html": [
+      "439a6ff9c37c4f35fcb26d680f57344c0e5d64cf",
       [
        null,
        {}
       ]
      ],
-     "subframe-from-web-bundle.tentative.html": [
+     "link-web-bundle.https.tentative.html": [
+      "74460d0d8c77ee875074dd395ac6738feacf7647",
+      [
+       null,
+       {}
+      ]
+     ],
+     "subframe-from-web-bundle.https.tentative.html": [
       "f6f2b769d0f1230f225c8625a3982fea1bd4b15e",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-cors-error.tentative.html": [
-      "1ea96fa0fdd412d2bdcd811b6ee503ad09689118",
+     "subresource-loading-cors-error.https.tentative.html": [
+      "306ccb4ba2ff65720c8ddc92f3662ea67aae498b",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-cors.tentative.html": [
-      "79201154a149127eb92af610700d91d9e5de9799",
+     "subresource-loading-cors.https.tentative.html": [
+      "e65c50c9d1623608821aa40a9cd5dab21e03e49f",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-credential.tentative.sub.html": [
-      "7b9fa7aee7a079deaf34018ef377dc781f3c028f",
+     "subresource-loading-credential.https.tentative.sub.html": [
+      "61e073fab7d095003ad4213fe4b89008a1e5111b",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-from-web-bundle.tentative.html": [
-      "6f38f145bc8795c51961e08fdf09ea4e590d26eb",
+     "subresource-loading-from-web-bundle.https.tentative.html": [
+      "77985fcb51b9347ce3d5923937367c6e1701cea1",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-nested-bundle.tentative.html": [
-      "acca096bfbda306edc42a0deaef434b34ddd509b",
+     "subresource-loading-nested-bundle.https.tentative.html": [
+      "b1b25624e0d2cd884f84d2eefbaabe738849b0bf",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-path-restriction.tentative.html": [
-      "706bfb97b1142833380024c3f969b1b3b2756ec1",
+     "subresource-loading-path-restriction.https.tentative.html": [
+      "f7b50095652ae462f8cf524cded09718e92811d6",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-static-element-with-base.tentative.html": [
-      "338782697d20f9663b4a11189ea8ff68a3617b21",
+     "subresource-loading-request-destination.https.tentative.sub.html": [
+      "3d494241246bc00f10a55a32a9d5dad92fec38d6",
       [
        null,
        {}
       ]
      ],
-     "subresource-loading-static-element.tentative.html": [
-      "d8d60a93081a96fbd2a6c63f2751be1d966f09bf",
+     "subresource-loading-static-element-with-base.https.tentative.html": [
+      "d0a60a2f121de9ef59f682218c2fc0797f0932b0",
+      [
+       null,
+       {}
+      ]
+     ],
+     "subresource-loading-static-element.https.tentative.html": [
+      "25a9f00faba14b69f9325eafa9d89bbd6cbfe7a2",
       [
        null,
        {}
@@ -558296,7 +558736,7 @@
      ]
     ],
     "audio-encoder.any.js": [
-     "322a7d4077e97fe65468ad61ed0d465c95d294b8",
+     "4656ff0310193788c429b472779bebbc31da3a93",
      [
       "webcodecs/audio-encoder.any.html",
       {
@@ -559764,7 +560204,7 @@
      ]
     ],
     "RTCDtlsTransport-state.html": [
-     "33d49677c496ddaddb60e5ecbc25ec654ebcdda2",
+     "ca49fcc95f297e07889ecf32c21a35b9e311b68b",
      [
       null,
       {}
@@ -559824,7 +560264,7 @@
      ]
     ],
     "RTCPeerConnection-addIceCandidate-connectionSetup.html": [
-     "11fc4e4fa0c222df4e1469a5258295bf3703523c",
+     "d2cde593640451f4317cb09cba1442bb1c028222",
      [
       null,
       {}
@@ -559970,7 +560410,7 @@
      ]
     ],
     "RTCPeerConnection-iceConnectionState.https.html": [
-     "320b03dfc80f8e7e4a20d9e243b9cc87c88881c7",
+     "5083be6cdfd16f5c2c67a80a7dbc9c2401f1a0a8",
      [
       null,
       {
@@ -560096,7 +560536,7 @@
      ]
     ],
     "RTCPeerConnection-restartIce.https.html": [
-     "dc5e1674576e8cbf1404fcd7c5d440d24c943f43",
+     "0e4ecf64c853fce9d4e4a66856f2a060f2bdbb34",
      [
       null,
       {}
@@ -560413,7 +560853,7 @@
      ]
     ],
     "RTCRtpTransceiver.https.html": [
-     "c9dce45d73884bce74f164ba306ce67bcc739205",
+     "77323b503abd7dc12e5894abce28da57a9b9e913",
      [
       null,
       {
@@ -560464,14 +560904,14 @@
      ]
     ],
     "datachannel-emptystring.html": [
-     "456bac7367e6f9034f83bbee6998313b789b8c0d",
+     "a9741c143f5e399abd334a54f5227a09c43396f3",
      [
       null,
       {}
      ]
     ],
     "getstats.html": [
-     "0950a374c3cd8a44cbb8bffc2991fc6dc95417c8",
+     "d6a692bb7860b9c6bd7699ba4e99ea8010922c08",
      [
       null,
       {}
@@ -560544,14 +560984,14 @@
      ]
     },
     "no-media-call.html": [
-     "b1eba08d0b433c60c6332199cd35294847028a0c",
+     "9d2598518da4bbbcb7ac78026b0737d40dcc09ed",
      [
       null,
       {}
      ]
     ],
     "promises-call.html": [
-     "8b9a27554973531e8528406a52d38b7c55932f3c",
+     "ee64b463ee22aca1b68e6875e124425c9e43743f",
      [
       null,
       {}
@@ -560684,7 +561124,7 @@
       ]
      ],
      "split.https.html": [
-      "5eb8329517fbefe94682fe791ae81769d03da197",
+      "3fc3bda2a52cf7190c01ab4d8926d75d3d4fd85d",
       [
        null,
        {}
@@ -560722,14 +561162,14 @@
      ]
     ],
     "simplecall-no-ssrcs.https.html": [
-     "5160451f012e642dd5697e034a19a7f8895421ea",
+     "f2e20846234bb4703d23c876f468994dcd74be30",
      [
       null,
       {}
      ]
     ],
     "simplecall.https.html": [
-     "ffe043b6a237fae1a4f70e2cfac495a2a6132c28",
+     "dbf6b9a5083a87feeeb3d93befa0a06017be8553",
      [
       null,
       {}
@@ -560991,6 +561431,15 @@
        ]
       }
      ]
+    ],
+    "supported-stats.html": [
+     "fd08a16b11ec3dfabaad5af70b8f38255226c5a9",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
     ]
    },
    "webrtc-svc": {
@@ -568768,7 +569217,7 @@
       ]
      ],
      "general.any.js": [
-      "8906350a7e8d4a3fe339a363a93a1baab50290c8",
+      "cb5d61eafbece7174e3d1fc5f3f6065076086834",
       [
        "workers/examples/general.any.serviceworker.html",
        {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-color/hsl-008.html.ini b/tests/wpt/metadata/css/css-color/hsl-008.html.ini
new file mode 100644
index 00000000000..f6800f69984
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/hsl-008.html.ini
@@ -0,0 +1,2 @@
+[hsl-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rgba-004.html.ini b/tests/wpt/metadata/css/css-color/rgba-004.html.ini
new file mode 100644
index 00000000000..119e9824653
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rgba-004.html.ini
@@ -0,0 +1,2 @@
+[rgba-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-item-flex-percentage-min-width.html.ini b/tests/wpt/metadata/css/css-flexbox/table-item-flex-percentage-min-width.html.ini
new file mode 100644
index 00000000000..219a9e04af7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-item-flex-percentage-min-width.html.ini
@@ -0,0 +1,2 @@
+[table-item-flex-percentage-min-width.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/advance-override-serialization.html.ini b/tests/wpt/metadata/css/css-fonts/advance-override-serialization.html.ini
new file mode 100644
index 00000000000..ee4c6f21e11
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/advance-override-serialization.html.ini
@@ -0,0 +1,10 @@
+[advance-override-serialization.html]
+  [One parameter should be serialized as one parameter]
+    expected: FAIL
+
+  [Two different parameters should be serialized as two parameters]
+    expected: FAIL
+
+  [Two identical parameters should be simplified into one parameter]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/advance-override-vertical-upright.html.ini b/tests/wpt/metadata/css/css-fonts/advance-override-vertical-upright.html.ini
new file mode 100644
index 00000000000..54e70a100a5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/advance-override-vertical-upright.html.ini
@@ -0,0 +1,2 @@
+[advance-override-vertical-upright.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/tab-size/tab-size-computed-value-001.html.ini b/tests/wpt/metadata/css/css-text/tab-size/tab-size-computed-value-001.html.ini
new file mode 100644
index 00000000000..681cae172e5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/tab-size/tab-size-computed-value-001.html.ini
@@ -0,0 +1,34 @@
+[tab-size-computed-value-001.html]
+  [testing tab-size: 4]
+    expected: FAIL
+
+  [testing tab-size: 0.5in]
+    expected: FAIL
+
+  [testing tab-size: 2.54cm]
+    expected: FAIL
+
+  [testing tab-size: 25.4mm]
+    expected: FAIL
+
+  [testing tab-size: 18pt]
+    expected: FAIL
+
+  [testing tab-size: 5pc]
+    expected: FAIL
+
+  [testing tab-size: 101.6Q]
+    expected: FAIL
+
+  [testing tab-size: 7px]
+    expected: FAIL
+
+  [testing tab-size: 1em]
+    expected: FAIL
+
+  [testing tab-size: 2ex]
+    expected: FAIL
+
+  [testing tab-size: 3rem]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-values/calc-infinity-nan-computed.html.ini b/tests/wpt/metadata/css/css-values/calc-infinity-nan-computed.html.ini
new file mode 100644
index 00000000000..c7015794c9a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-values/calc-infinity-nan-computed.html.ini
@@ -0,0 +1,46 @@
+[calc-infinity-nan-computed.html]
+  [Property width value 'calc(NaN * 1px)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1cm)']
+    expected: FAIL
+
+  [Property width value 'calc(NaN * 1rem)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px - infinity * 1%)']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px + infinity * 1%)']
+    expected: FAIL
+
+  [Property width value 'calc(min(NaN * 1px, infinity * 1px) + max(infinity * 1px, -infinity * 1px))']
+    expected: FAIL
+
+  [Property width value 'calc(infinity * 1px - max(infinity * 1%, 0%))']
+    expected: FAIL
+
+  [Property width value 'calc(max(infinity * 1px, 10px))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1px)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(min(1px, -infinity * 1%))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1%)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(max(10000px, 0px) + min(-infinity * 1px, infinity * 1px))']
+    expected: FAIL
+
+  [Property margin-left value 'calc(-infinity * 1px - infinity * 1px)']
+    expected: FAIL
+
+  [Property margin-left value 'calc(min(-infinity * 1px, 10px))']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/selectors/user-valid.html.ini b/tests/wpt/metadata/css/selectors/user-valid.html.ini
new file mode 100644
index 00000000000..2edbcc3bf55
--- /dev/null
+++ b/tests/wpt/metadata/css/selectors/user-valid.html.ini
@@ -0,0 +1,4 @@
+[user-valid.html]
+  [:user-valid selector should be supported]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index bbab2032439..0e5b6d06809 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,24 +309,18 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 8d0261f22a0..8456d88e4f3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -59,3 +59,6 @@
   [separate text/javascript; charset=windows-1252 text/javascript]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..fd369192a02 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
+  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -7,5 +7,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index dab21cae5d8..d1ca01ebc5f 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-row-height.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-row-height.html.ini
new file mode 100644
index 00000000000..cf21f0ef4ff
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-row-height.html.ini
@@ -0,0 +1,2 @@
+[table-row-height.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
new file mode 100644
index 00000000000..82574a53e6d
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
@@ -0,0 +1,4 @@
+[picture-aspect-ratio.html]
+  [Computed style]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +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: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index e440122bf8e..b3643f7f51e 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -5,48 +5,21 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -59,9 +32,27 @@
   [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart out of range a second time (must not fire select)]
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index d57c9385739..a057142bbc5 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -11,8 +10,8 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/service-workers/service-worker/import-module-scripts.https.html.ini b/tests/wpt/metadata/service-workers/service-worker/import-module-scripts.https.html.ini
deleted file mode 100644
index 61ccc7c0015..00000000000
--- a/tests/wpt/metadata/service-workers/service-worker/import-module-scripts.https.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[import-module-scripts.https.html]
-  [Dynamic import.]
-    expected: FAIL
-
-  [Static import and then dynamic import.]
-    expected: FAIL
-
-  [eval(import()).]
-    expected: FAIL
-
-  [Dynamic import and then static import.]
-    expected: FAIL
-
-  [Static import.]
-    expected: FAIL
-
-  [Nested dynamic import.]
-    expected: FAIL
-
-  [Nested static import.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/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/metadata/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..b4d4b898636 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,9 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_array_in_object]
+    expected: FAIL
+
+  [test_object_in_array]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/Makefile b/tests/wpt/web-platform-tests/conformance-checkers/Makefile
index 81ef75c4681..f7774341cb5 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/Makefile
+++ b/tests/wpt/web-platform-tests/conformance-checkers/Makefile
@@ -32,7 +32,7 @@ messages.json: .FORCE
 	  https://github.com/validator/validator/releases/download/jar/vnu.jar
 	$(JAVA) $(JAVAFLAGS) -cp vnu.jar nu.validator.client.TestRunner \
 	  --ignore=html-its --write-messages $@
-	$(PYTHON) $(PYTHONFLAGS) -mjson.tool $@ > $@.tmp
+	$(PYTHON) $(PYTHONFLAGS) -mjson.tool --sort-keys $@ > $@.tmp
 	mv $@.tmp $@
 
 test: .FORCE
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/messages.json b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
index 0feb59bd4ca..e6504aa24b5 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/messages.json
+++ b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
@@ -1400,18 +1400,18 @@
     "html/elements/ins/year-novalid.html": "Bad value \u201c2006\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: The literal did not satisfy the date format.",
     "html/elements/ins/yearless-date-novalid.html": "Bad value \u201c07-15\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: The literal did not satisfy the date format.",
     "html/elements/kbd/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
-    "html/elements/keygen/challenge-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/id-bad-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/id-missing-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/id-redundant-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/keygen-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/keytype-bad-value-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/keytype-empty-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/keytype-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/model-also-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/model-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/no-attributes-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
-    "html/elements/keygen/non-void-novalid.html": "The \u201ckeygen\u201d element is obsolete. ",
+    "html/elements/keygen/challenge-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/id-bad-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/id-missing-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/id-redundant-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/keygen-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/keytype-bad-value-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/keytype-empty-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/keytype-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/model-also-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/model-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/no-attributes-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
+    "html/elements/keygen/non-void-novalid.html": "The \u201ckeygen\u201d element is obsolete.",
     "html/elements/label/for-descendant-no-id-novalid.html": "Any \u201cinput\u201d descendant of a \u201clabel\u201d element with a \u201cfor\u201d attribute must have an ID value that matches that \u201cfor\u201d attribute.",
     "html/elements/label/multiple-descendants-novalid.html": "The \u201clabel\u201d element may contain at most one \u201cbutton\u201d, \u201cinput\u201d, \u201cmeter\u201d, \u201coutput\u201d, \u201cprogress\u201d, \u201cselect\u201d, or \u201ctextarea\u201d descendant.",
     "html/elements/link/href-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
@@ -2401,24 +2401,24 @@
     "xhtml/elements/img/004-novalid.xhtml": "The element \u201cimg\u201d with the attribute \u201cusemap\u201d must not appear as a descendant of the \u201ca\u201d element.",
     "xhtml/elements/img/051-novalid.xhtml": "Bad value \u201c-1\u201d for attribute \u201cwidth\u201d on element \u201cimg\u201d: Bad non-negative integer: Expected a digit but saw \u201c-\u201d instead.",
     "xhtml/elements/input/003-novalid.xhtml": "The \u201clist\u201d attribute of the \u201cinput\u201d element must refer to a \u201cdatalist\u201d element.",
-    "xhtml/elements/keygen/054-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/054-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/055-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/056-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/056-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/057-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/057-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/058-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/058-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/059-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/060-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/061-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/154-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/157-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/359-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/360-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/361-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
-    "xhtml/elements/keygen/keygen-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete. ",
+    "xhtml/elements/keygen/054-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/054-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/055-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/056-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/056-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/057-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/057-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/058-also-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/058-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/059-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/060-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/061-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/154-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/157-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/359-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/360-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/361-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
+    "xhtml/elements/keygen/keygen-novalid.xhtml": "The \u201ckeygen\u201d element is obsolete.",
     "xhtml/elements/link/001-novalid.xhtml": "Element \u201clink\u201d is missing one or more of the following attributes: [href, resource].",
     "xhtml/elements/menu/menu-containing-hr-novalid.xhtml": "Element \u201chr\u201d not allowed as child of element \u201cmenu\u201d in this context. (Suppressing further errors from this subtree.)",
     "xhtml/elements/menu/menu-containing-menu-novalid.xhtml": "Element \u201cmenu\u201d not allowed as child of element \u201cmenu\u201d in this context. (Suppressing further errors from this subtree.)",
diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html
new file mode 100644
index 00000000000..0f77a446213
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Embedded Enforcement: Subsumption Algorithm - Wildcard lists.</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/testharness-helper.sub.js"></script>
+</head>
+<body>
+  <script>
+    var tests = [
+      { "name" : "Wildcard list subsumes an empty source list.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src ",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list subsumes a source list with `none`.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src 'none'",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list subsumes another wildcard list.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list subsumes a list of policies with wildcards in source lists.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src *",
+        "returned_csp_2": "img-src *",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list is equivalent to a specific list of scheme expressions and their secure variants.",
+        "required_csp": "https: http: ftp: ws: wss:",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list is equivalent to a specific list of scheme expressions.",
+        "required_csp": "img-src http: ftp: ws:",
+        "returned_csp_1": "img-src *",
+        "returned_csp_2": "img-src https: http: ftp: ws: wss:",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list subsumption logic should not affect other keyword expressions.",
+        "required_csp": "img-src http: ftp: ws: 'self'",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard list might include other scheme source expressions.",
+        "required_csp": "img-src data: blob: *",
+        "returned_csp_1": "img-src data://a.com ws://b.com ftp://c.com",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Effective wildcard list should be properly found.",
+        "required_csp": "img-src http://a.com ws://b.com ftp://c.com",
+        "returned_csp_1": "img-src *",
+        "returned_csp_2": "img-src http://a.com ws://b.com ftp://c.com",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name" : "Wildcard does not subsume empty list.",
+        "required_csp": "img-src *",
+        "returned_csp_1": null,
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Empty source list does not subsume a wildcard source list.",
+        "required_csp": "img-src ",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "'none' does not subsume a wildcard source list.",
+        "required_csp": "img-src 'none'",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard source list does not subsume `data:` scheme source expression.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src data:",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard source list does not subsume `blob:` scheme source expression.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src blob:",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Source expressions do not subsume effective nonce expressions.",
+        "required_csp": "script-src http: ftp: ws:",
+        "returned_csp_1": "script-src * 'nonce-abc'",
+        "returned_csp_2": "script-src https: 'nonce-abc'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard source list is not subsumed by a host expression.",
+        "required_csp": "img-src https://another.test",
+        "returned_csp_1": "img-src *",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard list with keywords is not subsumed by a wildcard list.",
+        "required_csp": "style-src *",
+        "returned_csp_1": "style-src * 'unsafe-eval'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard list with 'unsafe-hashed-attributes' is not subsumed by a wildcard list.",
+        "required_csp": "style-src *",
+        "returned_csp_1": "style-src * 'unsafe-hashed-attributes'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard list with 'unsafe-inline' is not subsumed by a wildcard list.",
+        "required_csp": "style-src *",
+        "returned_csp_1": "style-src * 'unsafe-inline'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard list with 'unsafe-eval' is not subsumed by a wildcard list.",
+        "required_csp": "img-src 'unsafe-eval'",
+        "returned_csp_1": "img-src * 'unsafe-eval'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "Wildcard list with 'unsafe-eval' is not subsumed by list with a single expression.",
+        "required_csp": "img-src 'unsafe-hashed-attributes'",
+        "returned_csp_1": "img-src * 'unsafe-hashed-attributes'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "The same as above but for 'unsafe-inline'.",
+        "required_csp": "img-src 'unsafe-inline'",
+        "returned_csp_1": "img-src * 'unsafe-inline'",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "`data:` is not subsumed by a wildcard list.",
+        "required_csp": "img-src *",
+        "returned_csp_1": "img-src data: blob:",
+        "returned_csp_2": "img-src data://a.com ws://b.com ftp://c.com",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name" : "`blob:` is not subsumed by a wildcard list.",
+        "required_csp": "img-src * data:",
+        "returned_csp_1": "img-src data: blob:",
+        "returned_csp_2": "img-src blob://a.com ws://b.com ftp://c.com",
+        "expected": IframeLoad.EXPECT_BLOCK },
+    ];
+    tests.forEach(test => {
+      async_test(t =>  {
+        var url = generateUrlWithPolicies(Host.CROSS_ORIGIN, test.returned_csp_1);
+        if (test.returned_csp_2)
+          url.searchParams.append("policy2", test.returned_csp_2);
+        assert_iframe_with_csp(t, url, test.required_csp, test.expected, test.name, null);
+      }, test.name);
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
index a0b74160c4f..c326af0e546 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
@@ -2,10 +2,6 @@
 <html>
 <head>
     <title>test wildcard host name matching (asterisk as part of a subdomain is not accepted)</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' *w.{{host}}:{{ports[http][0]}} w*.{{host}}:{{ports[http][0]}} 'unsafe-inline';">
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-    <script src='wildcardHostTestFailure.js'></script>
     <script>
       var t_spv = async_test("Should fire violation events for every failed violation");
       var spvEvent;
@@ -23,6 +19,10 @@
       script.src = "http://www." + location.hostname + ":" + location.port + "/content-security-policy/generic/wildcardHostTestSuceeds.js";
       head.appendChild(script);
     </script>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' *w.{{host}}:{{ports[http][0]}} w*.{{host}}:{{ports[http][0]}} 'unsafe-inline';">
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src='wildcardHostTestFailure.js'></script>
 </head>
 <body>
     <h1>test wildcard host name matching (asterisk as part of a subdomain is not accepted)</h1>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html
index acb9f00d808..e4ce1e59446 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html
@@ -6,7 +6,7 @@
     <script src='/resources/testharness.js' nonce='dummy'></script>
     <script src='/resources/testharnessreport.js' nonce='dummy'></script>
 
-    <!-- CSP served: script-src 'strict-dynamic' 'nonce-dummy' 'sha256-yU6Q7nD1TCBB9JvY06iIJ8ONLOPU4g8ml5JCDgXkv+M=' 'sha256-IFt1v6itHgqlrtInbPm/y7qyWcAlDbPgZM+92C5EZ5o=' -->
+    <!-- CSP served: script-src 'strict-dynamic' 'nonce-dummy' 'sha256-yU6Q7nD1TCBB9JvY06iIJ8ONLOPU4g8ml5JCDgXkv+M=' 'sha256-EEoi70frWHkGFhK51NVIJkXpq72aPxSCNZEow37ZmRA=' -->
 </head>
 
 <body>
@@ -16,11 +16,11 @@
     <script nonce='dummy'>
         var hashScriptRan = false;
         window.addEventListener('securitypolicyviolation', function(e) {
-            assert_unreached('No CSP violation report has fired.');
+            assert_unreached('CSP violation reports should not fire.');
         });
     </script>
 
-    <!-- Hash: 'sha256-yU6Q7nD1TCBB9JvY06iIJ8ONLOPU4g8ml5JCDgXkv+M=' -->
+    <!-- Hash: 'sha256-EEoi70frWHkGFhK51NVIJkXpq72aPxSCNZEow37ZmRA=' -->
     <script>
         hashScriptRan = true;
     </script>
@@ -49,4 +49,4 @@
     </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers
index f48fca3ec49..0d824d8b0e1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers
@@ -2,4 +2,4 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Content-Security-Policy: script-src 'strict-dynamic' 'nonce-dummy' 'sha256-yU6Q7nD1TCBB9JvY06iIJ8ONLOPU4g8ml5JCDgXkv+M=' 'sha256-IFt1v6itHgqlrtInbPm/y7qyWcAlDbPgZM+92C5EZ5o='
+Content-Security-Policy: script-src 'strict-dynamic' 'nonce-dummy' 'sha256-yU6Q7nD1TCBB9JvY06iIJ8ONLOPU4g8ml5JCDgXkv+M=' 'sha256-EEoi70frWHkGFhK51NVIJkXpq72aPxSCNZEow37ZmRA='
diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html
new file mode 100644
index 00000000000..f1b8ee5ddb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<link rel="help" href="https://www.w3.org/TR/CSS22/box.html#collapsing-margins" title="8.3.1 Collapsing margins">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; background: green;"></div>
+<div style="width: 0; height: 0; outline: solid red 50px; position: relative; z-index: 1; overflow: clip; margin-left: 50px;">
+  <div id="target"></div>
+</div>
+<script>
+document.body.offsetTop;
+document.getElementById('target').style.marginTop = '-1000px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html
new file mode 100644
index 00000000000..0d02257c6e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  border-color: transparent should not hide the border-image
+</title>
+<style>
+    div {
+        width: 200px;
+        height: 200px;
+        margin: 20px;
+        background-color: silver;
+        border-image-source: url('./support/100x100-blue-and-orange.png');
+        border-image-slice: 32;
+        border-image-repeat: repeat;
+        border-style: solid;
+        border-width: 32px;
+    }
+</style>
+
+This box should have a visible blue-orange border-image.
+<div></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html
new file mode 100644
index 00000000000..859dc2f5f55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Tyler Wilcock" href="mailto:twilco.o@protonmail.com">
+<link rel="help" href="https://www.w3.org/TR/2017/CR-css-backgrounds-3-20171017/#border-images">
+<link rel="match" href="border-image-displayed-with-transparent-border-color-ref.html">
+<title>
+  border-color: transparent should not hide the border-image
+</title>
+<style>
+    div {
+        width: 200px;
+        height: 200px;
+        margin: 20px;
+        background-color: silver;
+        border-image-source: url('./support/100x100-blue-and-orange.png');
+        border-image-slice: 32;
+        border-image-repeat: repeat;
+        border-style: solid;
+        border-width: 32px;
+    }
+</style>
+
+This box should have a visible blue-orange border-image.
+<div style="border-color: transparent;"></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html
new file mode 100644
index 00000000000..83213334583
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<style>
+  .multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+  }
+  #outer {
+    height: 120px;
+    width: 100px;
+  }
+  #inner {
+    width: 50px;
+    column-gap: 16px;
+    height: 100px;
+    padding: 10px;
+  }
+  #ref {
+    height: 400px;
+    width: 25px;
+    background-color: green;
+  }
+</style>
+<div class="multicol" id="outer">
+  <div class="multicol" id="inner">
+    <div id="ref"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019.html
new file mode 100644
index 00000000000..6506236ebe3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>
+  Nested fragmentation for out-of-flow positioned elements create new columns.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="out-of-flow-in-multicolumn-019-ref.html">
+<style>
+  .multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+  }
+  #outer {
+    height: 120px;
+    width: 100px;
+  }
+  #inner {
+    width: 50px;
+    column-gap: 16px;
+    height: 100px;
+    padding: 10px;
+  }
+  .rel {
+    position: relative;
+    height: 160px;
+  }
+  .abs {
+    position: absolute;
+    top: 0px;
+    height: 400px;
+    width: 25px;
+    background-color: green;
+  }
+</style>
+<div class="multicol" id="outer">
+  <div class="multicol" id="inner">
+    <div class="rel">
+      <div class="abs"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-020.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-020.html
new file mode 100644
index 00000000000..89f8d4d6882
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-020.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>
+  Nested fragmentation for out-of-flow positioned elements create new columns.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  .multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+  }
+  #outer {
+    height: 100px;
+    width: 100px;
+  }
+  #inner {
+    background: red;
+    width: 50px;
+  }
+  .rel {
+    position: relative;
+    height: 200px;
+
+  }
+  .abs {
+    position: absolute;
+    width: 25px;
+    background-color: green;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="multicol" id="outer">
+  <div class="multicol" id="inner">
+    <div class="rel">
+      <div class="abs" style="top: 50px; height: 350px;"></div>
+      <div class="abs" style="top: 0x; height: 350px;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-color/META.yml b/tests/wpt/web-platform-tests/css/css-color/META.yml
index a0e70aa6539..287f1f32a77 100644
--- a/tests/wpt/web-platform-tests/css/css-color/META.yml
+++ b/tests/wpt/web-platform-tests/css/css-color/META.yml
@@ -3,3 +3,5 @@ suggested_reviewers:
   - dbaron
   - svgeesus
   - tabatkins
+  - weinig
+
diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-001.html b/tests/wpt/web-platform-tests/css/css-color/hex-001.html
index 4ff5cdbd9ce..0c90f877874 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hex-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hex-001.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: The RGB hexadecimal notations: #RRGGBB</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#hex-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="6 digit hex">
 <style>
-    .test {color: #008000}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test {background-color: #008000}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-002.html b/tests/wpt/web-platform-tests/css/css-color/hex-002.html
index 5e0d48a23d3..ee3f5a45eec 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hex-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hex-002.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: The RGB hexadecimal notations: #RRGGBB</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#hex-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="8 digit hex, fully opaque">
 <style>
-    .test {color: #008000FF}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: #008000FF}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html b/tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html
index 613528e9260..dc7e324e0ed 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html
@@ -2,8 +2,9 @@
 <meta charset="utf-8">
 <title>Green text reference for hex shorthand tests</title>
 <style>
-    .test { color: #007700}
+    .test { background-color: #007700; width: 12em; height: 12em;}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-003.html b/tests/wpt/web-platform-tests/css/css-color/hex-003.html
index a6a19ad6191..2ee4ec61e5d 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hex-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hex-003.html
@@ -6,8 +6,12 @@
 <link rel="match" href="hex-003-ref.html">
 <meta name="assert" content="3 digit hex">
 <style>
-    .test {color: #070}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #007700; width: 12em; height: 6em; margin-bottom: 0}
+    .test {background-color: #070}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-004.html b/tests/wpt/web-platform-tests/css/css-color/hex-004.html
index 074fb1d4760..39e12ffee1e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hex-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hex-004.html
@@ -6,8 +6,12 @@
 <meta name="assert" content="4 digit hex, fully opaque">
 <link rel="match" href="hex-003-ref.html">
 <style>
-    .test {color: #070F}
+        .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #007700; width: 12em; height: 6em; margin-bottom: 0}
+    .test {background-color: #070F}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-001.html b/tests/wpt/web-platform-tests/css/css-color/hsl-001.html
index 842dbb9e713..a71ce6bad65 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-001.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with number and no alpha, also no comma">
 <style>
-    .test {color: hsl(120 100% 25%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120 100% 25%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-002.html b/tests/wpt/web-platform-tests/css/css-color/hsl-002.html
index 91750d426aa..fae6126fdc7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-002.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with angle and no alpha, also no comma">
 <style>
-    .test {color: hsl(120deg 100% 25%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test {background-color: hsl(120deg 100% 25%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-003.html b/tests/wpt/web-platform-tests/css/css-color/hsl-003.html
index 5b6bb4b1c9a..e175e2a2ffd 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-003.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with number and numeric alpha, also no comma">
 <style>
-    .test {color: hsl(120 100% 25% / 1.0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test {background-color: hsl(120 100% 25% / 1.0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-004.html b/tests/wpt/web-platform-tests/css/css-color/hsl-004.html
index 483c821aeca..2af529158e0 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-004.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with angle and numeric alpha, also no comma">
 <style>
-    .test {color: hsl(120deg 100% 25% / 1)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120deg 100% 25% / 1)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-005.html b/tests/wpt/web-platform-tests/css/css-color/hsl-005.html
index b0970c316f3..7dc793595b7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-005.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with number and percent alpha, also no comma">
 <style>
-    .test {color: hsl(120 100% 25% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120 100% 25% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-006.html b/tests/wpt/web-platform-tests/css/css-color/hsl-006.html
index 389c5a49d4f..348a8a80c6c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-006.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="hsl() with angle and percent alpha, also no comma">
 <style>
-    .test {color: hsl(120deg 100% 25% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120deg 100% 25% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-007.html b/tests/wpt/web-platform-tests/css/css-color/hsl-007.html
index 18bbe405922..9e1bc08add1 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-007.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsl() with number and percent alpha, and commas">
 <style>
-    .test {color: hsl(120, 100%, 25%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120, 100%, 25%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-008.html b/tests/wpt/web-platform-tests/css/css-color/hsl-008.html
index 89b962171a3..bcef8002ee3 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsl-008.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsl-008.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
 <link rel="match" href="greentext-ref.html">
 <meta name="assert" content="legacy hsl() with angle and percent alpha, with commas">
 <style>
-    .test {color: hsl(120deg, 100%, 25%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsl(120deg, 100%, 25%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-001.html b/tests/wpt/web-platform-tests/css/css-color/hsla-001.html
index 9e5bbfa4772..c3b2633a0a9 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-001.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with number and no alpha, also no comma">
 <style>
-    .test {color: hsla(120 100% 25%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120 100% 25%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-002.html b/tests/wpt/web-platform-tests/css/css-color/hsla-002.html
index 8b9cff818f2..a51c5f2b96b 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-002.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with angle and no alpha, also no comma">
 <style>
-    .test {color: hsla(120deg 100% 25%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120deg 100% 25%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-003.html b/tests/wpt/web-platform-tests/css/css-color/hsla-003.html
index 3aadd8e5b0a..c9845934364 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-003.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with number and numeric alpha, also no comma">
 <style>
-    .test {color: hsla(120 100% 25% / 1.0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120 100% 25% / 1.0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-004.html b/tests/wpt/web-platform-tests/css/css-color/hsla-004.html
index e68669fdeac..aa095cafa55 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-004.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with angle and numeric alpha, also no comma">
 <style>
-    .test {color: hsla(120deg 100% 25% / 1)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120deg 100% 25% / 1)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-005.html b/tests/wpt/web-platform-tests/css/css-color/hsla-005.html
index 4efeb1912c0..ab88515c57b 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-005.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with number and percent alpha, also no comma">
 <style>
-    .test {color: hsla(120 100% 25% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120 100% 25% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-006.html b/tests/wpt/web-platform-tests/css/css-color/hsla-006.html
index e440ebe5bdb..f9a93cd2c4e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-006.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with angle and percent alpha, also no comma">
 <style>
-    .test {color: hsla(120deg 100% 25% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120deg 100% 25% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-007.html b/tests/wpt/web-platform-tests/css/css-color/hsla-007.html
index ba647ae7514..8c583fcda01 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-007.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with number and percent alpha, and commas">
 <style>
-    .test {color: hsla(120, 100%, 25%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: hsla(120, 100%, 25%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-008.html b/tests/wpt/web-platform-tests/css/css-color/hsla-008.html
index 8f78f88656e..e5aaa243736 100644
--- a/tests/wpt/web-platform-tests/css/css-color/hsla-008.html
+++ b/tests/wpt/web-platform-tests/css/css-color/hsla-008.html
@@ -2,12 +2,17 @@
 <meta charset="utf-8">
 <title>CSS Color 4: HSL functions hsl() and hsla()</title>
 <link rel="author" title="Chris Nardi" href="mailto:csnardi1@gmail.com">
+<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#the-hsl-notation">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy hsla() with angle and percent alpha, with commas">
 <style>
-    .test {color: hsla(120deg, 100%, 25%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:  hsla(120deg, 100%, 25%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-001.html b/tests/wpt/web-platform-tests/css/css-color/rgb-001.html
index 30603faa9c5..3e590016778 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-001.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with percent and no alpha, also no comma">
 <style>
-    .test {color: rgb(0% 50% 0%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgb(0% 50% 0%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-002.html b/tests/wpt/web-platform-tests/css/css-color/rgb-002.html
index a50620b9b14..c87f7878d99 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-002.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with 8-bit numbers and no alpha, also no comma">
 <style>
-    .test {color: rgb(0 128.0 0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgb(0 128.0 0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-003.html b/tests/wpt/web-platform-tests/css/css-color/rgb-003.html
index 8355f7768f2..5fc0fbfe289 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-003.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with percent and numeric alpha, also no comma">
 <style>
-    .test {color: rgb(0% 50% 0% / 1.0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgb(0% 50% 0% / 1.0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-004.html b/tests/wpt/web-platform-tests/css/css-color/rgb-004.html
index 7bace000ab3..d4078f30e47 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-004.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with 8-bit numbers and numeric alpha, also no comma">
 <style>
-    .test {color: rgb(0 128.0 0 / 1)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:rgb(0 128.0 0 / 1)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-005.html b/tests/wpt/web-platform-tests/css/css-color/rgb-005.html
index 199eddcbbab..ec5e2f5b946 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-005.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with percent and percent alpha, also no comma">
 <style>
-    .test {color: rgb(0% 50% 0% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:  rgb(0% 50% 0% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-006.html b/tests/wpt/web-platform-tests/css/css-color/rgb-006.html
index 5ccb8ea135f..45b11138e3e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-006.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="rgb() with 8-bit numbers and percent alpha, also no comma">
 <style>
-    .test {color: rgb(0 128.0 0 / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:  rgb(0 128.0 0 / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-007.html b/tests/wpt/web-platform-tests/css/css-color/rgb-007.html
index a09b7131709..fd881c3184f 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-007.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgb() with percent and percent alpha, and commas">
 <style>
-    .test {color: rgb(0%, 50%, 0%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgb(0%, 50%, 0%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-008.html b/tests/wpt/web-platform-tests/css/css-color/rgb-008.html
index bd3215d89fc..86842753567 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgb-008.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgb-008.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgb() with 8-bit numbers and percent alpha, with commas">
 <style>
-    .test {color: rgb(0, 128.0, 0, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgb(0, 128.0, 0, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-001.html b/tests/wpt/web-platform-tests/css/css-color/rgba-001.html
index 8fb383fca8d..3f9989a4131 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-001.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with percent and no alpha, also no comma">
 <style>
-    .test {color: rgba(0% 50% 0%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgba(0% 50% 0%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-002.html b/tests/wpt/web-platform-tests/css/css-color/rgba-002.html
index 14dd2b56e7f..3a734bdc303 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-002.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-002.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with 8-bit numbers and no alpha, also no comma">
 <style>
-    .test {color: rgba(0 128.0 0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgba(0 128.0 0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-003.html b/tests/wpt/web-platform-tests/css/css-color/rgba-003.html
index 49200d039fc..5204931df55 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-003.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-003.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with percent and numeric alpha, also no comma">
 <style>
-    .test {color: rgba(0% 50% 0% / 1.0)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:  rgba(0% 50% 0% / 1.0)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-004.html b/tests/wpt/web-platform-tests/css/css-color/rgba-004.html
index 22e5854e1a0..91d31731e35 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-004.html
@@ -6,8 +6,12 @@
 <link rel="match" href="greentext-ref.html">
 <meta name="assert" content="legacy rgba() with 8-bit numbers and numeric alpha, also no comma">
 <style>
-    .test {color: rgba(0 128.0 0 / 1)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgba(0 128.0 0 / 1)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-005.html b/tests/wpt/web-platform-tests/css/css-color/rgba-005.html
index 1e72b1db97a..579b57a0683 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-005.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with percent and percent alpha, also no comma">
 <style>
-    .test {color: rgba(0% 50% 0% / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgba(0% 50% 0% / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-006.html b/tests/wpt/web-platform-tests/css/css-color/rgba-006.html
index 3b397ab3111..b7b371952a6 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-006.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with 8-bit numbers and percent alpha, also no comma">
 <style>
-    .test {color: rgba(0 128.0 0 / 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:  rgba(0 128.0 0 / 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-007.html b/tests/wpt/web-platform-tests/css/css-color/rgba-007.html
index 5b316a2a369..cca349781b7 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-007.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with percent and percent alpha, and commas">
 <style>
-    .test {color: rgba(0%, 50%, 0%, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color:rgba(0%, 50%, 0%, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-008.html b/tests/wpt/web-platform-tests/css/css-color/rgba-008.html
index 65eab55794c..8d6c8511664 100644
--- a/tests/wpt/web-platform-tests/css/css-color/rgba-008.html
+++ b/tests/wpt/web-platform-tests/css/css-color/rgba-008.html
@@ -3,11 +3,15 @@
 <title>CSS Color 4: RGB functions rgb() and rgba()</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
-<link rel="match" href="greentext-ref.html">
+<link rel="match" href="greensquare-ref.html">
 <meta name="assert" content="legacy rgba() with 8-bit numbers and percent alpha, with commas">
 <style>
-    .test {color: rgba(0, 128.0, 0, 100%)}
+    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
+    .ref { background-color: #008000; width: 12em; height: 6em; margin-bottom: 0}
+    .test { background-color: rgba(0, 128.0, 0, 100%)}
 </style>
 <body>
-    <p class="test">Test passes if this text is green</p>
+    <p>Test passes if you see a green square, and no red.</p>
+    <p class="ref"> </p>
+    <p class="test"> </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html
new file mode 100644
index 00000000000..ee2cc9af5af
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html
@@ -0,0 +1,140 @@
+<!doctype html>
+<title>Reference: display:table flex items with flex-shrink/flex-grow/flex-basis</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1674268">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  html,body {
+    color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  }
+
+  .container {
+    display: flex;
+    width: 180px;
+    border: 1px solid blue;
+  }
+
+  .container > * {
+    background-color: cyan;
+    display: block;
+  }
+  .test1 > * {
+    flex-shrink: 0;
+    min-width: 100%;
+  }
+  .test2 > * {
+    flex-shrink: 0;
+    min-width: 50%;
+  }
+  .test3 > * {
+    flex-shrink: 0.5;
+    min-width: 50%;
+  }
+  .test4 > * {
+    flex-grow: 0.1;
+    min-width: 50%;
+  }
+  .test5 > * {
+    flex-shrink: 0.2;
+    flex-grow: 0.5;
+    min-width: 10%;
+  }
+  .base > * {
+    flex-basis: 100px;
+  }
+  .large-base {
+    width: 100px;
+  }
+  .large-base > * {
+    flex-basis: 200px;
+  }
+</style>
+
+<div class="container test1">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test1 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test1 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width.html
new file mode 100644
index 00000000000..a67e4fe15f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width.html
@@ -0,0 +1,144 @@
+<!doctype html>
+<title>Flexbox Test: display:table flex items with flex-shrink/flex-grow/flex-basis</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1674268">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#flex-property">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1673006">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1454330">
+<link rel="match" href="table-item-flex-percentage-min-width-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  html,body {
+    color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  }
+
+  .container {
+    display: flex;
+    width: 180px;
+    border: 1px solid blue;
+  }
+
+  .container > * {
+    background-color: cyan;
+    display: table;
+  }
+  .test1 > * {
+    flex-shrink: 0;
+    min-width: 100%;
+  }
+  .test2 > * {
+    flex-shrink: 0;
+    min-width: 50%;
+  }
+  .test3 > * {
+    flex-shrink: 0.5;
+    min-width: 50%;
+  }
+  .test4 > * {
+    flex-grow: 0.1;
+    min-width: 50%;
+  }
+  .test5 > * {
+    flex-shrink: 0.2;
+    flex-grow: 0.5;
+    min-width: 10%;
+  }
+  .base > * {
+    flex-basis: 100px;
+  }
+  .large-base {
+    width: 100px;
+  }
+  .large-base > * {
+    flex-basis: 200px;
+  }
+</style>
+
+<div class="container test1">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test1 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5 base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test1 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test2 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test3 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test4 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
+
+<div class="container test5 large-base">
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/advance-override-serialization.html b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-serialization.html
new file mode 100644
index 00000000000..0e23d21e00b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-serialization.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-5/#descdef-font-face-advance-override">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<title>Serialization of advance-override</title>
+
+<style id="target">
+@font-face {
+  font-family: one-parameter;
+  src: local(Ahem), url(/fonts/Ahem.ttf);
+  advance-override: 50%;
+}
+
+@font-face {
+  font-family: two-parameters;
+  src: local(Ahem), url(/fonts/Ahem.ttf);
+  advance-override: 50% 100%;
+}
+
+@font-face {
+  font-family: two-identical-parameters;
+  src: local(Ahem), url(/fonts/Ahem.ttf);
+  advance-override: 100% 100%;
+}
+</style>
+
+<script>
+const sheet = document.getElementById("target").sheet;
+
+test(() => assert_equals(sheet.cssRules[0].style.advanceOverride, "50%"),
+     "One parameter should be serialized as one parameter");
+
+test(() => assert_equals(sheet.cssRules[1].style.advanceOverride, "50% 100%"),
+     "Two different parameters should be serialized as two parameters");
+
+test(() => assert_equals(sheet.cssRules[2].style.advanceOverride, "100%"),
+     "Two identical parameters should be simplified into one parameter");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright-ref.html
new file mode 100644
index 00000000000..811ad27f1e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tests the second parameter of the advance-override descriptor of @font-face</title>
+<style>
+@font-face {
+  font-family: custom-font;
+  src: local(Ahem), url(/fonts/Ahem.ttf);
+  unicode-range: U+0-7F; /* ASCII only */
+}
+
+.test {
+  font: 20px custom-font, sans-serif;
+  border: 1px solid red;
+  width: max-content;
+}
+
+.vertical {
+  writing-mode: vertical-rl;
+}
+
+.upright {
+  text-orientation: upright;
+}
+</style>
+
+<p>advance-override uses the second parameter to override advance of upright characters in vertical text.</p>
+
+<div class="test">X&nbsp;X&nbsp;X&nbsp;</div>
+
+<div class="test vertical">X&nbsp;X&nbsp;X&nbsp;</div>
+
+<div class="test vertical upright">X&nbsp;&nbsp;X&nbsp;&nbsp;X&nbsp;&nbsp;</div>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright.html b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright.html
new file mode 100644
index 00000000000..b9712bcdba9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/advance-override-vertical-upright.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-5/#descdef-font-face-advance-override">
+<link rel="match" href="advance-override-vertical-upright-ref.html">
+<link rel="assert" title="Tests that advance-override uses the second parameter to override advance of upright characters in vertical text">
+<title>Tests the second parameter of the advance-override descriptor of @font-face</title>
+<style>
+@font-face {
+  font-family: custom-font;
+  src: local(Ahem), url(/fonts/Ahem.ttf);
+  advance-override: 200% 300%;
+  unicode-range: U+0-7F; /* ASCII only */
+}
+
+.test {
+  font: 20px custom-font, sans-serif;
+  border: 1px solid red;
+  width: max-content;
+}
+
+.vertical {
+  writing-mode: vertical-rl;
+}
+
+.upright {
+  text-orientation: upright;
+}
+</style>
+
+<p>advance-override uses the second parameter to override advance of upright characters in vertical text.</p>
+
+<div class="test">
+  XXX
+</div>
+
+<div class="test vertical">
+  XXX
+</div>
+
+<div class="test vertical upright">
+  XXX
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html
new file mode 100644
index 00000000000..2bbc3a95136
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Positioned grid items reference file</title>
+<style>
+  #grid {
+    display: grid;
+    grid: 150px 100px / 200px 300px;
+    place-items: start;
+    margin: 1px 2px 3px 4px;
+    padding: 20px 15px 10px 5px;
+    border-width: 9px 3px 12px 6px;
+    border-style: solid;
+    width: 550px;
+    height: 400px;
+  }
+
+  #firstItem {
+    background: magenta;
+  }
+
+  #secondItem {
+    background: cyan;
+  }
+
+  #thirdItem {
+    background: yellow;
+  }
+
+  #fourthItem {
+    background: lime;
+  }
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+
+<div id="grid">
+  <div id="firstItem">First item</div>
+  <div id="secondItem">Second item</div>
+  <div id="thirdItem">Third item</div>
+  <div id="fourthItem">Fourth item</div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html
new file mode 100644
index 00000000000..f723b2486c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Absolutely positioned items with negative indices</title>
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#abspos">
+<link rel="match" href="positioned-grid-items-negative-indices-001-ref.html">
+<meta name="assert" content="Checks that absolutely positioned items are properly placed and sized when they have negative indices.">
+<style>
+  #grid {
+    display: grid;
+    grid: 150px 100px / 200px 300px;
+    margin: 1px 2px 3px 4px;
+    padding: 20px 15px 10px 5px;
+    border-width: 9px 3px 12px 6px;
+    border-style: solid;
+    width: 550px;
+    height: 400px;
+    position: relative;
+  }
+
+  #grid > div {
+    position: absolute;
+  }
+
+  #firstItem {
+    background: magenta;
+    grid-column: -3 / -2;
+    grid-row: -3 / -2;
+  }
+
+  #secondItem {
+    background: cyan;
+    grid-column: -2 / -1;
+    grid-row: -3 / -2;
+  }
+
+  #thirdItem {
+    background: yellow;
+    grid-column: -3 / -2;
+    grid-row: -2 / -1;
+  }
+
+  #fourthItem {
+    background: lime;
+    grid-column: -2 / -1;
+    grid-row: -2 / -1;
+  }
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+<div id="grid">
+  <div id="firstItem">First item</div>
+  <div id="secondItem">Second item</div>
+  <div id="thirdItem">Third item</div>
+  <div id="fourthItem">Fourth item</div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html
new file mode 100644
index 00000000000..a5ee066e840
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Absolutely positioned items reference file</title>
+<style>
+  #grid {
+    display: grid;
+    grid: 50px 50px / 50px 50px;
+    margin: 1px 2px 3px 4px;
+    padding: 100px 100px 100px 100px;
+    border-width: 9px 3px 12px 6px;
+    border-style: solid;
+    width: 100px;
+    height: 100px;
+    position: relative;
+    background-color: gray;
+  }
+
+  #grid > div {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+
+  #firstItem {
+    background: magenta;
+    grid-column: auto / 1;
+    grid-row: auto / 1;
+  }
+
+  #secondItem {
+    background: cyan;
+    grid-column: 3 / auto;
+    grid-row: 3 / auto;
+  }
+
+  #thirdItem {
+    background: yellow;
+    grid-column: 5 / 6;
+    grid-row: 5 / 6;
+    width: 25% !important;
+    height: 25% !important;
+  }
+
+  #fourthItem {
+    background: lime;
+    grid-column: 2 / 3;
+    grid-row: 2 / 3;
+  }
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+<div id="grid">
+  <div id="firstItem"></div>
+  <div id="secondItem"></div>
+  <div id="thirdItem"></div>
+  <div id="fourthItem"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html
new file mode 100644
index 00000000000..4a023e1c62d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Absolutely positioned items with negative indices</title>
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#abspos">
+<link rel="match" href="positioned-grid-items-negative-indices-002-ref.html">
+<meta name="assert" content="Checks that absolutely positioned items are properly placed and sized when they have negative indices.">
+<style>
+  #grid {
+    display: grid;
+    grid: 50px 50px / 50px 50px;
+    margin: 1px 2px 3px 4px;
+    padding: 100px 100px 100px 100px;
+    border-width: 9px 3px 12px 6px;
+    border-style: solid;
+    width: 100px;
+    height: 100px;
+    position: relative;
+    background-color: gray;
+  }
+
+  #grid > div {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+
+  #firstItem {
+    background: magenta;
+    grid-column: auto / -3;
+    grid-row: auto / -3;
+  }
+
+  #secondItem {
+    background: cyan;
+    grid-column: -1 / auto;
+    grid-row: -1 / auto;
+  }
+
+  #thirdItem {
+    background: yellow;
+    grid-column: -5 / -6;
+    grid-row: -5 / -6;
+    width: 25% !important;
+    height: 25% !important;
+  }
+
+  #fourthItem {
+    background: lime;
+    grid-column: -2 / 3;
+    grid-row: 2 / -1;
+  }
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+<div id="grid">
+  <div id="firstItem"></div>
+  <div id="secondItem"></div>
+  <div id="thirdItem"></div>
+  <div id="fourthItem"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html
new file mode 100644
index 00000000000..4e8e9a4314c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Absolutely positioned items with negative indices</title>
+<style>
+  #grid {
+    display: grid;
+    margin: 4px;
+    padding: 10px;
+    width: 500px;
+    height: 130px;
+    position: relative;
+  }
+
+  #firstItem {
+    grid-column: 1 / span 2;
+    background-color: hotpink;
+  }
+
+  #secondItem {
+    grid-column: 3 / span 6;
+    background-color: lightblue;
+  }
+
+</style>
+
+<p>The test passes if there are two tracks in hotpink and 6 in light blue.</p>
+<div id="grid">
+  <div id="firstItem"></div>
+  <div id="secondItem"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html
new file mode 100644
index 00000000000..099dd9ca068
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Absolutely positioned items with negative indices</title>
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#abspos">
+<link rel="match" href="positioned-grid-items-negative-indices-003-ref.html">
+<meta name="assert" content="Checks that absolutely positioned items are properly placed and sized when they have negative indices in an undefined sized grid.">
+<style>
+  #grid {
+    display: grid;
+    margin: 4px;
+    padding: 10px;
+    width: 500px;
+    height: 130px;
+    position: relative;
+  }
+
+  #absolute {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    grid-column: -3 / span 6;
+    grid-row: 1 / 2;
+    background-color: lightblue;
+  }
+
+  #item {
+    grid-column: -5 / span 8;
+    background-color: hotpink;
+  }
+
+</style>
+
+<p>The test passes if there are two tracks in hotpink and 6 in light blue.</p>
+<div id="grid">
+  <div id="absolute"></div>
+  <div id="item"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html
new file mode 100644
index 00000000000..fe1e9548285
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html
@@ -0,0 +1,398 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with horizontal left to right content</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .line {
+    display: flex;
+  }
+
+  .container {
+    writing-mode: horizontal-tb;
+    direction: ltr;
+
+    height: 200px;
+    width: 200px;
+    margin: 10px;
+    padding: 0px;
+    border-width: 0px;
+    overflow-x: auto;
+    flex: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    border-width: 0px;
+    background: lightsalmon;
+  }
+
+  /* scrollbar-gutter
+  Note: not testing "stable" because the decision to use overlay scrollbars
+  is up to the browser. The "always" keyword takes effect regardless of
+  whether classical or overlay scrollbars are being used.*/
+  .sg_auto {
+    scrollbar-gutter: auto;
+  }
+
+  .sg_always {
+    scrollbar-gutter: always;
+  }
+
+  .sg_always_both {
+    scrollbar-gutter: always both;
+  }
+
+  .sg_always_force {
+    scrollbar-gutter: always force;
+  }
+
+  .sg_always_both_force {
+    scrollbar-gutter: always both force;
+  }
+
+  /* overflow */
+  .container.ov_auto {
+    overflow-y: auto;
+  }
+
+  .container.ov_scroll {
+    overflow-y: scroll;
+  }
+
+  .container.ov_visible {
+    overflow: visible;
+  }
+
+  .container.ov_hidden {
+    overflow-y: hidden;
+  }
+
+  .container.ov_clip {
+    overflow-y: clip;
+  }
+</style>
+<body>
+
+  <div class="line">
+    <div class="container ov_auto sg_auto" id="container_auto_auto">
+      <div class="content" id="content_auto_auto">auto/auto</div>
+    </div>
+
+    <div class="container ov_scroll sg_auto" id="container_scroll_auto">
+      <div class="content" id="content_scroll_auto">scroll/auto</div>
+    </div>
+
+    <div class="container ov_visible sg_auto" id="container_visible_auto">
+      <div class="content" id="content_visible_auto">visible/auto</div>
+    </div>
+
+    <div class="container ov_hidden sg_auto" id="container_hidden_auto">
+      <div class="content" id="content_hidden_auto">hidden/auto</div>
+    </div>
+
+    <div class="container ov_clip sg_auto" id="container_clip_auto">
+      <div class="content" id="content_clip_auto">clip/auto</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always" id="container_auto_always">
+      <div class="content" id="content_auto_always">auto/always</div>
+    </div>
+
+    <div class="container ov_scroll sg_always" id="container_scroll_always">
+      <div class="content" id="content_scroll_always">scroll/always</div>
+    </div>
+
+    <div class="container ov_visible sg_always" id="container_visible_always">
+      <div class="content" id="content_visible_always">visible/always</div>
+    </div>
+
+    <div class="container ov_hidden sg_always" id="container_hidden_always">
+      <div class="content" id="content_hidden_always">hidden/always</div>
+    </div>
+
+    <div class="container ov_clip sg_always" id="container_clip_always">
+      <div class="content" id="content_clip_always">clip/always</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_force" id="container_auto_always_force">
+      <div class="content" id="content_auto_always_force">auto/always force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_force" id="container_scroll_always_force">
+      <div class="content" id="content_scroll_always_force">scroll/always force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_force" id="container_visible_always_force">
+      <div class="content" id="content_visible_always_force">visible/always force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_force" id="container_hidden_always_force">
+      <div class="content" id="content_hidden_always_force">hidden/always force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_force" id="container_clip_always_force">
+      <div class="content" id="content_clip_always_force">clip/always force</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both" id="container_auto_always_both">
+      <div class="content" id="content_auto_always_both">auto/always both</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both" id="container_scroll_always_both">
+      <div class="content" id="content_scroll_always_both">scroll/always both</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both" id="container_visible_always_both">
+      <div class="content" id="content_visible_always_both">visible/always both</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both" id="container_hidden_always_both">
+      <div class="content" id="content_hidden_always_both">hidden/always both</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both" id="container_clip_always_both">
+      <div class="content" id="content_clip_always_both">clip/always both</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both_force" id="container_auto_always_both_force">
+      <div class="content" id="content_auto_always_both_force">auto/always both force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both_force" id="container_scroll_always_both_force">
+      <div class="content" id="content_scroll_always_both_force">scroll/always both force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both_force" id="container_visible_always_both_force">
+      <div class="content" id="content_visible_always_both_force">visible/always both force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both_force" id="container_hidden_always_both_force">
+      <div class="content" id="content_hidden_always_both_force">hidden/always both force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both_force" id="container_clip_always_both_force">
+      <div class="content" id="content_clip_always_both_force">clip/always both force</div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    setup({ explicit_done: true });
+
+    // scrollbar-gutter: auto
+
+    test(function () {
+      let container = document.getElementById('container_auto_auto');
+      let content = document.getElementById('content_auto_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_auto');
+      let content = document.getElementById('content_scroll_auto');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_visible_auto');
+      let content = document.getElementById('content_visible_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_auto');
+      let content = document.getElementById('content_hidden_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_clip_auto');
+      let content = document.getElementById('content_clip_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter auto");
+
+    // scrollbar-gutter: always
+
+    test(function () {
+      let container = document.getElementById('container_auto_always');
+      let content = document.getElementById('content_auto_always');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always');
+      let content = document.getElementById('content_scroll_always');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always');
+      let content = document.getElementById('content_visible_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always');
+      let content = document.getElementById('content_hidden_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always');
+      let content = document.getElementById('content_clip_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always");
+
+    // scrollbar-gutter: always force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_force');
+      let content = document.getElementById('content_auto_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_force');
+      let content = document.getElementById('content_scroll_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_force');
+      let content = document.getElementById('content_visible_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_force');
+      let content = document.getElementById('content_hidden_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_force');
+      let content = document.getElementById('content_clip_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always force");
+
+    // scrollbar-gutter: always both
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both');
+      let content = document.getElementById('content_auto_always_both');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always\"");
+    }, "overflow auto, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both');
+      let content = document.getElementById('content_scroll_always_both');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always\"");
+    }, "overflow scroll, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both');
+      let content = document.getElementById('content_visible_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both');
+      let content = document.getElementById('content_hidden_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both');
+      let content = document.getElementById('content_clip_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always both");
+
+    // scrollbar-gutter: always both force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both_force');
+      let content = document.getElementById('content_auto_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_auto_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow auto, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both_force');
+      let content = document.getElementById('content_scroll_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_scroll_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow scroll, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both_force');
+      let content = document.getElementById('content_visible_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_visible_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow visible, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both_force');
+      let content = document.getElementById('content_hidden_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_hidden_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow hidden, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both_force');
+      let content = document.getElementById('content_clip_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_clip_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow clip, scrollbar-gutter always both force");
+
+    done();
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001.html
new file mode 100644
index 00000000000..446195098e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001.html
@@ -0,0 +1,398 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with horizontal right to left content</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .line {
+    display: flex;
+  }
+
+  .container {
+    writing-mode: horizontal-tb;
+    direction: rtl;
+
+    height: 200px;
+    width: 200px;
+    margin: 10px;
+    padding: 0px;
+    border-width: 0px;
+    overflow-x: auto;
+    flex: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    border-width: 0px;
+    background: lightsalmon;
+  }
+
+  /* scrollbar-gutter
+     Note: not testing "stable" because the decision to use overlay scrollbars
+     is up to the browser. The "always" keyword takes effect regardless of
+     whether classical or overlay scrollbars are being used.*/
+  .sg_auto {
+    scrollbar-gutter: auto;
+  }
+
+  .sg_always {
+    scrollbar-gutter: always;
+  }
+
+  .sg_always_both {
+    scrollbar-gutter: always both;
+  }
+
+  .sg_always_force {
+    scrollbar-gutter: always force;
+  }
+
+  .sg_always_both_force {
+    scrollbar-gutter: always both force;
+  }
+
+  /* overflow */
+  .container.ov_auto {
+    overflow-y: auto;
+  }
+
+  .container.ov_scroll {
+    overflow-y: scroll;
+  }
+
+  .container.ov_visible {
+    overflow: visible;
+  }
+
+  .container.ov_hidden {
+    overflow-y: hidden;
+  }
+
+  .container.ov_clip {
+    overflow-y: clip;
+  }
+</style>
+<body>
+
+  <div class="line">
+    <div class="container ov_auto sg_auto" id="container_auto_auto">
+      <div class="content" id="content_auto_auto">auto/auto</div>
+    </div>
+
+    <div class="container ov_scroll sg_auto" id="container_scroll_auto">
+      <div class="content" id="content_scroll_auto">scroll/auto</div>
+    </div>
+
+    <div class="container ov_visible sg_auto" id="container_visible_auto">
+      <div class="content" id="content_visible_auto">visible/auto</div>
+    </div>
+
+    <div class="container ov_hidden sg_auto" id="container_hidden_auto">
+      <div class="content" id="content_hidden_auto">hidden/auto</div>
+    </div>
+
+    <div class="container ov_clip sg_auto" id="container_clip_auto">
+      <div class="content" id="content_clip_auto">clip/auto</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always" id="container_auto_always">
+      <div class="content" id="content_auto_always">auto/always</div>
+    </div>
+
+    <div class="container ov_scroll sg_always" id="container_scroll_always">
+      <div class="content" id="content_scroll_always">scroll/always</div>
+    </div>
+
+    <div class="container ov_visible sg_always" id="container_visible_always">
+      <div class="content" id="content_visible_always">visible/always</div>
+    </div>
+
+    <div class="container ov_hidden sg_always" id="container_hidden_always">
+      <div class="content" id="content_hidden_always">hidden/always</div>
+    </div>
+
+    <div class="container ov_clip sg_always" id="container_clip_always">
+      <div class="content" id="content_clip_always">clip/always</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_force" id="container_auto_always_force">
+      <div class="content" id="content_auto_always_force">auto/always force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_force" id="container_scroll_always_force">
+      <div class="content" id="content_scroll_always_force">scroll/always force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_force" id="container_visible_always_force">
+      <div class="content" id="content_visible_always_force">visible/always force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_force" id="container_hidden_always_force">
+      <div class="content" id="content_hidden_always_force">hidden/always force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_force" id="container_clip_always_force">
+      <div class="content" id="content_clip_always_force">clip/always force</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both" id="container_auto_always_both">
+      <div class="content" id="content_auto_always_both">auto/always both</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both" id="container_scroll_always_both">
+      <div class="content" id="content_scroll_always_both">scroll/always both</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both" id="container_visible_always_both">
+      <div class="content" id="content_visible_always_both">visible/always both</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both" id="container_hidden_always_both">
+      <div class="content" id="content_hidden_always_both">hidden/always both</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both" id="container_clip_always_both">
+      <div class="content" id="content_clip_always_both">clip/always both</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both_force" id="container_auto_always_both_force">
+      <div class="content" id="content_auto_always_both_force">auto/always both force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both_force" id="container_scroll_always_both_force">
+      <div class="content" id="content_scroll_always_both_force">scroll/always both force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both_force" id="container_visible_always_both_force">
+      <div class="content" id="content_visible_always_both_force">visible/always both force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both_force" id="container_hidden_always_both_force">
+      <div class="content" id="content_hidden_always_both_force">hidden/always both force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both_force" id="container_clip_always_both_force">
+      <div class="content" id="content_clip_always_both_force">clip/always both force</div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    setup({ explicit_done: true });
+
+    // scrollbar-gutter: auto
+
+    test(function () {
+      let container = document.getElementById('container_auto_auto');
+      let content = document.getElementById('content_auto_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_auto');
+      let content = document.getElementById('content_scroll_auto');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_visible_auto');
+      let content = document.getElementById('content_visible_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_auto');
+      let content = document.getElementById('content_hidden_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_clip_auto');
+      let content = document.getElementById('content_clip_auto');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter auto");
+
+    // scrollbar-gutter: always
+
+    test(function () {
+      let container = document.getElementById('container_auto_always');
+      let content = document.getElementById('content_auto_always');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always');
+      let content = document.getElementById('content_scroll_always');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always');
+      let content = document.getElementById('content_visible_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always');
+      let content = document.getElementById('content_hidden_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always');
+      let content = document.getElementById('content_clip_always');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always");
+
+    // scrollbar-gutter: always force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_force');
+      let content = document.getElementById('content_auto_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow auto, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_force');
+      let content = document.getElementById('content_scroll_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow scroll, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_force');
+      let content = document.getElementById('content_visible_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_force');
+      let content = document.getElementById('content_hidden_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_force');
+      let content = document.getElementById('content_clip_always_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always force");
+
+    // scrollbar-gutter: always both
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both');
+      let content = document.getElementById('content_auto_always_both');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always\"");
+    }, "overflow auto, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both');
+      let content = document.getElementById('content_scroll_always_both');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_scroll_always');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always\"");
+    }, "overflow scroll, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both');
+      let content = document.getElementById('content_visible_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow visible, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both');
+      let content = document.getElementById('content_hidden_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow hidden, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both');
+      let content = document.getElementById('content_clip_always_both');
+      assert_equals(container.offsetWidth, content.offsetWidth, "content width");
+      assert_equals(container.offsetLeft, content.offsetLeft, "content position");
+    }, "overflow clip, scrollbar-gutter always both");
+
+    // scrollbar-gutter: always both force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both_force');
+      let content = document.getElementById('content_auto_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_auto_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow auto, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both_force');
+      let content = document.getElementById('content_scroll_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_scroll_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow scroll, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both_force');
+      let content = document.getElementById('content_visible_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_visible_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow visible, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both_force');
+      let content = document.getElementById('content_hidden_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_hidden_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow hidden, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both_force');
+      let content = document.getElementById('content_clip_always_both_force');
+      assert_greater_than(container.offsetWidth, content.offsetWidth, "content width");
+      assert_less_than(container.offsetLeft, content.offsetLeft, "content position");
+      let reference = document.getElementById('content_clip_always_force');
+      assert_less_than(content.offsetWidth, reference.offsetWidth, "compare with \"always force\"");
+    }, "overflow clip, scrollbar-gutter always both force");
+
+    done();
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html
new file mode 100644
index 00000000000..27ac8f4c393
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html
@@ -0,0 +1,396 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with vertical left to right content</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .line {
+    display: flex;
+  }
+
+  .container {
+    writing-mode: vertical-lr;
+
+    height: 200px;
+    width: 200px;
+    margin: 10px;
+    padding: 0px;
+    border: none;
+    overflow-y: auto;
+    background: deepskyblue;
+  }
+
+  .content {
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    border: none;
+    background: lightsalmon;
+  }
+
+  /* scrollbar-gutter
+     Note: not testing "stable" because the decision to use overlay scrollbars
+     is up to the browser. The "always" keyword takes effect regardless of
+     whether classical or overlay scrollbars are being used.*/
+  .sg_auto {
+    scrollbar-gutter: auto;
+  }
+
+  .sg_always {
+    scrollbar-gutter: always;
+  }
+
+  .sg_always_both {
+    scrollbar-gutter: always both;
+  }
+
+  .sg_always_force {
+    scrollbar-gutter: always force;
+  }
+
+  .sg_always_both_force {
+    scrollbar-gutter: always both force;
+  }
+
+  /* overflow */
+  .container.ov_auto {
+    overflow-x: auto;
+  }
+
+  .container.ov_scroll {
+    overflow-x: scroll;
+  }
+
+  .container.ov_visible {
+    overflow: visible;
+  }
+
+  .container.ov_hidden {
+    overflow-x: hidden;
+  }
+
+  .container.ov_clip {
+    overflow-x: clip;
+  }
+</style>
+<body>
+
+  <div class="line">
+    <div class="container ov_auto sg_auto" id="container_auto_auto">
+      <div class="content" id="content_auto_auto">auto/auto</div>
+    </div>
+
+    <div class="container ov_scroll sg_auto" id="container_scroll_auto">
+      <div class="content" id="content_scroll_auto">scroll/auto</div>
+    </div>
+
+    <div class="container ov_visible sg_auto" id="container_visible_auto">
+      <div class="content" id="content_visible_auto">visible/auto</div>
+    </div>
+
+    <div class="container ov_hidden sg_auto" id="container_hidden_auto">
+      <div class="content" id="content_hidden_auto">hidden/auto</div>
+    </div>
+
+    <div class="container ov_clip sg_auto" id="container_clip_auto">
+      <div class="content" id="content_clip_auto">clip/auto</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always" id="container_auto_always">
+      <div class="content" id="content_auto_always">auto/always</div>
+    </div>
+
+    <div class="container ov_scroll sg_always" id="container_scroll_always">
+      <div class="content" id="content_scroll_always">scroll/always</div>
+    </div>
+
+    <div class="container ov_visible sg_always" id="container_visible_always">
+      <div class="content" id="content_visible_always">visible/always</div>
+    </div>
+
+    <div class="container ov_hidden sg_always" id="container_hidden_always">
+      <div class="content" id="content_hidden_always">hidden/always</div>
+    </div>
+
+    <div class="container ov_clip sg_always" id="container_clip_always">
+      <div class="content" id="content_clip_always">clip/always</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_force" id="container_auto_always_force">
+      <div class="content" id="content_auto_always_force">auto/always force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_force" id="container_scroll_always_force">
+      <div class="content" id="content_scroll_always_force">scroll/always force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_force" id="container_visible_always_force">
+      <div class="content" id="content_visible_always_force">visible/always force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_force" id="container_hidden_always_force">
+      <div class="content" id="content_hidden_always_force">hidden/always force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_force" id="container_clip_always_force">
+      <div class="content" id="content_clip_always_force">clip/always force</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both" id="container_auto_always_both">
+      <div class="content" id="content_auto_always_both">auto/always both</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both" id="container_scroll_always_both">
+      <div class="content" id="content_scroll_always_both">scroll/always both</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both" id="container_visible_always_both">
+      <div class="content" id="content_visible_always_both">visible/always both</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both" id="container_hidden_always_both">
+      <div class="content" id="content_hidden_always_both">hidden/always both</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both" id="container_clip_always_both">
+      <div class="content" id="content_clip_always_both">clip/always both</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both_force" id="container_auto_always_both_force">
+      <div class="content" id="content_auto_always_both_force">auto/always both force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both_force" id="container_scroll_always_both_force">
+      <div class="content" id="content_scroll_always_both_force">scroll/always both force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both_force" id="container_visible_always_both_force">
+      <div class="content" id="content_visible_always_both_force">visible/always both force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both_force" id="container_hidden_always_both_force">
+      <div class="content" id="content_hidden_always_both_force">hidden/always both force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both_force" id="container_clip_always_both_force">
+      <div class="content" id="content_clip_always_both_force">clip/always both force</div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    setup({ explicit_done: true });
+
+    // scrollbar-gutter: auto
+
+    test(function () {
+      let container = document.getElementById('container_auto_auto');
+      let content = document.getElementById('content_auto_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_auto');
+      let content = document.getElementById('content_scroll_auto');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_visible_auto');
+      let content = document.getElementById('content_visible_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_auto');
+      let content = document.getElementById('content_hidden_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_clip_auto');
+      let content = document.getElementById('content_clip_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter auto");
+
+    // scrollbar-gutter: always
+
+    test(function () {
+      let container = document.getElementById('container_auto_always');
+      let content = document.getElementById('content_auto_always');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always');
+      let content = document.getElementById('content_scroll_always');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always');
+      let content = document.getElementById('content_visible_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always');
+      let content = document.getElementById('content_hidden_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always');
+      let content = document.getElementById('content_clip_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always");
+
+    // scrollbar-gutter: always force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_force');
+      let content = document.getElementById('content_auto_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_force');
+      let content = document.getElementById('content_scroll_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_force');
+      let content = document.getElementById('content_visible_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_force');
+      let content = document.getElementById('content_hidden_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_force');
+      let content = document.getElementById('content_clip_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always force");
+
+    // scrollbar-gutter: always both
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both');
+      let content = document.getElementById('content_auto_always_both');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always\"");
+    }, "overflow auto, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both');
+      let content = document.getElementById('content_scroll_always_both');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always\"");
+    }, "overflow scroll, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both');
+      let content = document.getElementById('content_visible_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both');
+      let content = document.getElementById('content_hidden_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both');
+      let content = document.getElementById('content_clip_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always both");
+
+    // scrollbar-gutter: always both force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both_force');
+      let content = document.getElementById('content_auto_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow auto, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both_force');
+      let content = document.getElementById('content_scroll_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_scroll_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow scroll, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both_force');
+      let content = document.getElementById('content_visible_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_visible_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow visible, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both_force');
+      let content = document.getElementById('content_hidden_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_hidden_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow hidden, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both_force');
+      let content = document.getElementById('content_clip_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_clip_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow clip, scrollbar-gutter always both force");
+
+    done();
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html
new file mode 100644
index 00000000000..d4eab0bd698
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html
@@ -0,0 +1,397 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with vertical right to left content</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .line {
+    display: flex;
+  }
+
+  .container {
+    writing-mode: vertical-rl;
+
+    height: 200px;
+    width: 200px;
+    margin: 10px;
+    padding: 0px;
+    border: none;
+    overflow-y: auto;
+    background: deepskyblue;
+  }
+
+  .content {
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    border: none;
+    background: lightsalmon;
+  }
+
+  /* scrollbar-gutter
+     Note: not testing "stable" because the decision to use overlay scrollbars
+     is up to the browser. The "always" keyword takes effect regardless of
+     whether classical or overlay scrollbars are being used.*/
+  .sg_auto {
+    scrollbar-gutter: auto;
+  }
+
+  .sg_always {
+    scrollbar-gutter: always;
+  }
+
+  .sg_always_both {
+    scrollbar-gutter: always both;
+  }
+
+  .sg_always_force {
+    scrollbar-gutter: always force;
+  }
+
+  .sg_always_both_force {
+    scrollbar-gutter: always both force;
+  }
+
+  /* overflow */
+  .container.ov_auto {
+    overflow-x: auto;
+  }
+
+  .container.ov_scroll {
+    overflow-x: scroll;
+  }
+
+  .container.ov_visible {
+    overflow: visible;
+  }
+
+  .container.ov_hidden {
+    overflow-x: hidden;
+  }
+
+  .container.ov_clip {
+    overflow-x: clip;
+  }
+</style>
+<body>
+
+  <div class="line">
+    <div class="container ov_auto sg_auto" id="container_auto_auto">
+      <div class="content" id="content_auto_auto">auto/auto</div>
+    </div>
+
+    <div class="container ov_scroll sg_auto" id="container_scroll_auto">
+      <div class="content" id="content_scroll_auto">scroll/auto</div>
+    </div>
+
+    <div class="container ov_visible sg_auto" id="container_visible_auto">
+      <div class="content" id="content_visible_auto">visible/auto</div>
+    </div>
+
+    <div class="container ov_hidden sg_auto" id="container_hidden_auto">
+      <div class="content" id="content_hidden_auto">hidden/auto</div>
+    </div>
+
+    <div class="container ov_clip sg_auto" id="container_clip_auto">
+      <div class="content" id="content_clip_auto">clip/auto</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always" id="container_auto_always">
+      <div class="content" id="content_auto_always">auto/always</div>
+    </div>
+
+    <div class="container ov_scroll sg_always" id="container_scroll_always">
+      <div class="content" id="content_scroll_always">scroll/always</div>
+    </div>
+
+    <div class="container ov_visible sg_always" id="container_visible_always">
+      <div class="content" id="content_visible_always">visible/always</div>
+    </div>
+
+    <div class="container ov_hidden sg_always" id="container_hidden_always">
+      <div class="content" id="content_hidden_always">hidden/always</div>
+    </div>
+
+    <div class="container ov_clip sg_always" id="container_clip_always">
+      <div class="content" id="content_clip_always">clip/always</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_force" id="container_auto_always_force">
+      <div class="content" id="content_auto_always_force">auto/always force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_force" id="container_scroll_always_force">
+      <div class="content" id="content_scroll_always_force">scroll/always force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_force" id="container_visible_always_force">
+      <div class="content" id="content_visible_always_force">visible/always force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_force" id="container_hidden_always_force">
+      <div class="content" id="content_hidden_always_force">hidden/always force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_force" id="container_clip_always_force">
+      <div class="content" id="content_clip_always_force">clip/always force</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both" id="container_auto_always_both">
+      <div class="content" id="content_auto_always_both">auto/always both</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both" id="container_scroll_always_both">
+      <div class="content" id="content_scroll_always_both">scroll/always both</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both" id="container_visible_always_both">
+      <div class="content" id="content_visible_always_both">visible/always both</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both" id="container_hidden_always_both">
+      <div class="content" id="content_hidden_always_both">hidden/always both</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both" id="container_clip_always_both">
+      <div class="content" id="content_clip_always_both">clip/always both</div>
+    </div>
+  </div>
+
+  <div class="line">
+    <div class="container ov_auto sg_always_both_force" id="container_auto_always_both_force">
+      <div class="content" id="content_auto_always_both_force">auto/always both force</div>
+    </div>
+
+    <div class="container ov_scroll sg_always_both_force" id="container_scroll_always_both_force">
+      <div class="content" id="content_scroll_always_both_force">scroll/always both force</div>
+    </div>
+
+    <div class="container ov_visible sg_always_both_force" id="container_visible_always_both_force">
+      <div class="content" id="content_visible_always_both_force">visible/always both force</div>
+    </div>
+
+    <div class="container ov_hidden sg_always_both_force" id="container_hidden_always_both_force">
+      <div class="content" id="content_hidden_always_both_force">hidden/always both force</div>
+    </div>
+
+    <div class="container ov_clip sg_always_both_force" id="container_clip_always_both_force">
+      <div class="content" id="content_clip_always_both_force">clip/always both force</div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+
+    setup({ explicit_done: true });
+
+    // scrollbar-gutter: auto
+
+    test(function () {
+      let container = document.getElementById('container_auto_auto');
+      let content = document.getElementById('content_auto_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_auto');
+      let content = document.getElementById('content_scroll_auto');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_visible_auto');
+      let content = document.getElementById('content_visible_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_auto');
+      let content = document.getElementById('content_hidden_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter auto");
+
+    test(function () {
+      let container = document.getElementById('container_clip_auto');
+      let content = document.getElementById('content_clip_auto');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter auto");
+
+    // scrollbar-gutter: always
+
+    test(function () {
+      let container = document.getElementById('container_auto_always');
+      let content = document.getElementById('content_auto_always');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always');
+      let content = document.getElementById('content_scroll_always');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always');
+      let content = document.getElementById('content_visible_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always');
+      let content = document.getElementById('content_hidden_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always');
+      let content = document.getElementById('content_clip_always');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always");
+
+    // scrollbar-gutter: always force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_force');
+      let content = document.getElementById('content_auto_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow auto, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_force');
+      let content = document.getElementById('content_scroll_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow scroll, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_force');
+      let content = document.getElementById('content_visible_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_force');
+      let content = document.getElementById('content_hidden_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_force');
+      let content = document.getElementById('content_clip_always_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always force");
+
+    // scrollbar-gutter: always both
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both');
+      let content = document.getElementById('content_auto_always_both');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always\"");
+    }, "overflow auto, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both');
+      let content = document.getElementById('content_scroll_always_both');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always\"");
+    }, "overflow scroll, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both');
+      let content = document.getElementById('content_visible_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow visible, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both');
+      let content = document.getElementById('content_hidden_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow hidden, scrollbar-gutter always both");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both');
+      let content = document.getElementById('content_clip_always_both');
+      assert_equals(container.offsetHeight, content.offsetHeight, "content height");
+      assert_equals(container.offsetTop, content.offsetTop, "content position");
+    }, "overflow clip, scrollbar-gutter always both");
+
+    // scrollbar-gutter: always both force
+
+    test(function () {
+      let container = document.getElementById('container_auto_always_both_force');
+      let content = document.getElementById('content_auto_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_auto_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow auto, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_scroll_always_both_force');
+      let content = document.getElementById('content_scroll_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_scroll_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow scroll, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_visible_always_both_force');
+      let content = document.getElementById('content_visible_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_visible_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow visible, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_hidden_always_both_force');
+      let content = document.getElementById('content_hidden_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_hidden_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow hidden, scrollbar-gutter always both force");
+
+    test(function () {
+      let container = document.getElementById('container_clip_always_both_force');
+      let content = document.getElementById('content_clip_always_both_force');
+      assert_greater_than(container.offsetHeight, content.offsetHeight, "content height");
+      assert_less_than(container.offsetTop, content.offsetTop, "content position");
+      let reference = document.getElementById('content_clip_always_force');
+      assert_less_than(content.offsetHeight, reference.offsetHeight, "compare with \"always force\"");
+    }, "overflow clip, scrollbar-gutter always both force");
+
+    done();
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html
index afa483dd315..022a2d797b1 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html
@@ -23,12 +23,16 @@ img {
        border-top is 20x40 and the content box is 20x60.
        (note: height here is the block size of content-box.)
 
-  3rd: A green rect 20x100.
-       border-top is 20x40 and the content box is 20x60 because we compute
+  3rd: A green rect 10x100.
+       border-top is 10x40 and the content box is 10x60 because we compute
        the inline size by aspect-ratio which works with border-box and so the
-       inline size is 100px / 5 = 20px.
+       inline size is 100px / 10 = 10px.
        (note: height here is the block size of border-box.)
+
+  4th: A green rect 10x100.
+       border-top is 10x40 and the content box is 10x60 to add up to 10x100.
 -->
 <img src="support/1x1-green.png" style="height: 100px; aspect-ratio: auto 1/10; box-sizing: border-box;"
 ><img src="support/1x1-green.png" style="height: 60px; aspect-ratio: 1/3; box-sizing: content-box;"
-><img src="support/1x1-green.png" style="height: 100px; aspect-ratio: 1/5; box-sizing: border-box;">
+><img src="support/1x1-green.png" style="height: 100px; aspect-ratio: 1/10; box-sizing: border-box;"
+><img src="support/1x1-green.png" style="width: 10px; aspect-ratio: 1/6; box-sizing: content-box;">
diff --git a/tests/wpt/web-platform-tests/css/css-tables/chrome-rowspan-bug.html b/tests/wpt/web-platform-tests/css/css-tables/chrome-rowspan-bug.html
new file mode 100644
index 00000000000..faf54671cf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/chrome-rowspan-bug.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<title>caption</title>
+<meta name="flags" content="ahem">
+<link rel="author" title="Aleks Totic" href="atotic@chromium.org" />
+<link rel="help" href="https://crbug.com/1180592"/>
+<style>
+  main table {
+    border-spacing: 0;
+  }
+  main table td {
+    border: 1px solid black;
+    padding: 0;
+    width: 50px;
+    height: 25px;
+  }
+</style>
+
+<main>
+  <table>
+    <tbody>
+      <tr>
+        <td></td>
+        <td id="target" rowspan=5></td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr>
+        <td rowspan=5></td>
+        <td rowspan=5></td>
+        <td></td>
+      </tr>
+      <tr>
+        <td></td>
+      </tr>
+    </tbody>
+  </table>
+</main>
+
+<script>
+  test(_ => {
+    assert_equals(document.body.querySelector("#target").offsetHeight, 81);
+  }, "table tracks correct use of rowspan");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/col-collapse-table-size.html b/tests/wpt/web-platform-tests/css/css-tables/tentative/col-collapse-table-size.html
new file mode 100644
index 00000000000..a28a1e204a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/tentative/col-collapse-table-size.html
@@ -0,0 +1,88 @@
+<!doctype html>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/check-layout-th.js"></script>
+<title>col visibility:collapse and minmax sizes</title>
+<link rel="author" title="Aleks Totic" href="atotic@chromium.org" />
+<link rel="help" href="https://www.w3.org/TR/css-tables-3/#visibility-collapse-track-rendering"/>
+
+<style>
+
+  main table {
+    right: 0;
+    display:inline-table;
+    border: 1px solid black;
+  }
+  main col {
+    visibility:collapse;
+  }
+  main td {
+    width: 200px;
+    height: 20px;
+  }
+  main caption {
+    background: yellow;
+  }
+  main td:nth-child(1) {
+    background: rgba(255,0,0,0.2);
+  }
+  main td:nth-child(2) {
+    background: rgba(200,200,200,1.0);
+  }
+  main table:hover col {
+    visibility: visible;
+  }
+</style>
+
+<h1>Interactions between &lt;COL&gt; visiblity:collapse, and table inline size</h1>
+<p>What happens to the table size when column collapses? Should the space taken up by the table
+  remain the same, but the table iteslf should shrink?</p>
+<p>Hovering over tables will turn off column collapsing</p>
+<main>
+
+<p style="position:absolute;top:200px;left:0;width: 300px">
+Tables to the right are absolutely positioned</p>
+<table id="abs" style="position:absolute;top:200px;right:0">
+  <col>
+  <td style="width:100px"></td>
+  <td>absolute, right:0</td>
+</table>
+
+ <table id="abscaption" style="position:absolute; top:260px;right:0" >
+  <col>
+  <caption style="width:250px">caption</caption>
+  <td></td>
+  <td>absolute, right:0</td>
+</table>
+
+<p style="margin-top:200px">Inline tables</p>
+<table id="caption">
+  <col>
+  <caption style="width:500px">caption</caption>
+  <td></td>
+  <td></td>
+</table><span style="font-size:50px">after</span>
+<p>
+
+<table id="plain">
+  <col>
+  <td style="width:100px">td</td>
+  <td></td>
+</table><span style="font-size:50px">after</span>
+
+<p>Table as a flex item</p>
+
+<div style="display:flex;width:700px">
+
+<table id="plain">
+  <col>
+  <td style="width:100px">td</td>
+  <td></td>
+</table>
+<div style="flex-grow:1;background-color:yellow">
+</div>
+</main>
+
+<script>
+  checkLayout("main table");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html
new file mode 100644
index 00000000000..7c15b2a749d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html
@@ -0,0 +1,118 @@
+<!doctype html>
+<title>Table minmax tricks</title>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<link rel="author" title="Aleks Totic" href="atotic@chromium.org" />
+<link rel="help" href="https://www.w3.org/TR/css-tables-3/" />
+<style>
+  main table {
+   table-layout:fixed;
+   width: 100%;
+   background: #ddd;
+   border-spacing: 0;
+  }
+  main td {
+    padding: 0;
+  }
+</style>
+<h1>Infinite intrinsic table widths</h1>
+<p>Originally, algorithm for computing intrinsic table inline size had a special case: <br>
+  If table is fixed, and has a width:%, its intrinsic inline size was "infinite". <br>
+This ensured that fixed table with 100% width inside block layout would expand to container's width. </p>
+<p>Different containers do not have reasonable handling of intrinsic infinitely sized
+children. For those, table's intrinsic size should never be infinite, but instead
+default to regular max size.</p>
+
+<main>
+<h3>Flexbox</h3>
+
+<p>flex width:auto</p>
+<div id="flextest" style="display:flex;">
+  <table>
+    <td>flex</td>
+  </table>
+  <div style="width:98px;border:1px solid black;flex-shrink:0">flex div</div>
+</div>
+
+<p>flex width:max-content</p>
+<div id="flextest_max" style="display:flex;width:max-content">
+  <table>
+    <td><div style="width:100px">flex</div></td>
+  </table>
+  <div style="width:100px;border:1px solid black;flex-shrink:0">flex div</div>
+</div>
+
+<h3>Grid</h3>
+<p>grid width:auto</p>
+<div id="grid" style="display:grid;grid-template-columns: 1fr;width:auto">
+  <table>
+    <td><div style="width:100px">grid</div></td>
+  </table>
+</div>
+<p>grid width:max-content</p>
+<div id="grid_max" style="display:grid;grid-template-columns: 1fr;width:max-content">
+  <table>
+    <td><div style="width:100px">grid</div></td>
+  </table>
+</div>
+
+<h3>Table</h3>
+<table id="table_container" style="table-layout:auto;width:auto; background: #aaa;">
+  <tr>
+    <td>
+      <table>
+        <td><div style="width:100px">table</div></td>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<h3>Absolute</h3>
+<div id="absolute" style="width:400px;height:100px;outline:solid 1px green;position:relative">
+  <table style="position:absolute;right:0;top:0">
+    <td>absolute</td>
+  </table>
+</div>
+
+<script>
+  test(_ => {
+    let flexbox = document.querySelector("#flextest");
+    let table = flexbox.querySelector("table");
+    let div = flexbox.querySelector("div");
+    assert_equals(div.offsetWidth, 100);
+    assert_equals(flexbox.offsetWidth, document.body.offsetWidth);
+    assert_equals(flexbox.offsetWidth, table.offsetWidth + div.offsetWidth);
+  }, "table's max width inside flexbox width:auto is not infinite");
+
+  test(_ => {
+    let flexbox = document.querySelector("#flextest_max");
+    let table = flexbox.querySelector("table");
+    assert_equals(table.offsetWidth, 100);
+  }, "table's max width inside flexbox width:max-content is not infinite");
+
+  test(_ => {
+    let grid = document.querySelector("#grid");
+    let table = grid.querySelector("table");
+    assert_equals(grid.offsetWidth, document.body.offsetWidth);
+    assert_equals(grid.offsetWidth, table.offsetWidth);
+  }, "table's max width inside grid width:auto is not infinite");
+
+  test(_ => {
+    let grid = document.querySelector("#grid_max");
+    let table = grid.querySelector("table");
+    assert_equals(grid.offsetWidth, 100);
+    assert_equals(table.offsetWidth, 100);
+  }, "table's max width inside grid width:max-content is not infinite");
+
+  test(_ => {
+    let table = document.querySelector("#table_container");
+    assert_equals(table.offsetWidth, document.body.offsetWidth);
+  }, "table's max width inside a table cell is infinite");
+
+  test(_ => {
+    let abs = document.querySelector("#absolute");
+    let table = abs.querySelector("table");
+    assert_equals(table.offsetWidth, abs.offsetWidth);
+  }, "table's max width inside an absolute block is infinite");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-computed-value-001.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-computed-value-001.html
new file mode 100644
index 00000000000..3eb94c54d3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-computed-value-001.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: computed value of 'tab-size'</title>
+
+  <!--
+
+  Issue 463: [css-text] The computed value and animation type of tab-size
+  https://github.com/w3c/csswg-drafts/issues/463
+
+  -->
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#tab-size-property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that the computed value of 'tab-size' is a number when it is specified as such or is a length (absolute or relative) when it is specified as such." name="assert">
+
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <script src="/resources/testharness.js"></script>
+
+  <script src="/resources/testharnessreport.js"></script>
+
+  <style>
+  div#target
+    {
+      font-family: Ahem;
+      font-size: 20px;
+    }
+  </style>
+
+  <div id="target">A</div>
+
+  <div id="log"></div>
+
+  <script>
+  function startTesting()
+  {
+
+  var targetElement = document.getElementById("target");
+
+    function verifyComputedStyle(property_name, specified_value, expected_value, description)
+    {
+
+    test(function()
+      {
+
+      targetElement.style.setProperty(property_name, "initial");
+
+      /*
+      The purpose of setting the property to its initial value
+      is to act as a fallback value in case the specified value
+      fails. Since we are running 11 consecutive tests on the
+      same element, then it is necessary to 'reset' its property
+      to an initial value.
+      */
+
+      targetElement.style.setProperty(property_name, specified_value);
+
+      assert_equals(getComputedStyle(targetElement)[property_name], expected_value);
+
+      }, description);
+    }
+
+    function compareValueCloseTo(property_name, specified_value, epsilon, expected_value, description)
+    {
+
+    test(function()
+      {
+
+      targetElement.style.setProperty(property_name, "initial");
+
+      targetElement.style.setProperty(property_name, specified_value);
+
+      var computedSpecifiedValue = parseFloat(getComputedStyle(targetElement)[property_name]);
+
+      assert_true(isFinite(computedSpecifiedValue)); /* We can not accept NaN as value */
+
+      targetElement.style.setProperty(property_name, expected_value);
+
+      var computedExpectedValue = parseFloat(getComputedStyle(targetElement)[property_name]);
+
+      assert_array_approx_equals(computedSpecifiedValue, computedExpectedValue, epsilon);
+
+    } , description);
+
+  }
+
+    verifyComputedStyle("tab-size", "4", "4", "testing tab-size: 4");
+
+ /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */
+
+  /* absolute length units: in, cm, mm, pt, pc, Q, px */
+
+    verifyComputedStyle("tab-size", "0.5in", "48px", "testing tab-size: 0.5in");
+
+    verifyComputedStyle("tab-size", "2.54cm", "96px", "testing tab-size: 2.54cm");
+
+    verifyComputedStyle("tab-size", "25.4mm", "96px", "testing tab-size: 25.4mm");
+
+    verifyComputedStyle("tab-size", "18pt", "24px", "testing tab-size: 18pt");
+
+    verifyComputedStyle("tab-size", "5pc", "80px", "testing tab-size: 5pc");
+
+    verifyComputedStyle("tab-size", "101.6Q", "96px", "testing tab-size: 101.6Q");
+
+    verifyComputedStyle("tab-size", "7px", "7px", "testing tab-size: 7px");
+
+ /* verifyComputedStyle(property_name, specified_value, expected_value, description) */
+
+  /* relative length units: em, ex, rem */
+
+    verifyComputedStyle("tab-size", "1em", "20px", "testing tab-size: 1em");
+
+ /* compareValueCloseTo(property_name, specified_value, epsilon, expected_value, description)  */
+
+    compareValueCloseTo("tab-size", "2ex", 0.001, "32px", "testing tab-size: 2ex");
+
+    /*
+    For this sub-test, we set the tolerance precision (epsilon)
+    to (0.001 === 1 thousandth).
+    */
+
+    verifyComputedStyle("tab-size", "3rem", "48px", "testing tab-size: 3rem");
+
+  /*
+
+  NOT tested are: vw, vh, vmin, vmax and ch units
+
+    verifyComputedStyle("tab-size", "4vw", "?px", "testing tab-size: 4vw");
+
+    verifyComputedStyle("tab-size", "5vh", "?px", "testing tab-size: 5vh");
+
+    verifyComputedStyle("tab-size", "6vmin", "?px", "testing tab-size: 6vmin");
+
+    verifyComputedStyle("tab-size", "7vmax", "?px", "testing tab-size: 7vmax");
+
+    verifyComputedStyle("tab-size", "8ch", "?px", "testing tab-size: 8ch");
+
+  */
+
+  }
+
+  startTesting();
+
+  </script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
index 4f8aa52fd10..95277d4b8cf 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
@@ -2,7 +2,19 @@
 <html class="reftest-wait">
 <link rel="match" href="transform-interpolation-ref.html?skew">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/">
-
+<!--
+Fuzzy match is needed because the browser may raster in different scales for the
+test and the reference. For example, in the first case the test animates skew
+from 0deg to 60deg and take snapshot when the skew is 30deg, while the reference
+animates skew from 30deg to 30deg, and the browser may choose a higher raster
+scale for the former because at 60deg the ideal scale is higher.
+  3000: 130 * 6 * 2 + 80 * 9 * 2
+  130, 80: width and height of the div
+  6: number of antialiased horizontal edges
+  9: number of antialiased vertical edges
+  2: number of antialiased pixels for each pixel on the edge
+-->
+<meta name=fuzzy content="0-255;0-3000">
 <script src="../../../common/reftest-wait.js"></script>
 <script src="support/transform-interpolation-reftests.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html b/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html
index 9055e7dfd5f..46bb91c8ba0 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html
@@ -35,6 +35,7 @@ test_valid_value("scale", "100% 200%", "1 2");
 test_valid_value("scale", "100 200 1", "100 200");
 test_valid_value("scale", "100% 200% 1", "1 2");
 test_valid_value("scale", "100 200 300");
+test_valid_value("scale", "100 100 2", "100 100 2");
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html
new file mode 100644
index 00000000000..1f60f3fcb0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: combination of the CSS translate and transform properties and the SVG transform attribute</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <meta name="flags" content="svg">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="100" y="100" width="200" height="200" fill="green"/>
+    </svg>
+</body>
+</html>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html
new file mode 100644
index 00000000000..cce3f40477d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: combination of the CSS translate property and SVG transform attribute</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <meta name="flags" content="svg">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="100" y="100" width="200" height="200" fill="green"/>
+    </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-in-svg-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-in-svg-ref.html
new file mode 100644
index 00000000000..ed185a63b69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-in-svg-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: the CSS translate property applied to an SVG element</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <meta name="flags" content="svg">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="100" y="100" width="100" height="100" fill="green" />
+    </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html
new file mode 100644
index 00000000000..6fd8027964d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: combination of the CSS translate and transform properties and the SVG transform attribute</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <link rel="help" href="https://www.w3.org/TR/css-transforms-2/#propdef-translate">
+    <link rel="match" href="reference/translate-and-transform-attribute-in-svg-ref.html">
+    <meta name="flags" content="svg">
+    <meta name="assert" content="The CSS translate property is applied in combination with the CSS transform property and the SVG transform attribute has no effect.">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="101" y="101" width="198" height="198" fill="red"/>
+        <rect width="100" height="100" fill="green" transform="rotate(45deg)" style="transform: scale(2); translate: 100px 100px" />
+    </svg>
+</body>
+</html>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html
new file mode 100644
index 00000000000..e44fd145060
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: combination of the CSS translate property and SVG transform attribute</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <link rel="help" href="https://www.w3.org/TR/css-transforms-2/#propdef-translate">
+    <link rel="match" href="reference/translate-and-transform-css-property-in-svg-ref.html">
+    <meta name="flags" content="svg">
+    <meta name="assert" content="The CSS translate property is applied in combination with the SVG transform attribute in the absence of a CSS transform property.">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="101" y="101" width="198" height="198" fill="red"/>
+        <rect width="100" height="100" fill="green" transform="scale(2)" style="translate: 100px 100px" />
+    </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-in-svg.html b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-in-svg.html
new file mode 100644
index 00000000000..6652f543f47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-in-svg.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Transforms Test: the CSS translate property applied to an SVG element</title>
+    <link rel="author" title="Antoine Quint" href="mailto:graouts@apple.com">
+    <link rel="help" href="https://www.w3.org/TR/css-transforms-2/#propdef-translate">
+    <link rel="match" href="reference/translate-in-svg-ref.html">
+    <meta name="flags" content="svg">
+    <meta name="assert" content="The CSS translate property is applied to an SVG element.">
+    <style type="text/css">
+    svg {
+        width: 400px;
+        height: 400px;
+    }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green rectangle and no red.</p>
+    <svg>
+        <rect x="101" y="101" width="98" height="98" fill="red"/>
+        <rect width="100" height="100" fill="green" style="translate: 100px 100px" />
+    </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-computed.html b/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-computed.html
new file mode 100644
index 00000000000..7443ddb645c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-computed.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Infinity and NaN: calc() computed value.</title>
+<link rel="author" title="Seokho Song"  href="mailto:0xdevssh@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-values/#calc-type-checking">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+const APPROX_INFINITY = 3.35544e+07;
+const APPROX_NEGATIVE_INFINITY = -APPROX_INFINITY;
+
+// For <length>
+test_computed_value_greater_or_lower_than("width", "calc(NaN * 1px)", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(infinity * 1px)", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(infinity * 1cm)", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(NaN * 1rem)", APPROX_INFINITY);
+
+test_computed_value_greater_or_lower_than("width", "calc(infinity * 1px - infinity * 1%)", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(infinity * 1px + infinity * 1%)", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(min(NaN * 1px, infinity * 1px) + max(infinity * 1px, -infinity * 1px))", APPROX_INFINITY);
+test_computed_value_greater_or_lower_than("width", "calc(infinity * 1px - max(infinity * 1%, 0%))", APPROX_INFINITY);
+
+test_computed_value_greater_or_lower_than("width", "calc(max(infinity * 1px, 10px))", APPROX_INFINITY);
+
+test_computed_value_greater_or_lower_than("margin-left", "calc(-infinity * 1px)", APPROX_NEGATIVE_INFINITY);
+test_computed_value_greater_or_lower_than("margin-left", "calc(min(1px, -infinity * 1%))", APPROX_NEGATIVE_INFINITY);
+
+test_computed_value_greater_or_lower_than("margin-left", "calc(-infinity * 1%)", APPROX_NEGATIVE_INFINITY);
+test_computed_value_greater_or_lower_than("margin-left", "calc(max(10000px, 0px) + min(-infinity * 1px, infinity * 1px))", APPROX_NEGATIVE_INFINITY);
+
+test_computed_value_greater_or_lower_than("margin-left", "calc(-infinity * 1px - infinity * 1px)", APPROX_NEGATIVE_INFINITY);
+test_computed_value_greater_or_lower_than("margin-left", "calc(min(-infinity * 1px, 10px))", APPROX_NEGATIVE_INFINITY);
+
+// ----------------
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/selectors/user-invalid.html b/tests/wpt/web-platform-tests/css/selectors/user-invalid.html
index 05cf2b67903..1f3ad22a231 100644
--- a/tests/wpt/web-platform-tests/css/selectors/user-invalid.html
+++ b/tests/wpt/web-platform-tests/css/selectors/user-invalid.html
@@ -3,10 +3,11 @@
 <link rel="help" href="https://drafts.csswg.org/selectors/#user-pseudos">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<input>
+<input value="bar" pattern="foo">
 <script>
 test(() => {
   const input = document.querySelector('input');
+  assert_false(input.validity.valid, "Should be invalid");
   // The selector can't match because no interaction has happened.
   assert_false(input.matches(':user-invalid'));
 }, ':user-invalid selector should be supported');
diff --git a/tests/wpt/web-platform-tests/css/selectors/user-valid.html b/tests/wpt/web-platform-tests/css/selectors/user-valid.html
new file mode 100644
index 00000000000..36ca7afe141
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/selectors/user-valid.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<title>Support for the :user-valid pseudo-class</title>
+<link rel="help" href="https://drafts.csswg.org/selectors/#user-pseudos">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<input>
+<script>
+test(() => {
+  const input = document.querySelector('input');
+  assert_true(input.validity.valid);
+  // The selector can't match because no interaction has happened.
+  assert_false(input.matches(':user-valid'));
+}, ':user-valid selector should be supported');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/support/computed-testcommon.js b/tests/wpt/web-platform-tests/css/support/computed-testcommon.js
index 43851cb87fc..1db50b0c107 100644
--- a/tests/wpt/web-platform-tests/css/support/computed-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/support/computed-testcommon.js
@@ -36,6 +36,23 @@ function test_computed_value(property, specified, computed, titleExtra) {
   }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
 }
 
+function test_computed_value_greater_or_lower_than(property, specified, expected, titleExtra) {
+    test(() => {
+      const target = document.getElementById('target');
+      assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
+      assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
+      target.style[property] = '';
+      target.style[property] = specified;
+      let readValue = parseFloat(getComputedStyle(target)[property]);
+      assert_true(isFinite(readValue), specified + " expected finite value but got " + readValue)
+      assert_false(isNaN(readValue),   specified + " expected finite value but got " + readValue)
+      if (expected > 0)
+        assert_greater_than_equal(readValue, expected, specified);
+      else
+        assert_less_than_equal(readValue, expected, specified);
+  }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
+}
+
 function test_pseudo_computed_value(pseudo, property, specified, computed, titleExtra) {
   if (!computed)
     computed = specified;
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
index 7cf7f73a868..49060bdd8e6 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
@@ -140,6 +140,8 @@ It is possible to customize the set of scopes with a metadata comment, such as
 //       ==> would only run in the window and service worker scope
 // META: global=dedicatedworker
 //       ==> would run in the default dedicated worker scope
+// META: global=dedicatedworker-module
+//       ==> would run in the dedicated worker scope as a module
 // META: global=worker
 //       ==> would run in the dedicated, shared, and service worker scopes
 ```
@@ -149,8 +151,13 @@ are:
 
 * `window` (default): to be run at <code><var>x</var>.any.html</code>
 * `dedicatedworker` (default): to be run at <code><var>x</var>.any.worker.html</code>
-* `serviceworker`: to be run at <code><var>x</var>.any.serviceworker.html</code> (`.https` is implied)
+* `dedicatedworker-module` to be run at <code><var>x</var>.any.worker-module.html</code>
+* `serviceworker`: to be run at <code><var>x</var>.any.serviceworker.html</code> (`.https` is
+  implied)
+* `serviceworker-module`: to be run at <code><var>x</var>.any.serviceworker-module.html</code>
+  (`.https` is implied)
 * `sharedworker`: to be run at <code><var>x</var>.any.sharedworker.html</code>
+* `sharedworker-module`: to be run at <code><var>x</var>.any.sharedworker-module.html</code>
 * `jsshell`: to be run in a JavaScript shell, without access to the DOM
   (currently only supported in SpiderMonkey, and skipped in wptrunner)
 * `worker`: shorthand for the dedicated, shared, and service worker scopes
@@ -183,6 +190,10 @@ Use `// META: script=link/to/resource.js` at the beginning of the resource. For
 
 can be used to include both the global and a local `utils.js` in a test.
 
+In window environments, the script will be included using a classic `<script>` tag. In classic
+worker environments, the script will be imported using `importScripts()`. In module worker
+environments, the script will be imported using a static `import`.
+
 ### Specifying a timeout of long
 
 Use `// META: timeout=long` at the beginning of the resource.
diff --git a/tests/wpt/web-platform-tests/editing/data/delete.js b/tests/wpt/web-platform-tests/editing/data/delete.js
index 7fa2c4cfdfc..138a749500b 100644
--- a/tests/wpt/web-platform-tests/editing/data/delete.js
+++ b/tests/wpt/web-platform-tests/editing/data/delete.js
@@ -2560,4 +2560,29 @@ var browserTests = [
     "foo{}bar",
     [true],
     {"delete":[false,false,"",false,false,""]}],
+["foo<span contenteditable=false>bar</span>[]baz",
+    [["delete",""]],
+    "foo{}baz",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["foo<span contenteditable=false><span>b</span><span>a</span><span>r</span></span>[]baz",
+    [["delete",""]],
+    "foo{}baz",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["foo<div contenteditable=false>bar</div>[]baz",
+    [["delete",""]],
+    "foo{}baz",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["foo<span contenteditable=false><b>bar</b></span>[]baz",
+    [["delete",""]],
+    "foo{}baz",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["foo<span>bar<span contenteditable=false>baz</span></span>[]qux",
+    [["delete",""]],
+    "foo<span>bar{}</span>qux",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
 ]
diff --git a/tests/wpt/web-platform-tests/editing/data/forwarddelete.js b/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
index 90310f8c2c8..cc67b35c27e 100644
--- a/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
+++ b/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
@@ -2445,4 +2445,29 @@ var browserTests = [
     "foo{}bar",
     [true],
     {"forwarddelete":[false,false,"",false,false,""]}],
+["foo[]<span contenteditable=false>bar</span>baz",
+    [["forwarddelete",""]],
+    "foo{}baz",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["foo[]<span contenteditable=false><span>b</span><span>a</span><span>r</span></span>baz",
+    [["forwarddelete",""]],
+    "foo{}baz",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["foo[]<div contenteditable=false>bar</div>baz",
+    [["forwarddelete",""]],
+    "foo{}baz",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["foo[]<span contenteditable=false><b>bar</b></span>baz",
+    [["forwarddelete",""]],
+    "foo{}baz",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["foo<span>bar[]<span contenteditable=false>baz</span></span>qux",
+    [["forwarddelete",""]],
+    "foo<span>bar{}</span>qux",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
 ]
diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html b/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html
index 4cb3c68db63..8c3a9d11957 100644
--- a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html
+++ b/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html
@@ -6,19 +6,8 @@
 <script>
 setup({explicit_done:true});
 window.onmessage = function(e) {
-    var actual = e.data;
     test(function() {
-        // Make the difference between Firefox and Chrome visible separately
-        // from the comparison of the entire log string failing to match.
-        var endedWith = false;
-        if (actual.endsWith(",willspineventloop,")) {
-            endedWith = true;
-            actual += "innerbodyfocus,";
-        }
-        assert_true(endedWith, "Should not have gotten innerbodyfocus after willspineventloop");
-    }, "Check trailing events");
-    test(function() {
-        assert_equals(actual, "outerparser,activeElement:BODY,willfocusiframe,didfocusiframe,activeElement:IFRAME,willbluriframe,didbluriframe,activeElement:IFRAME,willspineventloop,innerbodyfocus,", 'Check log');
+        assert_equals(e.data, "outerparser,activeElement:BODY,willfocusiframe,didfocusiframe,activeElement:IFRAME,willbluriframe,didbluriframe,activeElement:IFRAME,willspineventloop,", 'Check log');
     }, "Check result");
     w.close();
     done();
diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html b/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html
index 81dbfd28d03..2f6a8ac853c 100644
--- a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html
+++ b/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html
@@ -6,19 +6,8 @@
 <script>
 setup({explicit_done:true});
 window.onmessage = function(e) {
-    var actual = e.data;
     test(function() {
-        // Make the difference between Firefox and Chrome visible separately
-        // from the comparison of the entire log string failing to match.
-        var endedWith = false;
-        if (actual.endsWith(",willspineventloop,")) {
-            endedWith = true;
-            actual += "innerbodyfocus,";
-        }
-        assert_true(endedWith, "Should not have gotten innerbodyfocus after willspineventloop");
-    }, "Check trailing events");
-    test(function() {
-        assert_equals(actual, "outerparse,activeElement:BODY,willfocusiframe,didfocusiframe,activeElement:IFRAME,willbluriframe,didbluriframe,activeElement:IFRAME,willspineventloop,innerbodyfocus,", 'Check log');
+        assert_equals(e.data, "outerparse,activeElement:BODY,willfocusiframe,didfocusiframe,activeElement:IFRAME,willbluriframe,didbluriframe,activeElement:IFRAME,willspineventloop,", 'Check log');
     }, "Check result");
     w.close();
     done();
diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html b/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html
index bc78e6e0538..7d47e7ecb9b 100644
--- a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html
+++ b/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html
@@ -8,7 +8,9 @@
 <h1>Inner</h1>
 <script>
 document.body.onfocus = function() {
-    parent.postMessage("innerbodyfocus,", "*");
+    // Commented out pending resolution of
+    // https://github.com/whatwg/html/issues/6209
+    // parent.postMessage("innerbodyfocus,", "*");
 }
 document.body.onblur = function() {
     parent.postMessage("innerbodyblur,", "*");
diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html b/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html
index bc78e6e0538..7d47e7ecb9b 100644
--- a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html
+++ b/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html
@@ -8,7 +8,9 @@
 <h1>Inner</h1>
 <script>
 document.body.onfocus = function() {
-    parent.postMessage("innerbodyfocus,", "*");
+    // Commented out pending resolution of
+    // https://github.com/whatwg/html/issues/6209
+    // parent.postMessage("innerbodyfocus,", "*");
 }
 document.body.onblur = function() {
     parent.postMessage("innerbodyblur,", "*");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/image.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/image.tentative.https.html
new file mode 100644
index 00000000000..d0cbf472a3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/image.tentative.https.html
@@ -0,0 +1,114 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+
+<script>
+
+promise_test_parallel(async test => {
+  const same_origin = get_host_info().HTTPS_ORIGIN;
+  const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const cookie_key = "coep_credentialless_image";
+  const cookie_same_origin = "same_origin";
+  const cookie_cross_origin = "cross_origin";
+
+  // Set cookie on same_origin.
+  document.cookie = `${cookie_key}=${cookie_same_origin}`;
+
+  // Set cookie on cross_origin.
+  {
+    const w_token = token();
+    const w_url = cross_origin + executor_path + `&uuid=${w_token}`;
+    const w = window.open(w_url);
+
+    const reply_token = token();
+    send(w_token, `
+      document.cookie = "${cookie_key}=${cookie_cross_origin}";
+      send("${reply_token}", "done");
+    `);
+    assert_equals(await receive(reply_token), "done");
+    w.close();
+  }
+
+  // One window with COEP:none. (control)
+  const w_control_token = token();
+  const w_control_url = same_origin + executor_path +
+    coep_none + `&uuid=${w_control_token}`
+  const w_control = window.open(w_control_url);
+  add_completion_callback(() => w_control.close());
+
+  // One window with COEP:credentialless. (experiment)
+  const w_credentialless_token = token();
+  const w_credentialless_url = same_origin + executor_path +
+    coep_credentialless + `&uuid=${w_credentialless_token}`;
+  const w_credentialless = window.open(w_credentialless_url);
+  add_completion_callback(() => w_credentialless.close());
+
+  let imgTest = function(
+    description, origin, mode,
+    expected_cookies_control,
+    expected_cookies_credentialless)
+  {
+    promise_test_parallel(async test => {
+      const token_1 = token();
+      const token_2 = token();
+
+      send(w_control_token, `
+        let img = document.createElement("img");
+        img.src = "${showRequestHeaders(origin, token_1)}";
+        ${mode};
+        document.body.appendChild(img);
+      `);
+      send(w_credentialless_token, `
+        let img = document.createElement("img");
+        img.src = "${showRequestHeaders(origin, token_2)}";
+        ${mode};
+        document.body.appendChild(img);
+      `);
+
+      const headers_control = JSON.parse(await receive(token_1));
+      const headers_credentialless = JSON.parse(await receive(token_2));
+
+      assert_equals(parseCookies(headers_control)[cookie_key],
+        expected_cookies_control,
+        "coep:none => ");
+      assert_equals(parseCookies(headers_credentialless)[cookie_key],
+        expected_cookies_credentialless,
+        "coep:credentialless => ");
+    }, `image ${description}`)
+  };
+
+  // Same-origin request always contains Cookies:
+  imgTest("same-origin + undefined",
+    same_origin, '',
+    cookie_same_origin,
+    cookie_same_origin);
+  imgTest("same-origin + anonymous",
+    same_origin, 'img.crossOrigin="anonymous"',
+    cookie_same_origin,
+    cookie_same_origin);
+  imgTest("same-origin + use-credentials",
+    same_origin, 'img.crossOrigin="use-credentials"',
+    cookie_same_origin,
+    cookie_same_origin);
+
+  // Cross-origin request contains cookies in the following cases:
+  // - COEP:credentialless is not set.
+  // - img.crossOrigin is `use-credentials`.
+  imgTest("cross-origin + undefined",
+    cross_origin, '',
+    cookie_cross_origin,
+    undefined);
+  imgTest("cross-origin + anonymous",
+    cross_origin, 'img.crossOrigin="anonymous"',
+    undefined,
+    undefined);
+  imgTest("cross-origin + use-credentials",
+    cross_origin, 'img.crossOrigin="use-credentials"',
+    cookie_cross_origin,
+    cookie_cross_origin);
+}, "Main");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/link.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/link.tentative.https.html
new file mode 100644
index 00000000000..17085d0face
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/link.tentative.https.html
@@ -0,0 +1,116 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+
+<script>
+
+promise_test_parallel(async test => {
+  const same_origin = get_host_info().HTTPS_ORIGIN;
+  const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const cookie_key = "coep_credentialless_link";
+  const cookie_same_origin = "same_origin";
+  const cookie_cross_origin = "cross_origin";
+
+  // Set cookie on same_origin.
+  document.cookie = `${cookie_key}=${cookie_same_origin}`;
+
+  // Set cookie on cross_origin.
+  {
+    const w_token = token();
+    const w_url = cross_origin + executor_path + `&uuid=${w_token}`;
+    const w = window.open(w_url);
+
+    const reply_token = token();
+    send(w_token, `
+      document.cookie = "${cookie_key}=${cookie_cross_origin}";
+      send("${reply_token}", "done");
+    `);
+    assert_equals(await receive(reply_token), "done");
+    w.close();
+  }
+
+  // One window with COEP:none. (control)
+  const w_control_token = token();
+  const w_control_url = same_origin + executor_path +
+    coep_none + `&uuid=${w_control_token}`
+  const w_control = window.open(w_control_url);
+  add_completion_callback(() => w_control.close());
+
+  // One window with COEP:credentialless. (experiment)
+  const w_credentialless_token = token();
+  const w_credentialless_url = same_origin + executor_path +
+    coep_credentialless + `&uuid=${w_credentialless_token}`;
+  const w_credentialless = window.open(w_credentialless_url);
+  add_completion_callback(() => w_credentialless.close());
+
+  let linkTest = function(
+    description, origin, mode,
+    expected_cookies_control,
+    expected_cookies_credentialless)
+  {
+    promise_test_parallel(async test => {
+      const token_1 = token();
+      const token_2 = token();
+
+      send(w_control_token, `
+        let link = document.createElement("link");
+        link.href = "${showRequestHeaders(origin, token_1)}";
+        link.rel = "stylesheet";
+        ${mode}
+        document.head.appendChild(link);
+      `);
+      send(w_credentialless_token, `
+        let link = document.createElement("link");
+        link.href = "${showRequestHeaders(origin, token_2)}";
+        link.rel = "stylesheet";
+        ${mode}
+        document.head.appendChild(link);
+      `);
+
+      const headers_control = JSON.parse(await receive(token_1));
+      const headers_credentialless = JSON.parse(await receive(token_2));
+
+      assert_equals(parseCookies(headers_control)[cookie_key],
+        expected_cookies_control,
+        "coep:none => ");
+      assert_equals(parseCookies(headers_credentialless)[cookie_key],
+        expected_cookies_credentialless,
+        "coep:credentialless => ");
+    }, `link ${description}`)
+  };
+
+  // Same-origin request always contains Cookies:
+  linkTest("same-origin + undefined",
+    same_origin, '',
+    cookie_same_origin,
+    cookie_same_origin);
+  linkTest("same-origin + anonymous",
+    same_origin, 'link.crossOrigin="anonymous"',
+    cookie_same_origin,
+    cookie_same_origin);
+  linkTest("same-origin + use-credentials",
+    same_origin, 'link.crossOrigin="use-credentials"',
+    cookie_same_origin,
+    cookie_same_origin);
+
+  // Cross-origin request contains cookies in the following cases:
+  // - COEP:credentialless is not set.
+  // - link.crossOrigin is `use-credentials`.
+  linkTest("cross-origin + undefined",
+    cross_origin, '',
+    cookie_cross_origin,
+    undefined);
+  linkTest("cross-origin + anonymous",
+    cross_origin, 'link.crossOrigin="anonymous"',
+    undefined,
+    undefined);
+  linkTest("cross-origin + use-credentials",
+    cross_origin, 'link.crossOrigin="use-credentials"',
+    cookie_cross_origin,
+    cookie_cross_origin);
+}, "Main");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.py b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.py
index bdce9485f13..697d1de9775 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.py
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.py
@@ -31,7 +31,7 @@ def main(request, response):
                 headers[isomorphic_decode(key)] = isomorphic_decode(request.headers[key])
             headers = json.dumps(headers);
             queue.append(headers);
-            ret = headers;
+            ret = b'';
 
         # Push into the |uuid| queue, the posted data.
         elif request.method == u'POST':
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/script.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/script.tentative.https.html
new file mode 100644
index 00000000000..b6ec0b96386
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/script.tentative.https.html
@@ -0,0 +1,114 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+
+<script>
+
+promise_test_parallel(async test => {
+  const same_origin = get_host_info().HTTPS_ORIGIN;
+  const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const cookie_key = "coep_credentialless_script";
+  const cookie_same_origin = "same_origin";
+  const cookie_cross_origin = "cross_origin";
+
+  // Set cookie on same_origin.
+  document.cookie = `${cookie_key}=${cookie_same_origin}`;
+
+  // Set cookie on cross_origin.
+  {
+    const w_token = token();
+    const w_url = cross_origin + executor_path + `&uuid=${w_token}`;
+    const w = window.open(w_url);
+
+    const reply_token = token();
+    send(w_token, `
+      document.cookie = "${cookie_key}=${cookie_cross_origin}";
+      send("${reply_token}", "done");
+    `);
+    assert_equals(await receive(reply_token), "done");
+    w.close();
+  }
+
+  // One window with COEP:none. (control)
+  const w_control_token = token();
+  const w_control_url = same_origin + executor_path +
+    coep_none + `&uuid=${w_control_token}`
+  const w_control = window.open(w_control_url);
+  add_completion_callback(() => w_control.close());
+
+  // One window with COEP:credentialless. (experiment)
+  const w_credentialless_token = token();
+  const w_credentialless_url = same_origin + executor_path +
+    coep_credentialless + `&uuid=${w_credentialless_token}`;
+  const w_credentialless = window.open(w_credentialless_url);
+  add_completion_callback(() => w_credentialless.close());
+
+  let scriptTest = function(
+    description, origin, mode,
+    expected_cookies_control,
+    expected_cookies_credentialless)
+  {
+    promise_test_parallel(async test => {
+      const token_1 = token();
+      const token_2 = token();
+
+      send(w_control_token, `
+        let script = document.createElement("script");
+        script.src = "${showRequestHeaders(origin, token_1)}";
+        ${mode};
+        document.body.appendChild(script);
+      `);
+      send(w_credentialless_token, `
+        let script = document.createElement("script");
+        script.src = "${showRequestHeaders(origin, token_2)}";
+        ${mode};
+        document.body.appendChild(script);
+      `);
+
+      const headers_control = JSON.parse(await receive(token_1));
+      const headers_credentialless = JSON.parse(await receive(token_2));
+
+      assert_equals(parseCookies(headers_control)[cookie_key],
+        expected_cookies_control,
+        "coep:none => ");
+      assert_equals(parseCookies(headers_credentialless)[cookie_key],
+        expected_cookies_credentialless,
+        "coep:credentialless => ");
+    }, `script ${description}`)
+  };
+
+  // Same-origin request always contains Cookies:
+  scriptTest("same-origin + undefined",
+    same_origin, '',
+    cookie_same_origin,
+    cookie_same_origin);
+  scriptTest("same-origin + anonymous",
+    same_origin, 'script.crossOrigin="anonymous"',
+    cookie_same_origin,
+    cookie_same_origin);
+  scriptTest("same-origin + use-credentials",
+    same_origin, 'script.crossOrigin="use-credentials"',
+    cookie_same_origin,
+    cookie_same_origin);
+
+  // Cross-origin request contains cookies in the following cases:
+  // - COEP:credentialless is not set.
+  // - script.crossOrigin is `use-credentials`.
+  scriptTest("cross-origin + undefined",
+    cross_origin, '',
+    cookie_cross_origin,
+    undefined);
+  scriptTest("cross-origin + anonymous",
+    cross_origin, 'script.crossOrigin="anonymous"',
+    undefined,
+    undefined);
+  scriptTest("cross-origin + use-credentials",
+    cross_origin, 'script.crossOrigin="use-credentials"',
+    cookie_cross_origin,
+    cookie_cross_origin);
+}, "Main");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.tentative.https.html
new file mode 100644
index 00000000000..04c050df795
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.tentative.https.html
@@ -0,0 +1,116 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+
+<script>
+
+promise_test_parallel(async test => {
+  const same_origin = get_host_info().HTTPS_ORIGIN;
+  const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const cookie_key = "coep_credentialless_image";
+  const cookie_same_origin = "same_origin";
+  const cookie_cross_origin = "cross_origin";
+
+  // Set cookie on same_origin.
+  document.cookie = `${cookie_key}=${cookie_same_origin}`;
+
+  // Set cookie on cross_origin.
+  {
+    const w_token = token();
+    const w_url = cross_origin + executor_path + `&uuid=${w_token}`;
+    const w = window.open(w_url);
+
+    const reply_token = token();
+    send(w_token, `
+      document.cookie = "${cookie_key}=${cookie_cross_origin}";
+      send("${reply_token}", "done");
+    `);
+    assert_equals(await receive(reply_token), "done");
+    w.close();
+  }
+
+  // One window with COEP:none. (control)
+  const w_control_token = token();
+  const w_control_url = same_origin + executor_path +
+    coep_none + `&uuid=${w_control_token}`
+  const w_control = window.open(w_control_url);
+  add_completion_callback(() => w_control.close());
+
+  // One window with COEP:credentialless. (experiment)
+  const w_credentialless_token = token();
+  const w_credentialless_url = same_origin + executor_path +
+    coep_credentialless + `&uuid=${w_credentialless_token}`;
+  const w_credentialless = window.open(w_credentialless_url);
+  add_completion_callback(() => w_credentialless.close());
+
+  let videoTest = function(
+    description, origin, mode,
+    expected_cookies_control,
+    expected_cookies_credentialless)
+  {
+    promise_test_parallel(async test => {
+      const token_1 = token();
+      const token_2 = token();
+
+      send(w_control_token, `
+        let video = document.createElement("video");
+        video.src = "${showRequestHeaders(origin, token_1)}";
+        video.autoplay = true;
+        ${mode}
+        document.body.appendChild(video);
+      `);
+      send(w_credentialless_token, `
+        let video = document.createElement("video");
+        video.src = "${showRequestHeaders(origin, token_2)}";
+        video.autoplay = true;
+        ${mode}
+        document.body.appendChild(video);
+      `);
+
+      const headers_control = JSON.parse(await receive(token_1));
+      const headers_credentialless = JSON.parse(await receive(token_2));
+
+      assert_equals(parseCookies(headers_control)[cookie_key],
+        expected_cookies_control,
+        "coep:none => ");
+      assert_equals(parseCookies(headers_credentialless)[cookie_key],
+        expected_cookies_credentialless,
+        "coep:credentialless => ");
+    }, `video ${description}`)
+  };
+
+  // Same-origin request always contains Cookies:
+  videoTest("same-origin + undefined",
+    same_origin, '',
+    cookie_same_origin,
+    cookie_same_origin);
+  videoTest("same-origin + anonymous",
+    same_origin, 'video.crossOrigin="anonymous"',
+    cookie_same_origin,
+    cookie_same_origin);
+  videoTest("same-origin + use-credentials",
+    same_origin, 'video.crossOrigin="use-credentials"',
+    cookie_same_origin,
+    cookie_same_origin);
+
+  // Cross-origin request contains cookies in the following cases:
+  // - COEP:credentialless is not set.
+  // - video.crossOrigin is `use-credentials`.
+  videoTest("cross-origin + undefined",
+    cross_origin, '',
+    cookie_cross_origin,
+    undefined);
+  videoTest("cross-origin + anonymous",
+    cross_origin, 'video.crossOrigin="anonymous"',
+    undefined,
+    undefined);
+  videoTest("cross-origin + use-credentials",
+    cross_origin, 'video.crossOrigin="use-credentials"',
+    cookie_cross_origin,
+    cookie_cross_origin);
+}, "Main");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html
deleted file mode 100644
index 03f7b3197da..00000000000
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>Check COEP reports are send for 'new Worker()' failure</title>
-<meta name="timeout" content="long">
-</head>
-<body>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
-<script>
-const {ORIGIN} = get_host_info();
-const RESOURCES_PATH= new URL("resources", location).pathname;
-const iframe_path = "worker-owner-frame.html?pipe=";
-const worker_path = "universal-worker.js?pipe=";
-
-const coep_header= {
-  "coep-none"         : "",
-  "coep-report-only"  :
-    "header(Cross-Origin-Embedder-Policy-Report-Only,require-corp)",
-  "coep-require-corp" : "|header(Cross-Origin-Embedder-Policy,require-corp)",
-};
-
-function checkReport(report, url, blocked_url, disposition) {
-  assert_equals(report.type, "coep");
-  assert_equals(report.url, url);
-  assert_equals(report.body.type, "worker initialization");
-  assert_equals(report.body.blockedURL, blocked_url);
-  assert_equals(report.body.disposition, disposition);
-}
-
-// Test parameters:
-// - `iframe_coep` the COEP header of the iframe's document response.
-// - `worker_coep` the COEP header of the DedicatedWorker's script response.
-//
-// Test expectations:
-// - `length` the length of reports.
-// - `disposition`  the disposition in a report's body. Empty string if the
-//                  length of reports is expected to be 0.
-function check(
-  // Test parameters:
-  iframe_coep,
-  worker_coep,
-  // Test expectations:
-  length,
-  disposition) {
-  promise_test(async (t) => {
-    const worker_url = worker_path + coep_header[worker_coep];
-    const iframe_url = iframe_path + coep_header[iframe_coep];
-    const iframe = await with_iframe("./resources/" + iframe_url);
-    t.add_cleanup(() => iframe.remove());
-
-    const iframe_response = new Promise(resolve => window.onmessage = resolve);
-    iframe.contentWindow.startWorkerAndObserveReports(worker_url, length > 0);
-
-    const {data} = await iframe_response;
-    assert_equals(data.length, length);
-    if (data.length > 0) {
-      const blocked_url = `${ORIGIN}${RESOURCES_PATH}/${worker_url}`;
-      const url = `${ORIGIN}${RESOURCES_PATH}/${iframe_url}`;
-      checkReport(
-        data[0],
-        url,
-        blocked_url,
-        disposition
-      );
-    }
-  }, `Reporting to ${iframe_coep} frame with ${worker_coep} worker`);
-}
-
-// -----------------------------------------------------------------------------
-//    iframe_coep         , worker_coep         , length  , disposition
-// -----------------------------------------------------------------------------
-check("coep-none"         , "coep-none"         , 0       , "");
-check("coep-none"         , "coep-report-only"  , 0       , "");
-check("coep-none"         , "coep-require-corp" , 0       , "");
-check("coep-report-only"  , "coep-none"         , 1       , "reporting");
-check("coep-report-only"  , "coep-report-only"  , 1       , "reporting");
-check("coep-report-only"  , "coep-require-corp" , 0       , "");
-check("coep-require-corp" , "coep-none"         , 1       , "enforce");
-check("coep-require-corp" , "coep-report-only"  , 1       , "enforce");
-check("coep-require-corp" , "coep-require-corp" , 0       , "");
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html
deleted file mode 100644
index 092fed9604e..00000000000
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<script>
-function startWorkerAndObserveReports(worker_url, wait_for_report) {
-  const worker = new Worker(worker_url);
-  const result_promise = new Promise(resolve => {
-    worker.onmessage = _ => resolve('success');
-    worker.onerror = _ => resolve('error');
-  });
-  worker.postMessage("postMessage('reply to frame from worker');");
-
-  const report_promise = new Promise(resolve => {
-    const observer = new ReportingObserver(reports => {
-      observer.disconnect();
-      resolve(reports.map(r => r.toJSON()));
-    });
-    observer.observe();
-  });
-
-  if (wait_for_report) {
-    Promise.all([result_promise, report_promise]).then(results => {
-      parent.postMessage(results[1]);
-    });
-  } else {
-    result_promise.then(result => {
-      parent.postMessage([]);
-    });
-  }
-}
-</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.js b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.js
index ade25ee1532..45225a7f263 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.js
@@ -10,22 +10,27 @@ const dispatcher_path =
     '/html/cross-origin-opener-policy/reporting/resources/dispatcher.py';
 const dispatcher_url = new URL(dispatcher_path, location.href).href;
 
-const send = function(uuid, message) {
-  fetch(dispatcher_url + `?uuid=${uuid}`, {
-    method: 'POST',
-    body: message
+const send = async function(uuid, message) {
+  // The official web-platform-test runner sometimes drop POST requests when
+  // many are requested in parallel. Using a lock fixes the issue.
+  await navigator.locks.request("dispatcher_send", async lock => {
+    await fetch(dispatcher_url + `?uuid=${uuid}`, {
+      method: 'POST',
+      body: message
+    });
   });
 }
 
 const receive = async function(uuid, maybe_timeout) {
   const timeout = maybe_timeout || Infinity;
-  const retry_delay = 100;
-  for(let i = 0; i * retry_delay < timeout; ++i) {
+  let start = performance.now();
+  while(performance.now() - start < timeout) {
     let response = await fetch(dispatcher_url + `?uuid=${uuid}`);
     let data = await response.text();
     if (data != 'not ready')
       return data;
-    await new Promise(r => step_timeout(r, retry_delay));
+    // Save resources & spread the load:
+    await new Promise(r => setTimeout(r, 100*Math.random()));
   }
   return "timeout";
 }
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/executor.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/executor.html
index e97e18aca4b..9f38ebe2159 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/executor.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/executor.html
@@ -1,4 +1,3 @@
-<script src=/resources/testharness.js></script>
 <script src="./dispatcher.js"></script>
 <script src="./try-access.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html
new file mode 100644
index 00000000000..63f882c6894
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<div style="border: 1px solid green; height: 0; border-spacing: 2px">
+  <div style="display: table-cell; padding: 1px">Hey</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height.html
new file mode 100644
index 00000000000..8ecc0dd4544
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<link rel="match" href="table-row-height-ref.html">
+<table style="display: block">
+  <tbody style="display: block">
+    <tr style="display: block; border: 1px solid green" height="0">
+      <td>Hey</td>
+    </tr>
+  </tbody>
+</table>
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html
new file mode 100644
index 00000000000..3f4221b7148
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html
@@ -0,0 +1,206 @@
+<!doctype html>
+<title>Image width and height attributes are used to infer aspect-ratio</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  img:not([nowidth]) {
+    width: 100%;
+    max-width: 100px;
+    height: auto;
+  }
+</style>
+<picture>
+  <source srcset="/images/green-100x50.png"></source>
+  <img>
+</picture>
+
+<picture>
+  <source srcset="/images/green-100x50.png" width="100" height="100"></source>
+  <img>
+</picture>
+
+<picture>
+  <source srcset="/images/green-100x50.png" width="100" height="100"></source>
+  <img width="50" height="100">
+</picture>
+
+<picture>
+  <source srcset="/images/green-100x50.png" width="100" height="100" id="twosource-s1"></source>
+  <source srcset="/images/green-100x50.png" width="300" height="150"></source>
+  <img id="twosource-img">
+</picture>
+
+<div style="width: 100px;">
+  <picture>
+    <source srcset="/images/green-100x50.png" width="100%" height="50%" id="percent-src"></source>
+    <img style="contain:size;" id="percent-img" nowidth="true">
+  </picture>
+</div>
+
+<picture>
+  <source srcset="/images/green-100x50.png" width="100abc" height="50abc" id="trailing-src"></source>
+  <img style="contain:size;" id="trailing-img" nowidth="true">
+</picture>
+
+<script>
+let t = async_test("source width and height attributes are used to infer aspect-ratio in <picture>");
+function assert_ratio(img, expected, description) {
+  let epsilon = 0.001;
+  assert_approx_equals(parseFloat(getComputedStyle(img).width, 10) / parseFloat(getComputedStyle(img).height, 10),
+                       expected, epsilon, description);
+}
+
+function createPicture(width, height) {
+  var picture = document.createElement("picture");
+  var source = document.createElement("source");
+  if (width !== undefined)
+    source.setAttribute("width", width);
+  if (height !== undefined)
+    source.setAttribute("height", height);
+  source.setAttribute("srcset", "/images/green.png");
+  picture.appendChild(source);
+  var img = document.createElement("img");
+  picture.appendChild(img);
+  document.body.appendChild(picture);
+  return img;
+}
+
+function assert_cs(img, val) {
+  assert_equals(getComputedStyle(img).aspectRatio, val);
+}
+
+// Create and append a new image and immediately check the ratio.
+// This is not racy because the spec requires the user agent to queue a task:
+// https://html.spec.whatwg.org/multipage/images.html#updating-the-image-data
+test(function() {
+  var img = createPicture(100, 100);
+  assert_ratio(img, 1.0);
+  assert_cs(img, "auto 100 / 100");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "100px");
+  var source = img.previousSibling;
+  assert_equals(getComputedStyle(source).width, "auto");
+  assert_equals(getComputedStyle(source).height, "auto");
+
+  // Source width/height should take precedence over img attributes.
+  img = createPicture(200, 100);
+  img.setAttribute("width", 250);
+  img.setAttribute("height", 50);
+  assert_ratio(img, 2.0);
+  assert_cs(img, "auto 200 / 100");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "200px");
+  assert_equals(getComputedStyle(img).height, "100px");
+  source = img.previousSibling;
+  assert_equals(getComputedStyle(source).width, "auto");
+  assert_equals(getComputedStyle(source).height, "auto");
+
+  // Make sure style gets invalidated correctly when the source gets removed.
+  img.parentNode.removeChild(img.previousSibling);
+  assert_cs(img, "auto 250 / 50");
+  img.src = "/images/green.png";
+  assert_ratio(img, 5.0);
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "250px");
+  assert_equals(getComputedStyle(img).height, "50px");
+
+  // If the <source> has only one of width/height, we don't get an aspect
+  // ratio, even if the <img> has both.
+  img = createPicture(100, undefined);
+  img.setAttribute("width", 200);
+  img.setAttribute("height", 100);
+  assert_cs(img, "auto");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "auto");
+
+  // If we don't have width/height on the source, we fall back to width/height
+  // on the <img>.
+  img = createPicture(undefined, undefined);
+  img.setAttribute("width", 200);
+  img.setAttribute("height", 100);
+  assert_cs(img, "auto 200 / 100");
+
+  // If we only have one width/height attribute, we should get that attribute
+  // mapped but no aspect ratio, even if <img> has attributes.
+  img = createPicture(100, undefined);
+  img.parentNode.style.display = "none";
+  img.setAttribute("width", "200");
+  img.setAttribute("height", "300");
+  img.setAttribute("nowidth", "true");
+  assert_cs(img, "auto");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "auto");
+
+  img = createPicture(undefined, 100);
+  img.parentNode.style.display = "none";
+  img.setAttribute("width", "200");
+  img.setAttribute("height", "300");
+  img.setAttribute("nowidth", "true");
+  assert_cs(img, "auto");
+  assert_equals(getComputedStyle(img).width, "auto");
+  assert_equals(getComputedStyle(img).height, "100px");
+
+  // Testing dynamic changes
+  img = createPicture(100, 100);
+  assert_cs(img, "auto 100 / 100");
+  img.previousSibling.setAttribute("height", "300");
+  assert_cs(img, "auto 100 / 300");
+  img.previousSibling.setAttribute("width", "10");
+  assert_cs(img, "auto 10 / 300");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "10px");
+  assert_equals(getComputedStyle(img).height, "300px");
+
+  img = document.getElementById("twosource-img");
+  assert_cs(img, "auto 100 / 100");
+  source = document.getElementById("twosource-s1");
+  source.setAttribute("type", "x-foo/x-bar");
+  // We should now match the second source
+  assert_cs(img, "auto 300 / 150");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "300px");
+  assert_equals(getComputedStyle(img).height, "150px");
+
+  // Percentages on source should be ignored for aspect-ratio but used for
+  // width/height.
+  img = document.getElementById("percent-img");
+  assert_equals(img.offsetWidth, 100);
+  assert_equals(img.offsetHeight, 0);
+  assert_cs(img, "auto");
+  source = document.getElementById("percent-src");
+  assert_equals(source.width, 100);
+  assert_equals(source.height, 50);
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100%");
+  assert_equals(getComputedStyle(img).height, "50%");
+
+  // Trailing garbage should be ignored but not invalidate anything.
+  img = document.getElementById("trailing-img");
+  assert_equals(img.offsetWidth, 100);
+  assert_equals(img.offsetHeight, 50);
+  assert_cs(img, "auto 100 / 50");
+  source = document.getElementById("trailing-src");
+  assert_equals(source.width, 100);
+  assert_equals(source.height, 50);
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "50px");
+}, "Computed style");
+
+onload = t.step_func_done(function() {
+  let images = document.querySelectorAll("img");
+  assert_ratio(images[0], 2.0, "2.0 is the original aspect ratio of green-100x50.png");
+  assert_ratio(images[1], 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio.");
+  assert_ratio(images[2], 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio (2).");
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html
index ee9ae25e402..35ebbaa11a5 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html
@@ -28,54 +28,51 @@
        loading="eager">
   <script>
     document.getElementById("js_display_none").style = 'display:none;';
-  </script>
-</body>
 
-<script>
-  const visibility_hidden_element = document.getElementById("visibility_hidden");
-  const visibility_hidden_element_explicit_eager =
-    document.getElementById("visibility_hidden_explicit_eager");
+    const visibility_hidden_element = document.getElementById("visibility_hidden");
+    const visibility_hidden_element_explicit_eager =
+      document.getElementById("visibility_hidden_explicit_eager");
 
-  const display_none_element = document.getElementById("display_none");
-  const display_none_element_explicit_eager =
-    document.getElementById("display_none_explicit_eager");
+    const display_none_element = document.getElementById("display_none");
+    const display_none_element_explicit_eager =
+      document.getElementById("display_none_explicit_eager");
 
-  const attribute_hidden_element = document.getElementById("attribute_hidden");
-  const attribute_hidden_element_explicit_eager =
-    document.getElementById("attribute_hidden_explicit_eager");
+    const attribute_hidden_element = document.getElementById("attribute_hidden");
+    const attribute_hidden_element_explicit_eager =
+      document.getElementById("attribute_hidden_explicit_eager");
 
-  const js_display_none_element = document.getElementById("js_display_none");
-  const js_display_none_element_explicit_eager =
-    document.getElementById("js_display_none_explicit_eager");
+    const js_display_none_element = document.getElementById("js_display_none");
+    const js_display_none_element_explicit_eager =
+      document.getElementById("js_display_none_explicit_eager");
 
-  let have_images_loaded = false;
+    let have_images_loaded = false;
 
-  async_test(t => {
-    let image_fully_loaded_promise = (element) => {
-      return new Promise(resolve => {
-        element.addEventListener("load", t.step_func(resolve));
-      });
-    }
+    async_test(t => {
+      let image_fully_loaded_promise = (element) => {
+        return new Promise(resolve => {
+          element.addEventListener("load", t.step_func(resolve));
+        });
+      }
 
-    Promise.all([
-      image_fully_loaded_promise(visibility_hidden_element),
-      image_fully_loaded_promise(visibility_hidden_element_explicit_eager),
-      image_fully_loaded_promise(display_none_element),
-      image_fully_loaded_promise(display_none_element_explicit_eager),
-      image_fully_loaded_promise(attribute_hidden_element),
-      image_fully_loaded_promise(attribute_hidden_element_explicit_eager),
-      image_fully_loaded_promise(js_display_none_element),
-      image_fully_loaded_promise(js_display_none_element_explicit_eager)
-    ]).then(t.step_func(() => {
-      have_images_loaded = true;
-    })).catch(t.unreached_func("All images should load correctly"));
+      Promise.all([
+        image_fully_loaded_promise(visibility_hidden_element),
+        image_fully_loaded_promise(visibility_hidden_element_explicit_eager),
+        image_fully_loaded_promise(display_none_element),
+        image_fully_loaded_promise(display_none_element_explicit_eager),
+        image_fully_loaded_promise(attribute_hidden_element),
+        image_fully_loaded_promise(attribute_hidden_element_explicit_eager),
+        image_fully_loaded_promise(js_display_none_element),
+        image_fully_loaded_promise(js_display_none_element_explicit_eager)
+      ]).then(t.step_func(() => {
+        have_images_loaded = true;
+      })).catch(t.unreached_func("All images should load correctly"));
 
-    window.addEventListener("load", t.step_func_done(() => {
-      assert_true(have_images_loaded,
-                  "The images should block the window load event.");
-    }));
+      window.addEventListener("load", t.step_func_done(() => {
+        assert_true(have_images_loaded,
+                    "The images should block the window load event.");
+      }));
 
-  }, "Test that below-viewport invisible images that are not marked " +
-     "loading=lazy still load, and block the window load event");
+    }, "Test that below-viewport invisible images that are not marked " +
+       "loading=lazy still load, and block the window load event");
 </script>
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html
new file mode 100644
index 00000000000..9b2783c930a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>HTML5 Media Elements: The size of the video shouldn't be lost after an 'ended' event.</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <link rel="author" title="Alicia Boya García" href="mailto:aboya@igalia.com"/>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<video id="video">
+    <source src="/media/test-1s.mp4" type="video/mp4">
+    <source src="/media/test-1s.webm" type="video/webm">
+</video>
+<script>
+    promise_test(async (test) => {
+        const eventWatcher = new EventWatcher(test, video, ["loadedmetadata", "ended"]);
+        await eventWatcher.wait_for("loadedmetadata");
+        assert_equals(video.videoWidth, 320, "width when the video is loaded");
+        assert_equals(video.videoHeight, 240, "height when the video is loaded");
+        video.play();
+        await eventWatcher.wait_for(["ended"]);
+        assert_equals(video.videoWidth, 320, "width after playback");
+        assert_equals(video.videoHeight, 240, "height after playback");
+        if (video.videoTracks)
+            assert_equals(video.videoTracks.length, 1);
+    }, "Video dimensions are preserved at the end of the video.");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl b/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
index d392a679ff2..b470f3f5a15 100644
--- a/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: CORS and RFC1918 (https://wicg.github.io/private-network-access/)
+// Source: Private Network Access (https://wicg.github.io/private-network-access/)
 
 enum AddressSpace { "local", "private", "public" };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
index 129c2962b31..e130e4ecb05 100644
--- a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
+++ b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
@@ -1,7 +1,8 @@
 // https://wicg.github.io/sanitizer-api/
 
 [
-  Exposed=Window
+  Exposed=Window,
+  SecureContext
 ] interface Sanitizer {
   constructor(optional SanitizerConfig sanitizerConfig = {});
   DocumentFragment sanitize((DOMString or DocumentFragment or Document) input);
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 689b94586f4..bcf58ea5cfe 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -309,6 +309,7 @@ SET TIMEOUT: feature-policy/experimental-features/resources/focus-without-user-a
 SET TIMEOUT: permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html
 SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html
 SET TIMEOUT: html/cross-origin-embedder-policy/resources/reporting-worker.js
+SET TIMEOUT: html/cross-origin-opener-policy/reporting/resources/dispatcher.js
 SET TIMEOUT: html/dom/documents/dom-tree-accessors/Document.currentScript.html
 SET TIMEOUT: html/webappapis/timers/*
 SET TIMEOUT: orientation-event/resources/orientation-event-helpers.js
diff --git a/tests/wpt/web-platform-tests/media/test-1s.mp4 b/tests/wpt/web-platform-tests/media/test-1s.mp4
new file mode 100644
index 00000000000..76d6820007c
Binary files /dev/null and b/tests/wpt/web-platform-tests/media/test-1s.mp4 differ
diff --git a/tests/wpt/web-platform-tests/media/test-1s.webm b/tests/wpt/web-platform-tests/media/test-1s.webm
new file mode 100644
index 00000000000..772e264ff90
Binary files /dev/null and b/tests/wpt/web-platform-tests/media/test-1s.webm differ
diff --git a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
index f2de6d571a4..a0abf5ca4e0 100644
--- a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
@@ -7,10 +7,10 @@
 //
 // The file will be closed and deleted when the test ends.
 function createFileSync(testCase, fileName) {
-  const file = nativeIO.openSync(fileName);
+  const file = storageFoundation.openSync(fileName);
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync(fileName);
+    storageFoundation.deleteSync(fileName);
   });
 
   const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
diff --git a/tests/wpt/web-platform-tests/native-io/delete_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/delete_async_basic.tentative.https.any.js
index 84da14b005a..149ce2a63f4 100644
--- a/tests/wpt/web-platform-tests/native-io/delete_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/delete_async_basic.tentative.https.any.js
@@ -4,22 +4,23 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
   await file.close();
 
-  const fileNamesBeforeDelete = await nativeIO.getAll();
+  const fileNamesBeforeDelete = await storageFoundation.getAll();
   assert_in_array('test_file', fileNamesBeforeDelete);
 
-  await nativeIO.delete('test_file');
-  const fileNames = await nativeIO.getAll();
+  await storageFoundation.delete('test_file');
+  const fileNames = await storageFoundation.getAll();
   assert_equals(fileNames.indexOf('test_file'), -1);
-}, 'nativeIO.getAll does not return file deleted by nativeIO.delete');
+}, 'storageFoundation.getAll does not return file deleted by' +
+     ' storageFoundation.delete');
 
 promise_test(async testCase => {
-  await nativeIO.delete('test_file');
+  await storageFoundation.delete('test_file');
   // Delete a second time if the file existed before the first delete.
-  await nativeIO.delete('test_file');
-}, 'nativeIO.delete does not fail when deleting a non-existing file');
+  await storageFoundation.delete('test_file');
+}, 'storageFoundation.delete does not fail when deleting a non-existing file');
diff --git a/tests/wpt/web-platform-tests/native-io/delete_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/delete_sync_basic.tentative.https.any.js
index 55c113acbed..49a8292c55c 100644
--- a/tests/wpt/web-platform-tests/native-io/delete_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/delete_sync_basic.tentative.https.any.js
@@ -4,22 +4,24 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
   file.close();
 
-  const fileNamesBeforeDelete = nativeIO.getAllSync();
+  const fileNamesBeforeDelete = storageFoundation.getAllSync();
   assert_in_array('test_file', fileNamesBeforeDelete);
 
-  nativeIO.deleteSync('test_file');
-  const fileNames = nativeIO.getAllSync();
+  storageFoundation.deleteSync('test_file');
+  const fileNames = storageFoundation.getAllSync();
   assert_equals(fileNames.indexOf('test_file'), -1);
-}, 'nativeIO.getAllSync does not return file deleted by nativeIO.deleteSync');
+}, 'storageFoundation.getAllSync does not return file deleted by' +
+     ' storageFoundation.deleteSync');
 
 test(testCase => {
-  nativeIO.deleteSync('test_file');
+  storageFoundation.deleteSync('test_file');
   // Delete a second time if the file existed before the first delete.
-  nativeIO.deleteSync('test_file');
-}, 'nativeIO.deleteSync does not fail when deleting a non-existing file');
+  storageFoundation.deleteSync('test_file');
+}, 'storageFoundation.deleteSync does not fail when deleting a' +
+     ' non-existing file');
diff --git a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
index 2202e556215..9219725c4c2 100644
--- a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
@@ -6,10 +6,10 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
 
   const size = 1024;
diff --git a/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
index c5a1268e0d2..4aa22267f61 100644
--- a/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
@@ -5,10 +5,10 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
 
   const size = 1024;
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
index f99d2875fc0..38ebcc29409 100644
--- a/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
@@ -5,10 +5,10 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
 
   const writeSharedArrayBuffer = new SharedArrayBuffer(4);
@@ -29,10 +29,10 @@ promise_test(async testCase => {
       'new length');
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
 
   const writeSharedArrayBuffer = new SharedArrayBuffer(4);
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
index f65cd44510e..28057c9db7e 100644
--- a/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
@@ -5,10 +5,10 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
 
   const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
@@ -26,10 +26,10 @@ test(testCase => {
      ' NativeIOFileSync.getLength reports its new length.');
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
 
   const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
diff --git a/tests/wpt/web-platform-tests/native-io/open_getAll_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/open_getAll_async_basic.tentative.https.any.js
index 0487ef5e2f2..6cb7704003c 100644
--- a/tests/wpt/web-platform-tests/native-io/open_getAll_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/open_getAll_async_basic.tentative.https.any.js
@@ -4,12 +4,12 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
   await file.close();
 
-  const fileNames = await nativeIO.getAll();
+  const fileNames = await storageFoundation.getAll();
   assert_in_array('test_file', fileNames);
-}, 'nativeIO.getAll returns file created by nativeIO.open');
+}, 'storageFoundation.getAll returns file created by storageFoundation.open');
diff --git a/tests/wpt/web-platform-tests/native-io/open_getAll_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/open_getAll_sync_basic.tentative.https.any.js
index fc73a0471cf..dd7d029fb0d 100644
--- a/tests/wpt/web-platform-tests/native-io/open_getAll_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/open_getAll_sync_basic.tentative.https.any.js
@@ -4,12 +4,13 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
   file.close();
 
-  const fileNames = nativeIO.getAllSync();
+  const fileNames = storageFoundation.getAllSync();
   assert_in_array('test_file', fileNames);
-}, 'nativeIO.getAllSync returns file created by nativeIO.openSync');
+}, 'storageFoundation.getAllSync returns file created by' +
+     ' storageFoundation.openSync');
diff --git a/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
index cf2a3f56bc5..a0273242144 100644
--- a/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
@@ -4,10 +4,10 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
 
   const writeSharedArrayBuffer = new SharedArrayBuffer(4);
diff --git a/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
index d46e0120b68..61c5e3f3225 100644
--- a/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
@@ -4,10 +4,10 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
 
   const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
diff --git a/tests/wpt/web-platform-tests/native-io/rename_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_async_basic.tentative.https.any.js
index 8829b5b3104..47c9ffc6b91 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_async_basic.tentative.https.any.js
@@ -4,20 +4,20 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   await file.close();
 
-  const fileNamesBeforeRename = await nativeIO.getAll();
+  const fileNamesBeforeRename = await storageFoundation.getAll();
   assert_in_array('test_file', fileNamesBeforeRename);
 
-  await nativeIO.rename('test_file', 'renamed_test_file');
+  await storageFoundation.rename('test_file', 'renamed_test_file');
   testCase.add_cleanup(async () => {
-    await nativeIO.delete('test_file');
-    await nativeIO.delete('renamed_test_file');
+    await storageFoundation.delete('test_file');
+    await storageFoundation.delete('renamed_test_file');
   });
 
-  const fileNamesAfterRename = await nativeIO.getAll();
+  const fileNamesAfterRename = await storageFoundation.getAll();
   assert_false(fileNamesAfterRename.includes('test_file'));
   assert_in_array('renamed_test_file', fileNamesAfterRename);
-}, 'nativeIO.getAll returns a file renamed by nativeIO.rename' +
-     ' with its new name.');
+}, 'storageFoundation.getAll returns a file renamed by' +
+     ' storageFoundation.rename with its new name.');
diff --git a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
index 125f49cdf89..546ba7a9ecc 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
@@ -6,12 +6,13 @@
 'use strict';
 
 setup(async () => {
-  assert_implements(nativeIO.rename, 'nativeIO.rename is not implemented.');
+  assert_implements(storageFoundation.rename, 'storageFoundation.rename is not' +
+                                                ' implemented.');
 });
 
 promise_test(async testCase => {
-  const file1 = await nativeIO.open('test_file_1');
-  const file2 = await nativeIO.open('test_file_2');
+  const file1 = await storageFoundation.open('test_file_1');
+  const file2 = await storageFoundation.open('test_file_2');
   testCase.add_cleanup(async () => {
     await file1.close();
     await file2.close();
@@ -31,21 +32,21 @@ promise_test(async testCase => {
 
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('test_file_1', 'test_file_2'));
+      storageFoundation.rename('test_file_1', 'test_file_2'));
 
-  const fileNamesAfterRename = await nativeIO.getAll();
+  const fileNamesAfterRename = await storageFoundation.getAll();
   assert_in_array('test_file_1', fileNamesAfterRename);
   assert_in_array('test_file_2', fileNamesAfterRename);
 
   // Make sure that a failed rename does not modify file contents.
-  const file1_after = await nativeIO.open('test_file_1');
-  const file2_after = await nativeIO.open('test_file_2');
+  const file1_after = await storageFoundation.open('test_file_1');
+  const file2_after = await storageFoundation.open('test_file_2');
 
   testCase.add_cleanup(async () => {
     await file1_after.close();
     await file2_after.close();
-    await nativeIO.delete('test_file_1');
-    await nativeIO.delete('test_file_2');
+    await storageFoundation.delete('test_file_1');
+    await storageFoundation.delete('test_file_2');
   });
 
   const readSharedArrayBuffer1 = new SharedArrayBuffer(writtenBytes1.length);
@@ -60,92 +61,92 @@ promise_test(async testCase => {
   assert_array_equals(
       readBytes2, writtenBytes2,
       'the bytes read should match the bytes written');
-}, 'nativeIO.rename does not overwrite an existing file.');
+}, 'storageFoundation.rename does not overwrite an existing file.');
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('test_file', 'renamed_test_file'));
+      storageFoundation.rename('test_file', 'renamed_test_file'));
   await file.close();
 
-  const fileNamesAfterRename = await nativeIO.getAll();
+  const fileNamesAfterRename = await storageFoundation.getAll();
   assert_false(fileNamesAfterRename.includes('renamed_test_file'));
   assert_in_array('test_file', fileNamesAfterRename);
-}, 'nativeIO.rename does not allow renaming an open file.');
+}, 'storageFoundation.rename does not allow renaming an open file.');
 
 promise_test(async testCase => {
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
-    for (let name of await nativeIO.getAll()) {
-      await nativeIO.delete(name);
+    await storageFoundation.delete('test_file');
+    for (let name of await storageFoundation.getAll()) {
+      await storageFoundation.delete(name);
     }
   });
 
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   await file.close();
   for (let name of kBadNativeIoNames) {
     await promise_rejects_js(
-        testCase, TypeError, nativeIO.rename('test_file', name));
+        testCase, TypeError, storageFoundation.rename('test_file', name));
     await promise_rejects_js(
-        testCase, TypeError, nativeIO.rename(name, 'test_file_2'));
+        testCase, TypeError, storageFoundation.rename(name, 'test_file_2'));
   }
-}, 'nativeIO.rename does not allow renaming from or to invalid names.');
+}, 'storageFoundation.rename does not allow renaming from or to invalid names.');
 
 promise_test(async testCase => {
-  const closed_file = await nativeIO.open('closed_file');
+  const closed_file = await storageFoundation.open('closed_file');
   closed_file.close();
-  const opened_file = await nativeIO.open('opened_file');
+  const opened_file = await storageFoundation.open('opened_file');
   testCase.add_cleanup(async () => {
     await closed_file.close();
     await opened_file.close();
-    await nativeIO.delete('closed_file');
-    await nativeIO.delete('opened_file');
+    await storageFoundation.delete('closed_file');
+    await storageFoundation.delete('opened_file');
   });
 
   // First rename fails, as source is still open.
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('opened_file', 'closed_file'));
+      storageFoundation.rename('opened_file', 'closed_file'));
   // First rename fails again, as source has not been unlocked.
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('opened_file', 'closed_file'));
-}, 'Failed nativeIO.rename does not unlock the source.');
+      storageFoundation.rename('opened_file', 'closed_file'));
+}, 'Failed storageFoundation.rename does not unlock the source.');
 
 promise_test(async testCase => {
-  const closed_file = await nativeIO.open('closed_file');
+  const closed_file = await storageFoundation.open('closed_file');
   await closed_file.close();
-  const opened_file = await nativeIO.open('opened_file');
+  const opened_file = await storageFoundation.open('opened_file');
   testCase.add_cleanup(async () => {
     await closed_file.close();
     await opened_file.close();
-    await nativeIO.delete('closed_file');
-    await nativeIO.delete('opened_file');
+    await storageFoundation.delete('closed_file');
+    await storageFoundation.delete('opened_file');
   });
 
   // First rename fails, as destination is still open.
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('closed_file', 'opened_file'));
+      storageFoundation.rename('closed_file', 'opened_file'));
   // First rename fails again, as destination has not been unlocked.
   await promise_rejects_dom(
       testCase, 'NoModificationAllowedError',
-      nativeIO.rename('closed_file', 'opened_file'));
-}, 'Failed nativeIO.rename does not unlock the destination.');
+      storageFoundation.rename('closed_file', 'opened_file'));
+}, 'Failed storageFoundation.rename does not unlock the destination.');
 
 promise_test(async testCase => {
   // Make sure that the file does not exist.
-  await nativeIO.delete('does_not_exist');
+  await storageFoundation.delete('does_not_exist');
   testCase.add_cleanup(async () => {
-    await nativeIO.delete('new_does_not_exist');
+    await storageFoundation.delete('new_does_not_exist');
   });
   await promise_rejects_dom(
       testCase, 'NotFoundError',
-      nativeIO.rename('does_not_exist', 'new_does_not_exist'));
+      storageFoundation.rename('does_not_exist', 'new_does_not_exist'));
 }, 'Renaming a non-existing file fails with a NotFoundError.');
diff --git a/tests/wpt/web-platform-tests/native-io/rename_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_sync_basic.tentative.https.any.js
index af04885dfd7..e5183143c3b 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_sync_basic.tentative.https.any.js
@@ -4,21 +4,21 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   file.close();
 
-  const fileNamesBeforeRename = nativeIO.getAllSync();
+  const fileNamesBeforeRename = storageFoundation.getAllSync();
   assert_in_array('test_file', fileNamesBeforeRename);
 
-  nativeIO.renameSync('test_file', 'renamed_test_file');
+  storageFoundation.renameSync('test_file', 'renamed_test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
-    nativeIO.deleteSync('renamed_test_file');
+    storageFoundation.deleteSync('test_file');
+    storageFoundation.deleteSync('renamed_test_file');
   });
 
-  const fileNamesAfterRename = nativeIO.getAllSync();
+  const fileNamesAfterRename = storageFoundation.getAllSync();
   assert_equals(fileNamesAfterRename.indexOf('test_file'), -1);
   assert_in_array('renamed_test_file', fileNamesAfterRename);
-}, 'nativeIO.getAllSync returns a file renamed' +
-   ' by nativeIOFile.renameSync with its new name.');
+}, 'storageFoundation.getAllSync returns a file renamed' +
+   ' by storageFoundation.renameSync with its new name.');
diff --git a/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
index 8097932f23a..b86efa8acd0 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
@@ -7,12 +7,13 @@
 setup(() => {
   // Without this assertion, one test passes even if renameSync is not defined
   assert_implements(
-    nativeIO.renameSync, 'nativeIO.renameSync is not implemented.');
+    storageFoundation.renameSync, 'storageFoundation.renameSync is' +
+                                    ' not implemented.');
 });
 
 test(testCase => {
-  const file1 = nativeIO.openSync('test_file_1');
-  const file2 = nativeIO.openSync('test_file_2');
+  const file1 = storageFoundation.openSync('test_file_1');
+  const file2 = storageFoundation.openSync('test_file_2');
   testCase.add_cleanup(() => {
     file1.close();
     file2.close();
@@ -28,21 +29,21 @@ test(testCase => {
 
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('test_file_1', 'test_file_2'));
+    () => storageFoundation.renameSync('test_file_1', 'test_file_2'));
 
-  const fileNamesAfterRename = nativeIO.getAllSync();
+  const fileNamesAfterRename = storageFoundation.getAllSync();
   assert_in_array('test_file_1', fileNamesAfterRename);
   assert_in_array('test_file_2', fileNamesAfterRename);
 
   // Make sure that a failed rename does not modify file contents.
-  const file1_after = nativeIO.openSync('test_file_1');
-  const file2_after = nativeIO.openSync('test_file_2');
+  const file1_after = storageFoundation.openSync('test_file_1');
+  const file2_after = storageFoundation.openSync('test_file_2');
 
   testCase.add_cleanup(() => {
     file1_after.close();
     file2_after.close();
-    nativeIO.deleteSync('test_file_1');
-    nativeIO.deleteSync('test_file_2');
+    storageFoundation.deleteSync('test_file_1');
+    storageFoundation.deleteSync('test_file_2');
   });
   const readBytes1 = new Uint8Array(writtenBytes1.length);
   file1_after.read(readBytes1, 0);
@@ -54,90 +55,93 @@ test(testCase => {
   assert_array_equals(
     readBytes2, writtenBytes2,
     'the bytes read should match the bytes written');
-}, 'nativeIO.renameSync does not overwrite an existing file.');
+}, 'storageFoundation.renameSync does not overwrite an existing file.');
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('test_file', 'renamed_test_file'));
+    () => storageFoundation.renameSync('test_file', 'renamed_test_file'));
   file.close();
 
-  const fileNamesAfterRename = nativeIO.getAllSync();
+  const fileNamesAfterRename = storageFoundation.getAllSync();
   assert_equals(fileNamesAfterRename.indexOf('renamed_test_file'), -1);
   assert_in_array('test_file', fileNamesAfterRename);
-}, 'nativeIO.renameSync allows renaming an open file.');
+}, 'storageFoundation.renameSync allows renaming an open file.');
 
 test(testCase => {
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
-    for (let name of nativeIO.getAllSync()) {
-      nativeIO.deleteSync(name);
+    storageFoundation.deleteSync('test_file');
+    for (let name of storageFoundation.getAllSync()) {
+      storageFoundation.deleteSync(name);
     }
   });
 
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   file.close();
   for (let name of kBadNativeIoNames) {
-    assert_throws_js(TypeError, () => nativeIO.renameSync('test_file', name));
-    assert_throws_js(TypeError, () => nativeIO.renameSync(name, 'test_file_2'));
+    assert_throws_js(TypeError, () => storageFoundation.renameSync('test_file',
+                                        name));
+    assert_throws_js(TypeError, () => storageFoundation.renameSync(name,
+                                        'test_file_2'));
   }
-}, 'nativeIO.renameSync does not allow renaming from or to invalid names.');
+}, 'storageFoundation.renameSync does not allow renaming from or to invalid' +
+     ' names.');
 
 test(testCase => {
-  const closed_file = nativeIO.openSync('closed_file');
+  const closed_file = storageFoundation.openSync('closed_file');
   closed_file.close();
-  const opened_file = nativeIO.openSync('opened_file');
+  const opened_file = storageFoundation.openSync('opened_file');
   testCase.add_cleanup(() => {
     closed_file.close();
     opened_file.close();
-    nativeIO.deleteSync('closed_file');
-    nativeIO.deleteSync('opened_file');
+    storageFoundation.deleteSync('closed_file');
+    storageFoundation.deleteSync('opened_file');
   });
 
   // First rename fails, as source is still open.
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('opened_file', 'closed_file'));
+    () => storageFoundation.renameSync('opened_file', 'closed_file'));
   // First rename fails again, as source has not been unlocked.
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('opened_file', 'closed_file'));
-}, 'Failed nativeIO.renameSync does not unlock the source.');
+    () => storageFoundation.renameSync('opened_file', 'closed_file'));
+}, 'Failed storageFoundation.renameSync does not unlock the source.');
 
 test(testCase => {
-  const closed_file = nativeIO.openSync('closed_file');
+  const closed_file = storageFoundation.openSync('closed_file');
   closed_file.close();
-  const opened_file = nativeIO.openSync('opened_file');
+  const opened_file = storageFoundation.openSync('opened_file');
   testCase.add_cleanup(() => {
     closed_file.close();
     opened_file.close();
-    nativeIO.deleteSync('closed_file');
-    nativeIO.deleteSync('opened_file');
+    storageFoundation.deleteSync('closed_file');
+    storageFoundation.deleteSync('opened_file');
   });
 
   // First rename fails, as destination is still open.
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('closed_file', 'opened_file'));
+    () => storageFoundation.renameSync('closed_file', 'opened_file'));
   // First rename fails again, as destination has not been unlocked.
   assert_throws_dom(
     'NoModificationAllowedError',
-    () => nativeIO.renameSync('closed_file', 'opened_file'));
-}, 'Failed nativeIO.renameSync does not unlock the destination.');
+    () => storageFoundation.renameSync('closed_file', 'opened_file'));
+}, 'Failed storageFoundation.renameSync does not unlock the destination.');
 
 test(testCase => {
   // Make sure that the file does not exist.
-  nativeIO.deleteSync('does_not_exist');
+  storageFoundation.deleteSync('does_not_exist');
   testCase.add_cleanup(() => {
-    nativeIO.deleteSync('new_name');
+    storageFoundation.deleteSync('new_name');
   });
   assert_throws_dom(
     'NotFoundError',
-    () => nativeIO.renameSync('does_not_exist', 'new_name'));
+    () => storageFoundation.renameSync('does_not_exist', 'new_name'));
 }, 'Renaming a non-existing file fails with a NotFoundError.');
diff --git a/tests/wpt/web-platform-tests/native-io/resources/support.js b/tests/wpt/web-platform-tests/native-io/resources/support.js
index bf7cf5a0246..69d5fc86c83 100644
--- a/tests/wpt/web-platform-tests/native-io/resources/support.js
+++ b/tests/wpt/web-platform-tests/native-io/resources/support.js
@@ -1,19 +1,20 @@
 // Names disallowed by NativeIO
 const kBadNativeIoNames = [
-  "Uppercase",
-  "has-dash",
-  "has.dot",
-  "has/slash",
+  'Uppercase',
+  'has-dash',
+  'has.dot',
+  'has/slash',
+  'x'.repeat(101),
 ];
 
 // Returns a handle to a newly created file that holds some data.
 //
 // The file will be closed and deleted when the test ends.
 async function createFile(testCase, fileName) {
-  const file = await nativeIO.open(fileName);
+  const file = await storageFoundation.open(fileName);
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete(fileName);
+    await storageFoundation.delete(fileName);
   });
 
   const writeSharedArrayBuffer = new SharedArrayBuffer(4);
@@ -29,10 +30,10 @@ async function createFile(testCase, fileName) {
 //
 // The file will be closed and deleted when the test ends.
 function createFileSync(testCase, fileName) {
-  const file = nativeIO.openSync(fileName);
+  const file = storageFoundation.openSync(fileName);
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync(fileName);
+    storageFoundation.deleteSync(fileName);
   });
 
   const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
diff --git a/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js b/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
index ae01ac42015..42637160937 100644
--- a/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
+++ b/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
@@ -4,6 +4,6 @@
 'use strict';
 
 test(testCase => {
-  var present = (typeof nativeIO !== 'undefined');
+  var present = (typeof storageFoundation !== 'undefined');
   assert_false(present);
 }, 'NativeIO should not be accessible from an untrustworthy origin');
diff --git a/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
index bf886cca397..5fb48acb42f 100644
--- a/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
@@ -4,10 +4,10 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await nativeIO.open('test_file');
+  const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
-    await nativeIO.delete('test_file');
+    await storageFoundation.delete('test_file');
   });
 
   const writeSharedArrayBuffer = new SharedArrayBuffer(4);
diff --git a/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
index e0fead326a5..72b70fa69cd 100644
--- a/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
@@ -4,10 +4,10 @@
 'use strict';
 
 test(testCase => {
-  const file = nativeIO.openSync('test_file');
+  const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
-    nativeIO.deleteSync('test_file');
+    storageFoundation.deleteSync('test_file');
   });
 
   const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html
index 1c9651d8c16..109aec8dcd3 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html
@@ -42,10 +42,13 @@
             actions_promise.then(() => test_pointerEvent.done());
         });
 
-        on_event(window, "message",  e => {
-            var msg = JSON.parse(event.data);
-            if (msg.type == "event")
-                event_log.push(msg.eventType);
+        on_event(window, "message",  function(event) {
+            if (event.source != target.contentWindow) {
+              return;
+            }
+            if (event.data && event.data.type == "subframe-event") {
+              event_log.push(event.data.eventType);
+            }
         });
 
         actions_promise = new test_driver.Actions()
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_movementxy.html
similarity index 84%
rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_movementxy.html
index eb944460192..cb69c5c95e0 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_movementxy.html
@@ -4,14 +4,17 @@
         <title>Pointer Events properties tests</title>
         <meta name="timeout" content="long">
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <meta name="variant" content="?mouse">
+        <meta name="variant" content="?touch">
+        <meta name="variant" content="?pen">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <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>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
         <style>
           #testContainer {
             touch-action: none;
@@ -37,12 +40,11 @@
           }
         </style>
         <script>
+            var inputSource = location.search.substring(1);
             var expectedPointerId = NaN;
             var lastScreenX = null;
             var lastScreenY = null;
-            var actionsPromiseMouse;
-            var actionsPromiseTouch;
-            var actionsPromisePen;
+            var actionsPromise;
 
             function resetTestState() {
                 lastScreenX = null;
@@ -75,7 +77,7 @@
             }
 
             function run() {
-                var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", ALL_POINTERS);
+                var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", [inputSource]);
 
                 [document, document.getElementById('innerFrame').contentDocument].forEach(function(element) {
                   nonPointermoveEventList.forEach(function(eventName) {
@@ -115,25 +117,13 @@
                 });
                 on_event(document.querySelector('#box2'), 'pointerup', function(event) {
                   // Make sure the test finishes after all the input actions are completed.
-                  if (expectedPointerType == "mouse") {
-                    actionsPromiseTouch = actionsPromiseMouse.then(function(){
-                      test_pointerEvent.done();
-                      return injectInput("touch");
-                    });
-                  } else if (expectedPointerType == "touch") {
-                    actionsPromisePen = actionsPromiseTouch.then(function(){
-                      test_pointerEvent.done();
-                      return injectInput("pen");
-                    });
-                  } else {
-                    actionsPromisePen.then( () => {
-                      test_pointerEvent.done();
-                    });
-                  }
+                  actionsPromise.then( () => {
+                    test_pointerEvent.done();
+                  });
                 });
 
-                // Inject mouse input
-                actionsPromiseMouse = injectInput("mouse");
+                // Inject input
+                actionsPromise = injectInput(inputSource);
             }
 
         </script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html b/tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html
index bcfb5e06588..0a894d4401e 100644
--- a/tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html
+++ b/tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html
@@ -11,10 +11,10 @@
   <body></body>
   <script>
     function handler(e) {
-        window.top.postMessage(JSON.stringify({
-            "type": "event",
+        window.top.postMessage({
+            "type": "subframe-event",
             "eventType": e.type
-        }), "*");
+        }, "*");
     }
 
     ["pointerup", "pointercancel"].forEach(eventType => {
diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload.html b/tests/wpt/web-platform-tests/preload/link-header-preload.html
index 8ad528d0e7c..f4a819be8e9 100644
--- a/tests/wpt/web-platform-tests/preload/link-header-preload.html
+++ b/tests/wpt/web-platform-tests/preload/link-header-preload.html
@@ -7,6 +7,7 @@
 -->
 <link rel="preload" as="style" crossorigin href="resources/dummy.css?link-header-crossorigin-preload2">
 <link rel="stylesheet" crossorigin href="resources/dummy.css?link-header-crossorigin-preload2">
+<script src="resources/dummy.js?link-header-preload2"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/preload/resources/preload_helper.js"></script>
@@ -18,7 +19,8 @@
 
     function check_finished() {
         if (numberOfResourceTimingEntries("resources/square.png?link-header-preload") == 1 &&
-            numberOfResourceTimingEntries("resources/dummy.js?link-header-preload") == 1 &&
+            numberOfResourceTimingEntries("resources/dummy.js?link-header-preload1") == 1 &&
+            numberOfResourceTimingEntries("resources/dummy.js?link-header-preload2") == 1 &&
             numberOfResourceTimingEntries("resources/dummy.css?link-header-preload") == 1 &&
             numberOfResourceTimingEntries("resources/dummy.css?link-header-crossorigin-preload1") == 1 &&
             numberOfResourceTimingEntries("resources/dummy.css?link-header-crossorigin-preload2") == 1) {
@@ -28,7 +30,8 @@
         if (iterations == 10) {
             // At least one is expected to fail, but this should give details to the exact failure(s).
             verifyNumberOfResourceTimingEntries("resources/square.png?link-header-preload", 1);
-            verifyNumberOfResourceTimingEntries("resources/dummy.js?link-header-preload", 1);
+            verifyNumberOfResourceTimingEntries("resources/dummy.js?link-header-preload1", 1);
+            verifyNumberOfResourceTimingEntries("resources/dummy.js?link-header-preload2", 1);
             verifyNumberOfResourceTimingEntries("resources/dummy.css?link-header-preload", 1);
             verifyNumberOfResourceTimingEntries("resources/dummy.css?link-header-crossorigin-preload1", 1);
             verifyNumberOfResourceTimingEntries("resources/dummy.css?link-header-crossorigin-preload2", 1);
diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload.html.headers b/tests/wpt/web-platform-tests/preload/link-header-preload.html.headers
index 83758fb9cdc..7ab20ab8d7f 100644
--- a/tests/wpt/web-platform-tests/preload/link-header-preload.html.headers
+++ b/tests/wpt/web-platform-tests/preload/link-header-preload.html.headers
@@ -1,4 +1,5 @@
-Link: </preload/resources/dummy.js?link-header-preload>;rel=preload;as=script
+Link: </preload/resources/dummy.js?link-header-preload1>;rel=preload;as=script
+Link: </preload/resources/dummy.js?link-header-preload2>;rel=preload;as=script
 Link: </preload/resources/dummy.css?link-header-preload>;rel=preload;as=style
 Link: </preload/resources/square.png?link-header-preload>;rel=preload;as=image
 Link: </preload/resources/dummy.css?link-header-crossorigin-preload1>;rel=preload;as=style;crossorigin
diff --git a/tests/wpt/web-platform-tests/resource-timing/CodingConventions.md b/tests/wpt/web-platform-tests/resource-timing/CodingConventions.md
index 461cae421e6..e8cb33a51e4 100644
--- a/tests/wpt/web-platform-tests/resource-timing/CodingConventions.md
+++ b/tests/wpt/web-platform-tests/resource-timing/CodingConventions.md
@@ -50,6 +50,11 @@ with recurring patterns.
         web performance APIs, in general).
 *   Prefer [`fetch_tests_from_window`][3] to collect test results from embedded
     iframes instead of hand-rolled `postMessage` approaches
+*   Use the [`assert_*`][4] family of functions to check conformance to the spec
+    but throw exceptions explicitly when the test itself is broken.
+    *    A failed assert indicates "the implementation doesn't conform to the
+         spec"
+    *    Other uncaught exceptions indicate "the test case itself has a bug"
 *   Where possible, we want tests to be scalable - adding another test case
     should be as simple as calling the tests with new parameters, rather than
     copying an existing test and modifying it.
@@ -57,3 +62,4 @@ with recurring patterns.
 [1]: https://www.w3.org/TR/resource-timing-2/
 [2]: https://web-platform-tests.org/writing-tests/testharness-api.html#promise-tests
 [3]: https://web-platform-tests.org/writing-tests/testharness-api.html#consolidating-tests-from-other-documents
+[4]: https://web-platform-tests.org/writing-tests/testharness-api.html#list-of-assertions
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html
index 9d615eda1dd..0a90dc2897c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html
@@ -61,5 +61,40 @@ promise_test(async t => {
   assert_equals(updated_cookies[COOKIE_NAME], '1',
                 'updated worker has credentials');
 }, 'Imported script should have credentials');
+
+promise_test(async t => {
+  const key = token();
+  const registration = await service_worker_unregister_and_register(
+      t, `resources/import-echo-cookie-worker-module.py?key=${key}`, SCOPE, {type: 'module'});
+  t.add_cleanup(() => registration.unregister());
+  const worker = registration.installing;
+
+  const cookies = await get_cookies(worker);
+  assert_equals(cookies[COOKIE_NAME], undefined, 'new module worker should not have credentials');
+
+  await registration.update();
+  const updated_worker = registration.installing;
+  const updated_cookies = await get_cookies(updated_worker);
+  assert_equals(updated_cookies[COOKIE_NAME], undefined,
+                'updated worker should not have credentials');
+}, 'Module with an imported statement should not have credentials');
+
+promise_test(async t => {
+  const key = token();
+  const registration = await service_worker_unregister_and_register(
+t, `resources/echo-cookie-worker.py?key=${key}`, SCOPE, {type: 'module'});
+  t.add_cleanup(() => registration.unregister());
+  const worker = registration.installing;
+
+  const cookies = await get_cookies(worker);
+  assert_equals(cookies[COOKIE_NAME], undefined, 'new module worker should not have credentials');
+
+  await registration.update();
+  const updated_worker = registration.installing;
+  const updated_cookies = await get_cookies(updated_worker);
+  assert_equals(updated_cookies[COOKIE_NAME], undefined,
+                'updated worker should not have credentials');
+}, 'Script with service worker served as modules should not have credentials');
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-module-scripts.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/import-module-scripts.https.html
deleted file mode 100644
index 7bca8de64f5..00000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/import-module-scripts.https.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Tests for module import: ServiceWorker</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helpers.sub.js"></script>
-<script src="/workers/modules/resources/import-test-cases.js"></script>
-<body>
-<script>
-function import_test(testCase) {
-  promise_test(async t => {
-    const msgPromise = new Promise(resolve => {
-      navigator.serviceWorker.onmessage = resolve;
-    });
-    await service_worker_unregister(t, testCase.scriptURL);
-    t.add_cleanup(() => service_worker_unregister(t, testCase.scriptURL));
-    const registration = await navigator.serviceWorker.register(
-      testCase.scriptURL,
-      { scope: testCase.scriptURL, type: 'module' });
-    registration.installing.postMessage(
-      'Send message for tests from main script.');
-    const msgEvent = await msgPromise;
-    assert_array_equals(msgEvent.data, testCase.expectation);
-  }, testCase.description);
-}
-
-testCases.forEach(import_test);
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import-in-module.any.js b/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import-in-module.any.js
new file mode 100644
index 00000000000..84b17629ccd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import-in-module.any.js
@@ -0,0 +1,7 @@
+// META: global=serviceworker-module
+
+// This is imported to ensure import('./basic-module-2.js') fails even if
+// it has been previously statically imported.
+import './basic-module-2.js';
+
+import './resources/no-dynamic-import.js';
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import.any.js b/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import.any.js
new file mode 100644
index 00000000000..25b370b7094
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import.any.js
@@ -0,0 +1,3 @@
+// META: global=serviceworker
+
+importScripts('resources/no-dynamic-import.js');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module-2.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module-2.js
new file mode 100644
index 00000000000..189b1c87fee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module-2.js
@@ -0,0 +1 @@
+export default 'hello again!';
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module.js
new file mode 100644
index 00000000000..789a89bc630
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module.js
@@ -0,0 +1 @@
+export default 'hello!';
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py
new file mode 100644
index 00000000000..8f0b68e5a3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py
@@ -0,0 +1,6 @@
+def main(request, response):
+  # This script generates a worker script for static imports from module
+  # service workers.
+  headers = [(b'Content-Type', b'text/javascript')]
+  body = b"import './echo-cookie-worker.py?key=%s'" % request.GET[b'key']
+  return headers, body
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/no-dynamic-import.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/no-dynamic-import.js
new file mode 100644
index 00000000000..ecedd6c5d75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/no-dynamic-import.js
@@ -0,0 +1,18 @@
+/** @type {[name: string, url: string][]} */
+const importUrlTests = [
+  ["Module URL", "./basic-module.js"],
+  // In no-dynamic-import-in-module.any.js, this module is also statically imported
+  ["Another module URL", "./basic-module-2.js"],
+  [
+    "Module data: URL",
+    "data:text/javascript;charset=utf-8," +
+      encodeURIComponent(`export default 'hello!';`),
+  ],
+];
+
+for (const [name, url] of importUrlTests) {
+  promise_test(
+    (t) => promise_rejects_js(t, TypeError, import(url), "Import must reject"),
+    name
+  );
+}
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index 5b99f90e458..34e679eb8b7 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -84,9 +84,13 @@ def read_script_metadata(f, regexp):
 _any_variants = {
     "window": {"suffix": ".any.html"},
     "serviceworker": {"force_https": True},
+    "serviceworker-module": {"force_https": True},
     "sharedworker": {},
+    "sharedworker-module": {},
     "dedicatedworker": {"suffix": ".any.worker.html"},
+    "dedicatedworker-module": {"suffix": ".any.worker-module.html"},
     "worker": {"longhand": {"dedicatedworker", "sharedworker", "serviceworker"}},
+    "worker-module": {},
     "jsshell": {"suffix": ".any.js"},
 }  # type: Dict[Text, Dict[Text, Any]]
 
diff --git a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
index 5df717758aa..1c850658579 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
@@ -1,3 +1,3 @@
-mypy==0.800
+mypy==0.812
 mypy-extensions==0.4.3
 typed-ast==1.4.2
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 644a8a93f70..8e1aaa8dc73 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -227,6 +227,22 @@ fetch_tests_from_worker(new Worker("%(path)s%(query)s"));
 """
 
 
+class WorkerModulesHandler(HtmlWrapperHandler):
+    global_type = "dedicatedworker-module"
+    path_replace = [(".any.worker-module.html", ".any.js", ".any.worker-module.js"),
+                    (".worker.html", ".worker.js")]
+    wrapper = """<!doctype html>
+<meta charset=utf-8>
+%(meta)s
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+fetch_tests_from_worker(new Worker("%(path)s%(query)s", { type: "module" }));
+</script>
+"""
+
+
 class WindowHandler(HtmlWrapperHandler):
     path_replace = [(".window.html", ".window.js")]
     wrapper = """<!doctype html>
@@ -275,6 +291,21 @@ fetch_tests_from_worker(new SharedWorker("%(path)s%(query)s"));
 """
 
 
+class SharedWorkerModulesHandler(HtmlWrapperHandler):
+    global_type = "sharedworker-module"
+    path_replace = [(".any.sharedworker-module.html", ".any.js", ".any.worker-module.js")]
+    wrapper = """<!doctype html>
+<meta charset=utf-8>
+%(meta)s
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+fetch_tests_from_worker(new SharedWorker("%(path)s%(query)s", { type: "module" }));
+</script>
+"""
+
+
 class ServiceWorkersHandler(HtmlWrapperHandler):
     global_type = "serviceworker"
     path_replace = [(".any.serviceworker.html", ".any.js", ".any.worker.js")]
@@ -296,8 +327,54 @@ class ServiceWorkersHandler(HtmlWrapperHandler):
 """
 
 
-class AnyWorkerHandler(WrapperHandler):
+class ServiceWorkerModulesHandler(HtmlWrapperHandler):
+    global_type = "serviceworker-module"
+    path_replace = [(".any.serviceworker-module.html",
+                     ".any.js", ".any.worker-module.js")]
+    wrapper = """<!doctype html>
+<meta charset=utf-8>
+%(meta)s
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+(async function() {
+  const scope = 'does/not/exist';
+  let reg = await navigator.serviceWorker.getRegistration(scope);
+  if (reg) await reg.unregister();
+  reg = await navigator.serviceWorker.register(
+    "%(path)s%(query)s",
+    { scope, type: 'module' },
+  );
+  fetch_tests_from_worker(reg.installing);
+})();
+</script>
+"""
+
+
+class BaseWorkerHandler(WrapperHandler):
     headers = [('Content-Type', 'text/javascript')]
+
+    def _meta_replacement(self, key, value):
+        return None
+
+    @abc.abstractmethod
+    def _create_script_import(self, attribute):
+        # Take attribute (a string URL to a JS script) and return JS source to import the script
+        # into the worker.
+        pass
+
+    def _script_replacement(self, key, value):
+        if key == "script":
+            attribute = value.replace("\\", "\\\\").replace('"', '\\"')
+            return self._create_script_import(attribute)
+        if key == "title":
+            value = value.replace("\\", "\\\\").replace('"', '\\"')
+            return 'self.META_TITLE = "%s";' % value
+        return None
+
+
+class ClassicWorkerHandler(BaseWorkerHandler):
     path_replace = [(".any.worker.js", ".any.js")]
     wrapper = """%(meta)s
 self.GLOBAL = {
@@ -310,17 +387,25 @@ importScripts("%(path)s");
 done();
 """
 
-    def _meta_replacement(self, key, value):
-        return None
+    def _create_script_import(self, attribute):
+        return 'importScripts("%s")' % attribute
 
-    def _script_replacement(self, key, value):
-        if key == "script":
-            attribute = value.replace("\\", "\\\\").replace('"', '\\"')
-            return 'importScripts("%s")' % attribute
-        if key == "title":
-            value = value.replace("\\", "\\\\").replace('"', '\\"')
-            return 'self.META_TITLE = "%s";' % value
-        return None
+
+class ModuleWorkerHandler(BaseWorkerHandler):
+    path_replace = [(".any.worker-module.js", ".any.js")]
+    wrapper = """%(meta)s
+self.GLOBAL = {
+  isWindow: function() { return false; },
+  isWorker: function() { return true; },
+};
+import "/resources/testharness.js";
+%(script)s
+import "%(path)s";
+done();
+"""
+
+    def _create_script_import(self, attribute):
+        return 'import "%s";' % attribute
 
 
 rewrites = [("GET", "/resources/WebIDLParser.js", "/resources/webidl2/lib/webidl2.js")]
@@ -368,11 +453,15 @@ class RoutesBuilder(object):
 
         routes = [
             ("GET", "*.worker.html", WorkersHandler),
+            ("GET", "*.worker-module.html", WorkerModulesHandler),
             ("GET", "*.window.html", WindowHandler),
             ("GET", "*.any.html", AnyHtmlHandler),
             ("GET", "*.any.sharedworker.html", SharedWorkersHandler),
+            ("GET", "*.any.sharedworker-module.html", SharedWorkerModulesHandler),
             ("GET", "*.any.serviceworker.html", ServiceWorkersHandler),
-            ("GET", "*.any.worker.js", AnyWorkerHandler),
+            ("GET", "*.any.serviceworker-module.html", ServiceWorkerModulesHandler),
+            ("GET", "*.any.worker.js", ClassicWorkerHandler),
+            ("GET", "*.any.worker-module.js", ModuleWorkerHandler),
             ("GET", "*.asis", handlers.AsIsHandler),
             ("GET", "/.well-known/origin-policy", handlers.PythonScriptHandler),
             ("*", "*.py", handlers.PythonScriptHandler),
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index eb0377760c7..32e3e2a70b9 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -317,6 +317,7 @@ def test_tests_affected_idlharness(capsys, manifest_dir):
     assert ("webrtc-identity/idlharness.https.window.js\n" +
             "webrtc-insertable-streams/idlharness.https.window.js\n" +
             "webrtc-stats/idlharness.window.js\n" +
+            "webrtc-stats/supported-stats.html\n" +
             "webrtc/idlharness.https.window.js\n") == out
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py
index 0acfac4d194..1dc2a9ba7bb 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py
@@ -436,12 +436,12 @@ class TestServiceWorkersHandler(TestWrapperHandlerUsingServer):
                               'text/html', serve.ServiceWorkersHandler)
 
 
-class TestAnyWorkerHandler(TestWrapperHandlerUsingServer):
+class TestClassicWorkerHandler(TestWrapperHandlerUsingServer):
     dummy_files = {'bar.any.js': b''}
 
     def test_any_work_js(self):
         self.run_wrapper_test('bar.any.worker.js', 'text/javascript',
-                              serve.AnyWorkerHandler)
+                              serve.ClassicWorkerHandler)
 
 
 if __name__ == '__main__':
diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mousemove_prevent_default_action.tentative.html b/tests/wpt/web-platform-tests/uievents/mouse/mousemove_prevent_default_action.tentative.html
new file mode 100644
index 00000000000..b87385d79c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/uievents/mouse/mousemove_prevent_default_action.tentative.html
@@ -0,0 +1,96 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset=utf-8>
+  <title>mousemove event: preventDefault()</title>
+  <link rel="author" title="Mirko Brodesser" href="mailto:mbrodesser@mozilla.com">
+  <link rel="help" href="https://github.com/w3c/uievents/issues/278">
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/uievents/resources/eventrecorder.js></script>
+  <script src=/resources/testdriver.js></script>
+  <script src=/resources/testdriver-actions.js></script>
+  <script src=/resources/testdriver-vendor.js></script>
+</head>
+
+<body>
+  <div id="a">a</div>
+  <div id="b">b</div>
+</body>
+
+<script>
+const eventsToRecord = [
+  "mousedown",
+  "mousemove",
+  "selectionchange",
+];
+
+const expectedEventRecords = [
+  {type: "mousemove", target: "a"},
+  {type: "mousemove", target: "document"},
+  {type: "mousedown", target: "a"},
+  {type: "mousedown", target: "document"},
+  {type: "selectionchange", target: "document"},
+  {type: "mousemove", target: "b"},
+  {type: "mousemove", target: "document"},
+];
+
+window.onload = function () {
+  setup({single_test: true});
+
+  const a = document.getElementById("a");
+  const b = document.getElementById("b");
+  const nodesToListenForEvents = [a, b, document];
+
+  EventRecorder.configure({
+    objectMap: {
+      "a" : a,
+      "b" : b,
+      "document" : document,
+    }
+  });
+
+  EventRecorder.addEventListenersForNodes(eventsToRecord,
+    nodesToListenForEvents, null);
+
+  document.addEventListener("mousemove", (event) => {
+    event.preventDefault();
+  });
+
+  EventRecorder.start();
+
+  let actions_promise = new test_driver.Actions()
+    .pointerMove(0, 0, {origin: a})
+    .pointerDown()
+    .send();
+
+  actions_promise.then(() => {
+    window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(() => {
+        // Requested two animation frames to enforce flushing the
+        // "selectionchange" event.
+      })
+    });
+  });
+
+  actions_promise = new test_driver.Actions()
+    .pointerMove(0, 0, {origin: b})
+    .send();
+
+  actions_promise.then(() => {
+    window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(() => {
+        // Requested two animation frames to enforce flusing the
+        // "selectionchange" event, if there was one.
+
+        EventRecorder.stop();
+        assert_true(EventRecorder.checkRecords(expectedEventRecords),
+          "Events are as expected");
+
+        done();
+      });
+    });
+  });
+};
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body.html
similarity index 84%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body.html
index 30b6646afff..45453c75ca8 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body.html
@@ -5,9 +5,11 @@
     <title>Clicking on the body element itself fires a click event</title>
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
     <link rel="help" href="https://w3c.github.io/uievents/#event-type-click">
-    <meta name="flags" content="interact">
     <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>
     <style>
 html {
   background-color: white;
@@ -27,11 +29,11 @@ body {
     </style>
   </head>
   <body>
-    <p id="guineapig">Click on the blue area below. If a "PASS" result appears, the test passes; otherwise, it fails.</p>
+    <p id="guineapig">Click on the blue area below.</p>
     <p id="other">&nbsp;</p><!-- Needed to prevent the margin from collapsing -->
     <script>
 setup({explicit_timeout: true});
-async_test(function(t) {
+promise_test(async function(t) {
   document.body.addEventListener('click', function (event) {
     t.step(function () {
       assert_equals(event.target, document.body, 'target of click event must be the body element');
@@ -47,6 +49,8 @@ async_test(function(t) {
       t.done();
     });
   }, false);
+
+  await test_driver.click(document.body);
 }, "Clicking on the body element itself should fire a click event targeted at the body element");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div.html
similarity index 82%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div.html
index 173e520a17e..bf06d8251cf 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div.html
@@ -6,9 +6,11 @@
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
     <link rel="help" href="https://w3c.github.io/uievents/#event-type-click">
     <link rel="help" href="https://dom.spec.whatwg.org/#concept-event-dispatch">
-    <meta name="flags" content="interact">
     <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>
     <style>
 #square {
   width: 100px;
@@ -22,11 +24,11 @@
     </style>
   </head>
   <body>
-    <p>Click on the blue square below. If a "PASS" result appears, the test passes; otherwise, it fails.</p>
+    <p>Click on the blue square below.</p>
     <div id="square">Click me</div>
     <script>
 setup({explicit_timeout: true});
-async_test(function(t) {
+promise_test(async function(t) {
   document.addEventListener('click', function (event) {
     var square = document.getElementById('square');
     t.step(function () {
@@ -37,6 +39,8 @@ async_test(function(t) {
       t.done();
     });
   }, false);
+
+  await test_driver.click(square);
 }, "Clicking on a div element and having a click event listener on only document");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html.html
similarity index 81%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html.html
index 7f3514fdd02..e93acc67497 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html.html
@@ -5,9 +5,11 @@
     <title>Clicking on the html element itself fires a click event</title>
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
     <link rel="help" href="https://w3c.github.io/uievents/#event-type-click">
-    <meta name="flags" content="interact">
     <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>
     <style>
 html {
   background-color: blue;
@@ -31,11 +33,11 @@ body {
     </style>
   </head>
   <body>
-    <p id="guineapig">Click on the blue area below. If a "PASS" result appears, the test passes; otherwise, it fails.</p>
+    <p id="guineapig">Click on the blue area below.</p>
     <p id="other">&nbsp;</p><!-- Needed to prevent the margin from collapsing -->
     <script>
 setup({explicit_timeout: true});
-async_test(function(t) {
+promise_test(async function(t) {
   document.documentElement.addEventListener('click', function (event) {
     t.step(function () {
       assert_equals(event.target, document.documentElement, 'target of click event must be the html element');
@@ -52,6 +54,13 @@ async_test(function(t) {
       t.done();
     });
   }, false);
+
+  const xPositionInHtml = yPositionInHtml = 150;
+  await new test_driver.Actions()
+    .pointerMove(xPositionInHtml, yPositionInHtml)
+    .pointerDown()
+    .pointerUp()
+    .send();
 }, "Clicking on the html element itself should fire a click event targeted at the html element");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order.html
similarity index 78%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order.html
index 7d31a5f8dbb..1285a31efc6 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order.html
@@ -4,9 +4,11 @@
     <meta charset="utf-8">
     <title>Click-related events should fire in the correct order</title>
     <link rel="help" href="https://w3c.github.io/uievents/#events-clickevent-event-order">
-    <meta name="flags" content="interact">
     <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>
     <script src="/uievents/resources/eventrecorder.js"></script>
   </head>
   <body>
@@ -32,8 +34,9 @@ var relevantEvents = [
   "dblclick"
 ];
 
-window.onload = function () {
+window.onload = async function () {
   var blue = document.getElementById("blue");
+  var button = document.getElementById("done");
   var inputs = [blue];
   EventRecorder.configure({
     mergeEventTypes: ["mousemove"],
@@ -59,7 +62,7 @@ window.onload = function () {
   ];
 
   async_test(function(t) {
-    document.getElementById("done").addEventListener("click", function () {
+    button.addEventListener("click", function () {
       t.step(function () {
         assert_true(EventRecorder.checkRecords(expected));
         t.done();
@@ -67,6 +70,17 @@ window.onload = function () {
     }, false);
   }, "Click-related events should fire in the correct order");
   EventRecorder.start();
+
+  await new test_driver.Actions()
+    .pointerMove(0, 0, {origin: blue})
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .pointerMove(0, 0, {origin: button})
+    .pointerDown()
+    .pointerUp()
+    .send();
 };
     </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove-manual.htm b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm
similarity index 64%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove-manual.htm
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm
index 8ed9c1c2848..98a35bbcf6b 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove-manual.htm
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm
@@ -13,6 +13,9 @@
   </style>
   <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>
   <script>
    setup({explicit_timeout: true});
   </script>
@@ -35,8 +38,10 @@
  </section>
 
  <script>
+    var mouse_test = async_test("Mousemove events");
     var start = document.getElementById("start");
     var end = document.getElementById("end");
+    var actions_promise;
 
     EventRecorder.configure({
       mergeEventTypes: ["mousemove"],
@@ -56,21 +61,32 @@
       e.stopPropagation();
       this.className = "green";
       endTest();
-      done();
+      // Make sure the test finishes after all the input actions are completed.
+      actions_promise.then( () =>  mouse_test.done() );
     });
 
     function endTest() {
       EventRecorder.stop();
       var results = EventRecorder.getRecords();
       // Check results:
-      assert_equals(results.length, 2, "Two mousemove events");
-      assert_equals(results[0].event.type, "mousemove", "First event is a mousemove event");
-      assert_equals(results[1].event.type, "mousemove", "Second event is a mousemove event");
-      assert_equals(results[0].event.target, "div#start", "First event targetted #start");
-      assert_equals(results[1].event.target, "div#end", "Second event targetted #end");
+      mouse_test.step(function () {
+        assert_equals(results.length, 2, "Two mousemove events");
+        assert_equals(results[0].event.type, "mousemove", "First event is a mousemove event");
+        assert_equals(results[1].event.type, "mousemove", "Second event is a mousemove event");
+        assert_equals(results[0].event.target, "div#start", "First event targetted #start");
+        assert_equals(results[1].event.target, "div#end", "Second event targetted #end");
+      });
     }
 
     EventRecorder.start();
+
+    var rect = start.getClientRects()[0];
+    // Inject mouse inputs.
+    actions_promise = new test_driver.Actions()
+        .pointerMove(0, 0, {origin: start})
+        .pointerMove(Math.round(rect.width/2) + 10,
+                     Math.round(rect.height/2) + 10, {origin: start})
+        .send();
   </script>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across.html
similarity index 72%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across.html
index 8b0e7171a54..52d5a93cf9a 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across.html
@@ -3,6 +3,9 @@
 <title>Mousemove handling across elements</title>
 <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>
 <script src="/uievents/resources/eventrecorder.js"></script>
 <style>
 #a {
@@ -75,7 +78,7 @@ function stopPropagation(e) {
   event.stopPropagation();
 }
 
-window.onload = function() {
+window.onload = async function() {
   var a = document.getElementById("a");
   var b = document.getElementById("b");
   var c = document.getElementById("c");
@@ -130,5 +133,30 @@ window.onload = function() {
     }, false);
   }, "Mousemove events across elements should fire in the correct order.");
   EventRecorder.start();
+
+  var a_rect = a.getClientRects()[0];
+  var c_rect = c.getClientRects()[0];
+  var center_a_x = Math.round((a_rect.left + a_rect.right) / 2);
+  var center_a_y = Math.round((a_rect.top + a_rect.bottom) / 2);
+
+  var a1_rect = a1.getClientRects()[0];
+  var c1_rect = c1.getClientRects()[0];
+  var center_a1_x = Math.round((a1_rect.left + a1_rect.right) / 2);
+  var center_a1_y = Math.round((a1_rect.top + a1_rect.bottom) / 2);
+  // Inject mouse inputs.
+  await new test_driver.Actions()
+      .pointerMove(a_rect.right + 20, center_a_y)
+      .pointerMove(center_a_x, center_a_y)
+      .pointerMove(a_rect.left + 20, center_a_y)
+      .pointerMove(a_rect.left - 20, center_a_y)
+      .pointerMove(c_rect.left + 20, center_a_y)
+      .pointerMove(0, center_a_y)
+      .pointerMove(a1_rect.right + 20, center_a1_y)
+      .pointerMove(center_a1_x, center_a1_y)
+      .pointerMove(a1_rect.left + 20, center_a1_y)
+      .pointerMove(a1_rect.left - 20, center_a1_y)
+      .pointerMove(c1_rect.left + 20, center_a1_y)
+      .pointerMove(0, center_a1_y)
+      .send();
 };
 </script>
diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between-manual.html b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between.html
similarity index 75%
rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between-manual.html
rename to tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between.html
index 89b5db92ca9..1ddab541586 100644
--- a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between.html
@@ -3,6 +3,9 @@
 <title>Mousemove handling between elements</title>
 <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>
 <script src="/uievents/resources/eventrecorder.js"></script>
 <style>
 #a {
@@ -58,7 +61,7 @@ function stopPropagation(e) {
   event.stopPropagation();
 }
 
-window.onload = function() {
+window.onload = async function() {
   var a = document.getElementById("a");
   var b = document.getElementById("b");
   var c = document.getElementById("c");
@@ -102,5 +105,22 @@ window.onload = function() {
     }, false);
   }, "Mousemove events between elements should fire in the correct order.");
   EventRecorder.start();
+
+  var a_rect = a.getClientRects()[0];
+  var b_rect = b.getClientRects()[0];
+  var c_rect = c.getClientRects()[0];
+  var center_b_y = Math.round((b_rect.top + b_rect.bottom) / 2);
+  var center_c_y = Math.round((c_rect.top + c_rect.bottom) / 2);
+
+  // Inject mouse inputs.
+  await new test_driver.Actions()
+      .pointerMove(b_rect.right + 10, center_b_y)
+      .pointerMove(0, 0, {origin: b})
+      .pointerMove(b_rect.right + 10, center_b_y)
+      .pointerMove(a_rect.right + 10, center_b_y)
+      .pointerMove(c_rect.right + 10, center_c_y)
+      .pointerMove(0, 0, {origin: c})
+      .pointerMove(c_rect.right + 20, c_rect.bottom + 20)
+      .send();
 };
 </script>
diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
index f55a40338a3..b136020e8ba 100644
--- a/tests/wpt/web-platform-tests/url/resources/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
@@ -7429,5 +7429,185 @@
     "protocol": "https:",
     "search": "",
     "username": "user"
+  },
+  "Tests for the distinct percent-encode sets",
+  {
+    "input": "foo:// !\"$%&'()*+,-.;<=>@[\\]^_`{|}~@host/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "foo://%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~@host/",
+    "origin": "null",
+    "password": "",
+    "pathname": "/",
+    "port":"",
+    "protocol": "foo:",
+    "search": "",
+    "username": "%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~"
+  },
+  {
+    "input": "wss:// !\"$%&'()*+,-.;<=>@[]^_`{|}~@host/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "wss://%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/",
+    "origin": "wss://host",
+    "password": "",
+    "pathname": "/",
+    "port":"",
+    "protocol": "wss:",
+    "search": "",
+    "username": "%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~"
+  },
+  {
+    "input": "foo://joe: !\"$%&'()*+,-.:;<=>@[\\]^_`{|}~@host/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "foo://joe:%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~@host/",
+    "origin": "null",
+    "password": "%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~",
+    "pathname": "/",
+    "port":"",
+    "protocol": "foo:",
+    "search": "",
+    "username": "joe"
+  },
+  {
+    "input": "wss://joe: !\"$%&'()*+,-.:;<=>@[]^_`{|}~@host/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "wss://joe:%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/",
+    "origin": "wss://host",
+    "password": "%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~",
+    "pathname": "/",
+    "port":"",
+    "protocol": "wss:",
+    "search": "",
+    "username": "joe"
+  },
+  { "input": "foo://!\"$%&'()*+,-.;=_`{}~/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "!\"$%&'()*+,-.;=_`{}~",
+    "hostname": "!\"$%&'()*+,-.;=_`{}~",
+    "href":"foo://!\"$%&'()*+,-.;=_`{}~/",
+    "origin": "null",
+    "password": "",
+    "pathname": "/",
+    "port":"",
+    "protocol": "foo:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "input": "wss://!\"$&'()*+,-.;=_`{}~/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "!\"$&'()*+,-.;=_`{}~",
+    "hostname": "!\"$&'()*+,-.;=_`{}~",
+    "href":"wss://!\"$&'()*+,-.;=_`{}~/",
+    "origin": "wss://!\"$&'()*+,-.;=_`{}~",
+    "password": "",
+    "pathname": "/",
+    "port":"",
+    "protocol": "wss:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "input": "foo://host/ !\"$%&'()*+,-./:;<=>@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "foo://host/%20!%22$%&'()*+,-./:;%3C=%3E@[\\]^_%60%7B|%7D~",
+    "origin": "null",
+    "password": "",
+    "pathname": "/%20!%22$%&'()*+,-./:;%3C=%3E@[\\]^_%60%7B|%7D~",
+    "port":"",
+    "protocol": "foo:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "input": "wss://host/ !\"$%&'()*+,-./:;<=>@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "wss://host/%20!%22$%&'()*+,-./:;%3C=%3E@[/]^_%60%7B|%7D~",
+    "origin": "wss://host",
+    "password": "",
+    "pathname": "/%20!%22$%&'()*+,-./:;%3C=%3E@[/]^_%60%7B|%7D~",
+    "port":"",
+    "protocol": "wss:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "input": "foo://host/dir/? !\"$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "foo://host/dir/?%20!%22$%&'()*+,-./:;%3C=%3E?@[\\]^_`{|}~",
+    "origin": "null",
+    "password": "",
+    "pathname": "/dir/",
+    "port":"",
+    "protocol": "foo:",
+    "search": "?%20!%22$%&'()*+,-./:;%3C=%3E?@[\\]^_`{|}~",
+    "username": ""
+  },
+  {
+    "input": "wss://host/dir/? !\"$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "",
+    "host": "host",
+    "hostname": "host",
+    "href": "wss://host/dir/?%20!%22$%&%27()*+,-./:;%3C=%3E?@[\\]^_`{|}~",
+    "origin": "wss://host",
+    "password": "",
+    "pathname": "/dir/",
+    "port":"",
+    "protocol": "wss:",
+    "search": "?%20!%22$%&%27()*+,-./:;%3C=%3E?@[\\]^_`{|}~",
+    "username": ""
+  },
+  {
+    "input": "foo://host/dir/# !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "#%20!%22#$%&'()*+,-./:;%3C=%3E?@[\\]^_%60{|}~",
+    "host": "host",
+    "hostname": "host",
+    "href": "foo://host/dir/#%20!%22#$%&'()*+,-./:;%3C=%3E?@[\\]^_%60{|}~",
+    "origin": "null",
+    "password": "",
+    "pathname": "/dir/",
+    "port":"",
+    "protocol": "foo:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "input": "wss://host/dir/# !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+    "base": "about:blank",
+    "hash": "#%20!%22#$%&'()*+,-./:;%3C=%3E?@[\\]^_%60{|}~",
+    "host": "host",
+    "hostname": "host",
+    "href": "wss://host/dir/#%20!%22#$%&'()*+,-./:;%3C=%3E?@[\\]^_%60{|}~",
+    "origin": "wss://host",
+    "password": "",
+    "pathname": "/dir/",
+    "port":"",
+    "protocol": "wss:",
+    "search": "",
+    "username": ""
   }
 ]
diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
index fe38505ddf0..a4b2c3281f0 100644
--- a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
+++ b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
@@ -225,6 +225,14 @@
       "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": {
+      "input": { "pathname": "/foo/bar" },
+      "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)" },
     "input": { "pathname": "/foo/bar/baz" },
@@ -233,6 +241,14 @@
       "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": {
+      "input": { "pathname": "/foo/bar/baz" },
+      "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)" },
     "input": { "pathname": "/foo/" },
@@ -241,11 +257,24 @@
       "pathname": { "input": "/foo/", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*" },
+    "input": { "pathname": "/foo/" },
+    "expected": {
+      "input": { "pathname": "/foo/" },
+      "pathname": { "input": "/foo/", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)" },
     "input": { "pathname": "/foo" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*" },
+    "input": { "pathname": "/foo" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/:bar(.*)" },
     "input": { "pathname": "/foo/bar" },
@@ -379,6 +408,14 @@
       "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": {
+      "input": { "pathname": "/foo/bar" },
+      "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)?" },
     "input": { "pathname": "/foo/bar/baz" },
@@ -387,6 +424,14 @@
       "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": {
+      "input": { "pathname": "/foo/bar/baz" },
+      "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)?" },
     "input": { "pathname": "/foo" },
@@ -395,6 +440,14 @@
       "pathname": { "input": "/foo", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/foo" },
+    "expected": {
+      "input": { "pathname": "/foo" },
+      "pathname": { "input": "/foo", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)?" },
     "input": { "pathname": "/foo/" },
@@ -403,16 +456,34 @@
       "pathname": { "input": "/foo/", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/foo/" },
+    "expected": {
+      "input": { "pathname": "/foo/" },
+      "pathname": { "input": "/foo/", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)?" },
     "input": { "pathname": "/foobar" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/foobar" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)?" },
     "input": { "pathname": "/fo" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*?" },
+    "input": { "pathname": "/fo" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/foo/bar" },
@@ -421,6 +492,14 @@
       "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": {
+      "input": { "pathname": "/foo/bar" },
+      "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/foo/bar/baz" },
@@ -429,11 +508,24 @@
       "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": {
+      "input": { "pathname": "/foo/bar/baz" },
+      "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/foo" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/foo" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/foo/" },
@@ -442,16 +534,34 @@
       "pathname": { "input": "/foo/", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/foo/" },
+    "expected": {
+      "input": { "pathname": "/foo/" },
+      "pathname": { "input": "/foo/", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/foobar" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/foobar" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)+" },
     "input": { "pathname": "/fo" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/*+" },
+    "input": { "pathname": "/fo" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/foo/bar" },
@@ -460,6 +570,14 @@
       "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": {
+      "input": { "pathname": "/foo/bar" },
+      "pathname": { "input": "/foo/bar", "groups": { "0": "bar" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/foo/bar/baz" },
@@ -468,6 +586,14 @@
       "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": {
+      "input": { "pathname": "/foo/bar/baz" },
+      "pathname": { "input": "/foo/bar/baz", "groups": { "0": "bar/baz" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/foo" },
@@ -476,6 +602,14 @@
       "pathname": { "input": "/foo", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/foo" },
+    "expected": {
+      "input": { "pathname": "/foo" },
+      "pathname": { "input": "/foo", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/foo/" },
@@ -484,16 +618,34 @@
       "pathname": { "input": "/foo/", "groups": { "0": "" } }
     }
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/foo/" },
+    "expected": {
+      "input": { "pathname": "/foo/" },
+      "pathname": { "input": "/foo/", "groups": { "0": "" } }
+    }
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/foobar" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/foobar" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo/(.*)*" },
     "input": { "pathname": "/fo" },
     "expected": null
   },
+  {
+    "pattern": { "pathname": "/foo/**" },
+    "input": { "pathname": "/fo" },
+    "expected": null
+  },
   {
     "pattern": { "pathname": "/foo{/bar}" },
     "input": { "pathname": "/foo/bar" },
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py b/tests/wpt/web-platform-tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py
new file mode 100644
index 00000000000..da36e493203
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py
@@ -0,0 +1,21 @@
+import os
+
+
+def main(request, response):
+    origin = request.headers.get(b"origin")
+    if origin is not None:
+        response.headers.set(b"Access-Control-Allow-Origin", origin)
+
+    headers = [
+        (b"Content-Type", b"application/webbundle"),
+        (b"X-Content-Type-Options", b"nosniff"),
+    ]
+
+    if request.headers.get(b"sec-fetch-dest", None) == b"webbundle":
+        with open(
+            os.path.join(os.path.dirname(__file__), "./wbn/subresource.wbn"),
+            "rb",
+        ) as f:
+            return (200, headers, f.read())
+    else:
+        return (400, [], "")
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har
index 983024bf63f..c31a0963fd3 100644
--- a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har
@@ -4,7 +4,7 @@
       {
         "request": {
           "method": "GET",
-          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/no-cors/resource.cors.js",
+          "url": "https://www1.web-platform.test:8444/web-bundle/resources/wbn/no-cors/resource.cors.js",
           "headers": []
         },
         "response": {
@@ -27,7 +27,7 @@
       {
         "request": {
           "method": "GET",
-          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/no-cors/resource.no-cors.js",
+          "url": "https://www1.web-platform.test:8444/web-bundle/resources/wbn/no-cors/resource.no-cors.js",
           "headers": []
         },
         "response": {
@@ -45,4 +45,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har
index 2197dea3beb..2c33449cbe2 100644
--- a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har
@@ -4,7 +4,7 @@
       {
         "request": {
           "method": "GET",
-          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.cors.js",
+          "url": "https://www1.web-platform.test:8444/web-bundle/resources/wbn/cors/resource.cors.js",
           "headers": []
         },
         "response": {
@@ -27,7 +27,7 @@
       {
         "request": {
           "method": "GET",
-          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.no-cors.js",
+          "url": "https://www1.web-platform.test:8444/web-bundle/resources/wbn/cors/resource.no-cors.js",
           "headers": []
         },
         "response": {
@@ -45,4 +45,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
index 36a8078194f..3c244398e2a 100755
--- a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
@@ -11,55 +11,55 @@ fi
 
 # TODO: Stop hard-coding "web-platform.test" when generating Web Bundles on the
 # fly.
-wpt_test_https_origin=https://web-platform.test:8444
-wpt_test_http_origin=http://web-platform.test:8001
+wpt_test_origin=https://web-platform.test:8444
+wpt_test_remote_origin=https://www1.web-platform.test:8444
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_https_origin/web-bundle/resources/wbn/ \
-  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/location.html \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/location.html \
   -dir location/ \
   -o wbn/location.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/wbn/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/root.js \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/root.js \
   -dir subresource/ \
   -o wbn/subresource.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/wbn/static-element/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/static-element/resources/style.css \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/static-element/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/static-element/resources/style.css \
   -dir static-element/ \
   -o wbn/static-element.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/wbn/dynamic/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/dynamic/resource1.js \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/dynamic/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/dynamic/resource1.js \
   -dir dynamic1/ \
   -o wbn/dynamic1.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/wbn/dynamic/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/dynamic/resource1.js \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/dynamic/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/dynamic/resource1.js \
   -dir dynamic2/ \
   -o wbn/dynamic2.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_https_origin/web-bundle/resources/wbn/dynamic/ \
-  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/dynamic/resource1.js \
+  -baseURL $wpt_test_remote_origin/web-bundle/resources/wbn/dynamic/ \
+  -primaryURL $wpt_test_remote_origin/web-bundle/resources/wbn/dynamic/resource1.js \
   -dir dynamic1/ \
   -o wbn/dynamic1-crossorigin.wbn
 
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/resource.js \
+  -baseURL $wpt_test_origin/web-bundle/resources/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/resource.js \
   -dir path-restriction/ \
   -o wbn/path-restriction.wbn
 
@@ -67,8 +67,8 @@ gen-bundle \
 cp -a wbn/subresource.wbn nested/nested-sub.wbn
 gen-bundle \
   -version b1 \
-  -baseURL $wpt_test_http_origin/web-bundle/resources/wbn/ \
-  -primaryURL $wpt_test_http_origin/web-bundle/resources/wbn/resource.js \
+  -baseURL $wpt_test_origin/web-bundle/resources/wbn/ \
+  -primaryURL $wpt_test_origin/web-bundle/resources/wbn/resource.js \
   -dir nested/ \
   -o wbn/nested-main.wbn
 
@@ -81,11 +81,11 @@ gen-bundle \
 gen-bundle \
   -version b1 \
   -har cross-origin.har \
-  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/cors/resource.cors.js \
+  -primaryURL $wpt_test_remote_origin/web-bundle/resources/wbn/cors/resource.cors.js \
   -o wbn/cors/cross-origin.wbn
 
 gen-bundle \
   -version b1 \
   -har cross-origin-no-cors.har \
-  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/no-cors/resource.cors.js \
+  -primaryURL $wpt_test_remote_origin/web-bundle/resources/wbn/no-cors/resource.cors.js \
   -o wbn/no-cors/cross-origin.wbn
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn
index eabd994ff8b..7041160d30f 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn
index 8043ba7df2d..942ddb6d348 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn
index 597b6ee90be..ab96d3597ef 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn
index 9ba161e2055..2fb02b19919 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn
index 798da2e499d..6698b37b173 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn
index f2b1e5333bd..9a304588086 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn
index 1f927814831..cceb3e36fbc 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn
index 7004673039a..4ceb691a9f2 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn
index e861469e122..66381aaaf41 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn
index 112f4f363f4..e58aa20a0da 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn
index eabd994ff8b..7041160d30f 100644
Binary files a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle-no-secure.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle-no-secure.tentative.html
new file mode 100644
index 00000000000..439a6ff9c37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle-no-secure.tentative.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<title>A link element with rel="webbundle" in no secure context</title>
+<link
+  rel="help"
+  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <link id="link_empty" />
+  <link id="link_web_bundle_1" rel="webbundle" />
+  <link id="link_web_bundle_2" rel="webbundle" resources="foo" />
+  <link id="link_web_bundle_3" rel="webbundle" scopes="bar" />
+  <script>
+    test(() => {
+      assert_false(
+        "resources" in Element.prototype,
+        "resources must not be defined on Element prototype"
+      );
+      assert_false(
+        "resources" in HTMLLinkElement.prototype,
+        "resources must not be defined on HTMLLinkElement prototype"
+      );
+    }, "resources must not be defined on HTMLLinkElement prototype in no secure context");
+
+    test(() => {
+      assert_false(
+        "scopes" in Element.prototype,
+        "scopes must not be defined on Element prototype"
+      );
+      assert_false(
+        "scopes" in HTMLLinkElement.prototype,
+        "scopes must not be defined on HTMLLinkElement prototype"
+      );
+    }, "scopes must not be defined on HTMLLinkElement prototype in no secure context");
+
+    test(() => {
+      const link = document.createElement("link");
+      assert_false(link.relList.supports("webbundle"));
+    }, "webbundle must not be a supported token of a link element's relList");
+
+    test(() => {
+      const link_web_bundle = document.querySelector("#link_web_bundle_1");
+      assert_equals(
+        link_web_bundle.getAttribute("rel"),
+        "webbundle",
+        "rel attribute must return webbundle"
+      );
+      assert_true(
+        link_web_bundle.relList.contains("webbundle"),
+        "relList must contain webbundle for <link rel=webbundle>."
+      );
+      assert_false(
+        document.querySelector("#link_empty").relList.contains("webbundle"),
+        "relList must not contain webbundle for <link>"
+      );
+    }, "relList must contain webbundle if rel attribute contains it");
+
+    test(() => {
+      assert_equals(
+        document.querySelector("#link_web_bundle_1").getAttribute("resources"),
+        null,
+        "resources attribute must return null when the attribute is not given"
+      );
+      assert_equals(
+        document.querySelector("#link_web_bundle_2").getAttribute("resources"),
+        "foo",
+        "resources attribute must return the specified value"
+      );
+      assert_equals(
+        document.querySelector("#link_web_bundle_2").getAttribute("scopes"),
+        null,
+        "scopes attribute must return null when the attribute is not given"
+      );
+      assert_equals(
+        document.querySelector("#link_web_bundle_3").getAttribute("scopes"),
+        "bar",
+        "scopes attribute must return the specified value"
+      );
+    }, "resoruces and scopes attribute must return null or specified value");
+
+    test(() => {
+      const link = document.createElement("link");
+      assert_equals(link.resources, undefined);
+    }, "resources must be undefined");
+
+    test(() => {
+      const link = document.createElement("link");
+      assert_equals(link.scopes, undefined);
+    }, "scopes must be undefined");
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.https.tentative.html
similarity index 98%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.https.tentative.html
index 2f10cd6b3fd..74460d0d8c7 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/link-web-bundle.https.tentative.html
@@ -78,7 +78,7 @@
         "scopes attribute must return the specified value"
       );
       // TODO: Test more variant of resoruces attribute values.
-    }, "resoruces attribute must return null or specified value");
+    }, "resoruces and scopes attribute must return null or specified value");
 
     test(() => {
       const link = document.createElement("link");
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subframe-from-web-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subframe-from-web-bundle.https.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subframe-from-web-bundle.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subframe-from-web-bundle.https.tentative.html
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.https.tentative.html
similarity index 90%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.https.tentative.html
index 1ea96fa0fdd..306ccb4ba2f 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors-error.https.tentative.html
@@ -13,11 +13,11 @@
 <script src="../resources/test-helpers.js"></script>
 <body>
   <!--
-       This wpt should run on an origin different from https://web-platform.test:8444/,
+       This wpt should run on an origin different from https://www1.web-platform.test:8444/,
        from where cross-orign WebBundles are served.
 
        This test uses a cross-origin WebBundle,
-       https://web-platform.test:8444/web-bundle/resources/wbn/no-cors/cross-origin.wbn,
+       https://www1.web-platform.test:8444/web-bundle/resources/wbn/no-cors/cross-origin.wbn,
        which is served *without* an Access-Control-Allow-Origin response header.
 
        `cross-origin.wbn` includes two subresources:
@@ -27,7 +27,7 @@
   <script>
     promise_test(async () => {
       const prefix =
-        "https://web-platform.test:8444/web-bundle/resources/wbn/no-cors/";
+        "https://www1.web-platform.test:8444/web-bundle/resources/wbn/no-cors/";
       const resources = [
         prefix + "resource.cors.js",
         prefix + "resource.no-cors.js",
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.https.tentative.html
similarity index 85%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.https.tentative.html
index 79201154a14..e65c50c9d16 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cors.https.tentative.html
@@ -1,23 +1,18 @@
 <!DOCTYPE html>
 <title>Cross origin WebBundle subresource loading</title>
-<link
-  rel="help"
-  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
-/>
-<link
-  rel="help"
-  href="https://html.spec.whatwg.org/multipage/#cors-settings-attribute"
-/>
+<link rel="help" href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#cors-settings-attribute" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../resources/test-helpers.js"></script>
+
 <body>
   <!--
-       This wpt should run on an origin different from https://web-platform.test:8444/,
+       This wpt should run on an origin different from https://www1.web-platform.test:8444/,
        from where cross-orign WebBundles are served.
 
        This test uses a cross-origin WebBundle,
-       https://web-platform.test:8444/web-bundle/resources/wbn/cors/cross-origin.wbn,
+       https://www1.web-platform.test:8444/web-bundle/resources/wbn/cors/cross-origin.wbn,
        which is served with an Access-Control-Allow-Origin response header.
 
        `cross-origin.wbn` includes two subresources:
@@ -27,7 +22,7 @@
   <script>
     promise_test(async () => {
       const prefix =
-        "https://web-platform.test:8444/web-bundle/resources/wbn/cors/";
+        "https://www1.web-platform.test:8444/web-bundle/resources/wbn/cors/";
       const resources = [
         prefix + "resource.cors.js",
         prefix + "resource.no-cors.js",
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.tentative.sub.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.https.tentative.sub.html
similarity index 92%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.tentative.sub.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.https.tentative.sub.html
index 7b9fa7aee7a..61e073fab7d 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-credential.https.tentative.sub.html
@@ -30,7 +30,7 @@
     // Make sure to set a cookie for a cross-origin domain from where a cross
     // origin bundle is served.
     const setCookiePromise = fetch(
-      "http://{{domains[www2]}}:{{ports[http][0]}}/cookies/resources/set-cookie.py?name=milk&path=/web-bundle/subresource-loading/",
+      "https://{{domains[www1]}}:{{ports[https][0]}}/cookies/resources/set-cookie.py?name=milk&path=/web-bundle/subresource-loading/",
       {
         mode: "no-cors",
         credentials: "include",
@@ -38,7 +38,7 @@
     );
 
     const same_origin_bundle = "./check-cookie-and-return-bundle.py";
-    const cross_origin_bundle = "http://{{domains[www2]}}:{{ports[http][0]}}/web-bundle/subresource-loading/check-cookie-and-return-bundle.py";
+    const cross_origin_bundle = "https://{{domains[www1]}}:{{ports[https][0]}}/web-bundle/subresource-loading/check-cookie-and-return-bundle.py";
 
     promise_test(async () => {
       const link = document.createElement("link");
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.https.tentative.html
similarity index 75%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.https.tentative.html
index 6f38f145bc8..77985fcb51b 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.https.tentative.html
@@ -1,30 +1,27 @@
 <!DOCTYPE html>
 <title>Subresource loading with link rel="webbundle"</title>
-<link
-  rel="help"
-  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
-/>
+<link rel="help" href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+
 <body>
-  <link id="link-web-bundle" rel="webbundle" href="../resources/wbn/subresource.wbn"
-        resources="http://web-platform.test:8001/web-bundle/resources/wbn/root.js
-                   http://web-platform.test:8001/web-bundle/resources/wbn/submodule.js" />
+  <link id="link-web-bundle" rel="webbundle" href="../resources/wbn/subresource.wbn" resources="https://web-platform.test:8444/web-bundle/resources/wbn/root.js
+                   https://web-platform.test:8444/web-bundle/resources/wbn/submodule.js" />
   <script>
     promise_test(async () => {
-      const module = await import('http://web-platform.test:8001/web-bundle/resources/wbn/root.js');
+      const module = await import('https://web-platform.test:8444/web-bundle/resources/wbn/root.js');
       assert_equals(module.result, 'OK');
     }, "Subresource loading with WebBundle");
 
     promise_test(async () => {
-      const response = await fetch('http://web-platform.test:8001/web-bundle/resources/wbn/root.js');
+      const response = await fetch('https://web-platform.test:8444/web-bundle/resources/wbn/root.js');
       const text = await response.text();
       assert_equals(text, "export * from './submodule.js';\n");
     }, "Subresource loading with WebBundle (Fetch API)");
 
     promise_test(t => {
       const url =
-          '/common/redirect.py?location=http://web-platform.test:8001/web-bundle/resources/wbn/root.js';
+        '/common/redirect.py?location=https://web-platform.test:8444/web-bundle/resources/wbn/root.js';
       return promise_rejects_js(t, TypeError, import(url));
     }, "Subresource loading with WebBundle shouldn't affect redirect");
 
@@ -32,35 +29,35 @@
       const link = document.createElement("link");
       link.rel = "webbundle";
       link.href = "../resources/wbn/dynamic1.wbn";
-      link.resources.add('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource1.js',
-                         'http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource2.js',
-                         'http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource4.js');
+      link.resources.add('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource1.js',
+        'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource2.js',
+        'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource4.js');
       document.body.appendChild(link);
 
-      const module = await import('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource1.js');
+      const module = await import('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource1.js');
       assert_equals(module.result, 'resource1 from dynamic1.wbn');
 
       link.href = "../resources/wbn/dynamic2.wbn";
-      const module2 = await import('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource2.js');
+      const module2 = await import('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource2.js');
       assert_equals(module2.result, 'resource2 from dynamic2.wbn');
 
       // A resource not specified in the resources attribute, but in the bundle.
-      const module3 = await import('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource3.js');
+      const module3 = await import('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource3.js');
       assert_equals(module3.result, 'resource3 from network');
 
       document.body.removeChild(link);
-      const module4 = await import('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource4.js');
+      const module4 = await import('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource4.js');
       assert_equals(module4.result, 'resource4 from network');
 
       // Module scripts are stored to the Document's module map once loaded.
       // So import()ing the same module script will reuse the previously loaded
       // script.
-      const module_second = await import('http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/resource1.js');
+      const module_second = await import('https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource1.js');
       assert_equals(module_second.result, 'resource1 from dynamic1.wbn');
     }, 'Dynamically adding / updating / removing "<link rel=webbundle>"');
 
     promise_test(async () => {
-      const classic_script_url = 'http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/classic_script.js';
+      const classic_script_url = 'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/classic_script.js';
       const link = document.createElement("link");
       link.rel = "webbundle";
       link.href = "../resources/wbn/dynamic1.wbn";
@@ -83,8 +80,8 @@
     }, 'Dynamically loading classic script from web bundle with link.resources');
 
     promise_test(async () => {
-      const classic_script_url = 'http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/classic_script.js';
-      const scope = 'http://web-platform.test:8001/web-bundle/resources/wbn/dynamic/';
+      const classic_script_url = 'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/classic_script.js';
+      const scope = 'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/';
       const link = document.createElement("link");
       link.rel = "webbundle";
       link.href = "../resources/wbn/dynamic1.wbn";
@@ -129,7 +126,7 @@
       const link = document.createElement('link');
       link.rel = 'webbundle';
       link.href = '../resources/wbn/dynamic1-crossorigin.wbn';
-      link.resources = 'https://web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource1.js';
+      link.resources = 'https://www1.web-platform.test:8444/web-bundle/resources/wbn/dynamic/resource1.js';
       document.body.appendChild(link);
       const module = await import(link.resources);
       assert_equals(module.result, 'resource1 from network');
@@ -158,11 +155,11 @@
     }, 'Subresource loading with urn:uuid: URL with link.scopes');
 
     promise_test(async () => {
-      const wbn_url = 'http://web-platform.test:8001/web-bundle/resources/wbn/subresource.wbn?test-resources-update';
-      const resource_url = 'http://web-platform.test:8001/web-bundle/resources/wbn/submodule.js';
+      const wbn_url = 'https://web-platform.test:8444/web-bundle/resources/wbn/subresource.wbn?test-resources-update';
+      const resource_url = 'https://web-platform.test:8444/web-bundle/resources/wbn/submodule.js';
       const link = await addLinkAndWaitForLoad(wbn_url);
       link.resources.add(resource_url);
-      const resp = await fetch(resource_url, {cache: 'no-store'});
+      const resp = await fetch(resource_url, { cache: 'no-store' });
       assert_true(resp.ok);
       assert_equals(performance.getEntriesByName(wbn_url).length, 1);
     }, 'Updating resource= attribute should not reload the bundle');
@@ -191,9 +188,9 @@
 
     async function loadScriptAndWaitReport(script_url) {
       const result_promise = new Promise((resolve) => {
-          // This function will be called from script.js
-          window.report_result = resolve;
-        });
+        // This function will be called from script.js
+        window.report_result = resolve;
+      });
 
       const script = document.createElement('script');
       script.src = script_url;
@@ -201,4 +198,4 @@
       return result_promise;
     }
   </script>
-</body>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.https.tentative.html
similarity index 60%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.https.tentative.html
index acca096bfbd..b1b25624e0d 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-nested-bundle.https.tentative.html
@@ -1,32 +1,27 @@
 <!DOCTYPE html>
 <title>A nested bundle is not supported</title>
-<link
-  rel="help"
-  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
-/>
+<link rel="help" href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+
 <body>
-  <link
-    rel="webbundle"
-    href="http://web-platform.test:8001/web-bundle/resources/wbn/nested-main.wbn"
-    resources="http://web-platform.test:8001/web-bundle/resources/wbn/nested-sub.wbn"
-  />
+  <link rel="webbundle" href="https://web-platform.test:8444/web-bundle/resources/wbn/nested-main.wbn"
+    resources="https://web-platform.test:8444/web-bundle/resources/wbn/nested-sub.wbn" />
   <script>
     promise_test(async () => {
       const response = await fetch(
-        "http://web-platform.test:8001/web-bundle/resources/wbn/nested-sub.wbn"
+        "https://web-platform.test:8444/web-bundle/resources/wbn/nested-sub.wbn"
       );
       assert_true(response.ok);
     }, "A nested bundle can be fetched");
 
     promise_test(async () => {
       await addLinkAndWaitForError(
-        "http://web-platform.test:8001/web-bundle/resources/wbn/nested-sub.wbn",
-        "http://web-platform.test:8001/web-bundle/resources/wbn/root.js"
+        "https://web-platform.test:8444/web-bundle/resources/wbn/nested-sub.wbn",
+        "https://web-platform.test:8444/web-bundle/resources/wbn/root.js"
       );
       const response = await fetch(
-        "http://web-platform.test:8001/web-bundle/resources/wbn/root.js"
+        "https://web-platform.test:8444/web-bundle/resources/wbn/root.js"
       );
       assert_false(response.ok);
     }, "Subresources in a nested bundle should not be loaded");
@@ -43,4 +38,4 @@
       });
     }
   </script>
-</body>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.https.tentative.html
similarity index 50%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.https.tentative.html
index 706bfb97b11..f7b50095652 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-path-restriction.https.tentative.html
@@ -10,18 +10,18 @@
   <link
     rel="webbundle"
     href="../resources/wbn/path-restriction.wbn"
-    resources="http://web-platform.test:8001/web-bundle/resources/wbn/resource.js
-                   http://web-platform.test:8001/web-bundle/resources/wbn/sub/resource.js
-                   http://web-platform.test:8001/web-bundle/resources/wbn-resource.js
-                   http://web-platform.test:8001/web-bundle/resources/wbn1/resource.js
-                   http://web-platform.test:8001/web-bundle/resources/other/resource.js
-                   http://web-platform.test:8001/web-bundle/resources/resource.js"
+    resources="https://web-platform.test:8444/web-bundle/resources/wbn/resource.js
+                   https://web-platform.test:8444/web-bundle/resources/wbn/sub/resource.js
+                   https://web-platform.test:8444/web-bundle/resources/wbn-resource.js
+                   https://web-platform.test:8444/web-bundle/resources/wbn1/resource.js
+                   https://web-platform.test:8444/web-bundle/resources/other/resource.js
+                   https://web-platform.test:8444/web-bundle/resources/resource.js"
   />
   <script>
     promise_test(async () => {
       const resources = [
-        "http://web-platform.test:8001/web-bundle/resources/wbn/resource.js",
-        "http://web-platform.test:8001/web-bundle/resources/wbn/sub/resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/wbn/resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/wbn/sub/resource.js",
       ];
       for (const resource of resources) {
         const response = await fetch(resource);
@@ -31,10 +31,10 @@
 
     promise_test(async () => {
       const resources = [
-        "http://web-platform.test:8001/web-bundle/resources/wbn-resource.js",
-        "http://web-platform.test:8001/web-bundle/resources/wbn1/resource.js",
-        "http://web-platform.test:8001/web-bundle/resources/other/resource.js",
-        "http://web-platform.test:8001/web-bundle/resources/resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/wbn-resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/wbn1/resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/other/resource.js",
+        "https://web-platform.test:8444/web-bundle/resources/resource.js",
       ];
       for (const resource of resources) {
         const response = await fetch(resource);
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-request-destination.https.tentative.sub.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-request-destination.https.tentative.sub.html
new file mode 100644
index 00000000000..3d494241246
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-request-destination.https.tentative.sub.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>Request's destination must be "webbundle" with the link-based API</title>
+<link
+  rel="help"
+  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helpers.js"></script>
+<body>
+  <script>
+    // check-sec-fetch-dest-header-and-return-bundle.py returns a valid format
+    // bundle only if a "Sec-Fetch-Dest: webbundle" header is present in a request.
+    // Otherwise, returns an empty body with 400 status code.
+    //
+    // In this wpt, we assume that a <link> element fires a load event correctly if
+    // a valid format webbundle is returned.
+
+    const same_origin_bundle =
+      "../resources/check-sec-fetch-dest-header-and-return-bundle.py";
+    const cross_origin_bundle =
+      "https://{{domains[www1]}}:{{ports[https][0]}}/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py";
+
+    promise_test(async () => {
+      for (const bundle of [same_origin_bundle, cross_origin_bundle]) {
+        const link = document.createElement("link");
+        link.rel = "webbundle";
+        link.href = bundle;
+        await addElementAndWaitForLoad(link);
+        link.remove();
+      }
+    }, '"Sec-Fetch-Dest: webbundle" header must be present in a request for a bundle with the <link>-based API.');
+
+    promise_test(async () => {
+      const res = await fetch(same_origin_bundle);
+      assert_false(res.ok);
+    }, '"Sec-Fetch-Dest: webbundle" header must not be present in a fetch request for a same-origin resource.');
+
+    promise_test(async () => {
+      const res = await fetch(cross_origin_bundle);
+      assert_false(res.ok);
+    }, '"Sec-Fetch-Dest: webbundle" header must not be present in a fetch request for a cross-origin resource.');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.https.tentative.html
similarity index 78%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.https.tentative.html
index 338782697d2..d0a60a2f121 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element-with-base.https.tentative.html
@@ -12,11 +12,11 @@
   rel="webbundle"
   href="../static-element.wbn"
   resources="
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/script.js
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style.css
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css"
-  scopes="http://web-platform.test:8001/web-bundle/resources/wbn/static-element/scopes/"
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/script.js
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style.css
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css"
+  scopes="https://web-platform.test:8444/web-bundle/resources/wbn/static-element/scopes/"
 />
   <style type="text/css">
     @import 'resources/style-imported-from-tag.css';
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.https.tentative.html
similarity index 80%
rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.tentative.html
rename to tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.https.tentative.html
index d8d60a93081..25a9f00faba 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-static-element.https.tentative.html
@@ -11,11 +11,11 @@
   rel="webbundle"
   href="../resources/wbn/static-element.wbn"
   resources="
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/script.js
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style.css
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css
-  http://web-platform.test:8001/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css"
-  scopes="http://web-platform.test:8001/web-bundle/resources/wbn/static-element/scopes/"
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/script.js
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style.css
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css
+  https://web-platform.test:8444/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css"
+  scopes="https://web-platform.test:8444/web-bundle/resources/wbn/static-element/scopes/"
 />
   <style type="text/css">
     @import '../resources/wbn/static-element/resources/style-imported-from-tag.css';
diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js b/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
index 322a7d4077e..4656ff03101 100644
--- a/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
+++ b/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
@@ -199,10 +199,10 @@ promise_test(async t => {
       // a |config| in it.
       output_count++;
       if (output_count == 1) {
-        assert_not_equals(config, null);
+        assert_equals(typeof config, "object");
         decoder_config = config;
       } else {
-        assert_equals(config, null);
+        assert_equals(config, undefined);
       }
     }
   };
diff --git a/tests/wpt/web-platform-tests/webrtc-stats/supported-stats.html b/tests/wpt/web-platform-tests/webrtc-stats/supported-stats.html
new file mode 100644
index 00000000000..fd08a16b11e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-stats/supported-stats.html
@@ -0,0 +1,151 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>Support for all stats defined in WebRTC Stats</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="../webrtc/dictionary-helper.js"></script>
+<script src="../webrtc/RTCStats-helper.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script>
+'use strict';
+
+// inspired from similar test for MTI stats in ../webrtc/RTCPeerConnection-mandatory-getStats.https.html
+
+
+
+// From https://w3c.github.io/webrtc-stats/webrtc-stats.html#rtcstatstype-str*
+
+const dictionaryNames = {
+  "codec": "RTCCodecStats",
+  "inbound-rtp": "RTCInboundRtpStreamStats",
+  "outbound-rtp": "RTCOutboundRtpStreamStats",
+  "remote-inbound-rtp": "RTCRemoteInboundRtpStreamStats",
+  "remote-outbound-rtp": "RTCRemoteOutboundRtpStreamStats",
+  "csrc": "RTCRtpContributingSourceStats",
+  "peer-connection": "RTCPeerConnectionStats",
+  "data-channel": "RTCDataChannelStats",
+  "media-source": {
+    audio: "RTCAudioSourceStats",
+    video: "RTCVideoSourceStats"
+  },
+  "sender": {
+    audio: "RTCAudioSenderStats",
+    video: "RTCVideoSenderStats"
+  },
+  "receiver": {
+    audio: "RTCAudioReceiverStats",
+    video: "RTCVideoReceiverStats",
+  },
+  "transport": "RTCTransportStats",
+  "candidate-pair": "RTCIceCandidatePairStats",
+  "local-candidate": "RTCIceCandidateStats",
+  "remote-candidate": "RTCIceCandidateStats",
+  "certificate": "RTCCertificateStats",
+};
+
+
+async function getAllStats(t, pc) {
+  // Try to obtain as many stats as possible, waiting up to 20 seconds for
+  // roundTripTime which can take several RTCP messages to calculate.
+  let stats;
+  for (let i = 0; i < 20; i++) {
+    stats = await pc.getStats();
+    const values = [...stats.values()];
+    const [audio, video] = ["audio", "video"].map(kind =>
+      values.find(s => s.type == "remote-inbound-rtp" && s.kind == kind));
+    if (audio && "roundTripTime" in audio &&
+        video && "roundTripTime" in video) {
+      return stats;
+    }
+    await new Promise(r => t.step_timeout(r, 1000));
+  }
+  return stats;
+}
+
+
+  promise_test(async t => {
+    // load the IDL to know which members to be looking for
+
+    const idl = await fetch("/interfaces/webrtc-stats.idl").then(r => r.text());
+    // for RTCStats definition
+    const webrtcIdl = await fetch("/interfaces/webrtc.idl").then(r => r.text());
+    const astArray = WebIDL2.parse(idl + webrtcIdl);
+
+    let all = {};
+    for (let type in dictionaryNames) {
+        // TODO: make use of audio/video distinction
+      let dictionaries = dictionaryNames[type].audio ? Object.values(dictionaryNames[type]) : [dictionaryNames[type]];
+      all[type] = [];
+      let i = 0;
+      // Recursively collect members from inherited dictionaries
+      while (i < dictionaries.length) {
+        const dictName = dictionaries[i];
+        const dict = astArray.find(i => i.name === dictName && i.type === "dictionary");
+        if (dict && dict.members) {
+          all[type] = all[type].concat(dict.members.map(m => m.name));
+          if (dict.inheritance) {
+            dictionaries.push(dict.inheritance);
+          }
+        }
+        i++;
+      }
+      // Unique-ify
+      all[type] = [...new Set(all[type])];
+    }
+
+
+  const remaining = JSON.parse(JSON.stringify(all));
+    for (const type in remaining) {
+      remaining[type] = new Set(remaining[type]);
+    }
+
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  const dc1 = pc1.createDataChannel("dummy", {negotiated: true, id: 0});
+  const dc2 = pc2.createDataChannel("dummy", {negotiated: true, id: 0});
+
+  const stream = await getNoiseStream({video: true, audio:true});
+  for (const track of stream.getTracks()) {
+    pc1.addTrack(track, stream);
+    pc2.addTrack(track, stream);
+    t.add_cleanup(() => track.stop());
+  }
+  exchangeIceCandidates(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
+  const stats = await getAllStats(t, pc1);
+
+  // The focus of this test is not API correctness, but rather to provide an
+  // accessible metric of implementation progress by dictionary member. We count
+  // whether we've seen each dictionary's members in getStats().
+
+  test(t => {
+    for (const stat of stats.values()) {
+      if (all[stat.type]) {
+        const memberNames = all[stat.type];
+        const remainingNames = remaining[stat.type];
+        assert_true(memberNames.length > 0, "Test error. No member found.");
+        for (const memberName of memberNames) {
+          if (memberName in stat) {
+            assert_not_equals(stat[memberName], undefined, "Not undefined");
+            remainingNames.delete(memberName);
+          }
+        }
+      }
+    }
+  }, "Validating stats");
+
+  for (const type in all) {
+    for (const memberName of all[type]) {
+      test(t => {
+        assert_true(!remaining[type].has(memberName),
+                    `Is ${memberName} present`);
+      }, `${type}'s ${memberName}`);
+    }
+  }
+}, 'getStats succeeds');
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html b/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html
index 33d49677c49..ca49fcc95f2 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html
@@ -93,22 +93,8 @@ promise_test(async t => {
   t.add_cleanup(() => pc1.close());
   t.add_cleanup(() => pc2.close());
 
-  pc1.onicecandidate = e => {
-    if (e.candidate) {
-      pc2.addIceCandidate({
-        candidate: e.candidate.candidate,
-        sdpMid: e.candidate.sdpMid
-      });
-    }
-  }
-  pc2.onicecandidate = e => {
-    if (e.candidate) {
-      pc1.addIceCandidate({
-        candidate: e.candidate.candidate,
-        sdpMid: e.candidate.sdpMid
-      });
-    }
-  }
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+  pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
 
   pc1.addTransceiver("video");
   pc1.addTransceiver("audio");
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html
index 11fc4e4fa0c..d2cde593640 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html
@@ -35,16 +35,8 @@ promise_test(async t => {
 
   let candidates1to2 = [];
   let candidates2to1 = [];
-  pc1.onicecandidate = event => {
-    if (event.candidate) {
-      candidates1to2.push(event.candidate);
-    }
-  }
-  pc2.onicecandidate = event => {
-    if (event.candidate) {
-      candidates2to1.push(event.candidate);
-    }
-  }
+  pc1.onicecandidate = e => candidates1to2.push(e.candidate);
+  pc2.onicecandidate = e => candidates2to1.push(e.candidate);
   const pc2GatheredCandidates = new Promise((resolve) => {
     pc2.addEventListener('icegatheringstatechange', () => {
       if (pc2.iceGatheringState == 'complete') {
@@ -74,16 +66,8 @@ promise_test(async t => {
 
   let candidates1to2 = [];
   let candidates2to1 = [];
-  pc1.onicecandidate = event => {
-    if (event.candidate) {
-      candidates1to2.push(event.candidate);
-    }
-  }
-  pc2.onicecandidate = event => {
-    if (event.candidate) {
-      candidates2to1.push(event.candidate);
-    }
-  }
+  pc1.onicecandidate = e => candidates1to2.push(e.candidate);
+  pc2.onicecandidate = e => candidates2to1.push(e.candidate);
   const pc1GatheredCandidates = new Promise((resolve) => {
     pc1.addEventListener('icegatheringstatechange', () => {
       if (pc1.iceGatheringState == 'complete') {
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index cdfe63e792c..1521277418f 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -176,11 +176,9 @@ function exchangeIceCandidates(pc1, pc2) {
     localPc.addEventListener('icecandidate', event => {
       const { candidate } = event;
 
-      // candidate may be null to indicate end of candidate gathering.
-      // There is ongoing discussion on w3c/webrtc-pc#1213
-      // that there should be an empty candidate string event
-      // for end of candidate for each m= section.
-      if(candidate && remotePc.signalingState !== 'closed') {
+      // Guard against already closed peerconnection to
+      // avoid unrelated exceptions.
+      if (remotePc.signalingState !== 'closed') {
         remotePc.addIceCandidate(candidate);
       }
     });
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html
index 320b03dfc80..5083be6cdfd 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html
@@ -320,15 +320,11 @@ promise_test(async t => {
   t.add_cleanup(() => pc1.close());
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
-  pc1.onicecandidate = async e => {
-    if (e.candidate) {
-      await pc2.addIceCandidate(e.candidate);
-    }
-  };
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
   pc1.candidateBuffer = [];
   pc2.onicecandidate = e => {
     // Don't add candidate if candidate buffer is already used
-    if (e.candidate && pc1.candidateBuffer) {
+    if (pc1.candidateBuffer) {
       pc1.candidateBuffer.push(e.candidate)
     }
   };
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html
index dc5e1674576..0e4ecf64c85 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html
@@ -153,22 +153,8 @@ for (const negotiator of negotiators) {
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    pc1.onicecandidate = e => {
-      if (e.candidate) {
-        pc2.addIceCandidate({
-          candidate: e.candidate.candidate,
-          sdpMid: e.candidate.sdpMid
-        });
-      }
-    }
-    pc2.onicecandidate = e => {
-      if (e.candidate) {
-        pc1.addIceCandidate({
-          candidate: e.candidate.candidate,
-          sdpMid: e.candidate.sdpMid
-        });
-      }
-    }
+    pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+    pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
 
     // See the explanation below about Chrome's onnegotiationneeded firing
     // too early.
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
index c9dce45d738..77323b503ab 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
@@ -92,12 +92,10 @@
 
   const trickle = (t, pc1, pc2) => {
     pc1.onicecandidate = t.step_func(async e => {
-      if (e.candidate) {
-        try {
-          await pc2.addIceCandidate(e.candidate);
-        } catch (e) {
-          assert_true(false, "addIceCandidate threw error: " + e.name);
-        }
+      try {
+        await pc2.addIceCandidate(e.candidate);
+      } catch (e) {
+        assert_true(false, "addIceCandidate threw error: " + e.name);
       }
     });
   };
diff --git a/tests/wpt/web-platform-tests/webrtc/datachannel-emptystring.html b/tests/wpt/web-platform-tests/webrtc/datachannel-emptystring.html
index 456bac7367e..a9741c143f5 100644
--- a/tests/wpt/web-platform-tests/webrtc/datachannel-emptystring.html
+++ b/tests/wpt/web-platform-tests/webrtc/datachannel-emptystring.html
@@ -60,18 +60,10 @@ and ensures that an empty string sent by one is received by the second.
     }
   });
 
-  function exchangeIce(pc) {
-     return function(e) {
-       if (e.candidate) {
-          pc.addIceCandidate(e.candidate);
-       }
-     };
-  }
-
   function exchangeDescription(pc1, pc2) {
-     return function() {
-       return pc1.setRemoteDescription(pc2.localDescription);
-     };
+    return function() {
+      return pc1.setRemoteDescription(pc2.localDescription);
+    };
   }
 
   test.step(function() {
@@ -81,8 +73,8 @@ and ensures that an empty string sent by one is received by the second.
     gSecondConnection = new RTCPeerConnection(null);
     test.add_cleanup(() => gSecondConnection.close());
 
-    gFirstConnection.onicecandidate = exchangeIce(gSecondConnection);
-    gSecondConnection.onicecandidate = exchangeIce(gFirstConnection);
+    gFirstConnection.onicecandidate = e => gSecondConnection.addIceCandidate(e.candidate);
+    gSecondConnection.onicecandidate = e => gFirstConnection.addIceCandidate(e.candidate);
 
     gSecondConnection.ondatachannel = onReceiveChannel;
 
diff --git a/tests/wpt/web-platform-tests/webrtc/getstats.html b/tests/wpt/web-platform-tests/webrtc/getstats.html
index 0950a374c3c..d6a692bb786 100644
--- a/tests/wpt/web-platform-tests/webrtc/getstats.html
+++ b/tests/wpt/web-platform-tests/webrtc/getstats.html
@@ -27,16 +27,11 @@ This test uses data only, and thus does not require fake media devices.
   var gSecondConnection = null;
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var getStatsRecordByType = function(stats, type) {
diff --git a/tests/wpt/web-platform-tests/webrtc/no-media-call.html b/tests/wpt/web-platform-tests/webrtc/no-media-call.html
index b1eba08d0b4..9d2598518da 100644
--- a/tests/wpt/web-platform-tests/webrtc/no-media-call.html
+++ b/tests/wpt/web-platform-tests/webrtc/no-media-call.html
@@ -58,16 +58,11 @@
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onIceConnectionStateChange = test.step_func(function(event) {
diff --git a/tests/wpt/web-platform-tests/webrtc/promises-call.html b/tests/wpt/web-platform-tests/webrtc/promises-call.html
index 8b9a2755497..ee64b463ee2 100644
--- a/tests/wpt/web-platform-tests/webrtc/promises-call.html
+++ b/tests/wpt/web-platform-tests/webrtc/promises-call.html
@@ -24,16 +24,11 @@ This test uses data only, and thus does not require fake media devices.
   var gSecondConnection = null;
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onIceConnectionStateChange = test.step_func(function(event) {
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html b/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
index 5eb8329517f..3fc3bda2a52 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
@@ -38,16 +38,22 @@ promise_test(async t => {
     if (e.candidate) {
       const target = e.candidate.sdpMLineIndex === 0 ? calleeAudio : calleeVideo;
       target.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
+    } else {
+      calleeAudio.addIceCandidate();
+      calleeVideo.addIceCandidate();
     }
   });
   calleeAudio.addEventListener('icecandidate', (e) => {
     if (e.candidate) {
       caller.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
     }
+    // Note: caller.addIceCandidate is only called for video to avoid calling it twice.
   });
   calleeVideo.addEventListener('icecandidate', (e) => {
     if (e.candidate) {
       caller.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
+    } else {
+      caller.addIceCandidate();
     }
   });
 
diff --git a/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html b/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
index 5160451f012..f2e20846234 100644
--- a/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
@@ -88,16 +88,11 @@
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onRemoteTrack = test.step_func(function(event) {
diff --git a/tests/wpt/web-platform-tests/webrtc/simplecall.https.html b/tests/wpt/web-platform-tests/webrtc/simplecall.https.html
index ffe043b6a23..dbf6b9a5083 100644
--- a/tests/wpt/web-platform-tests/webrtc/simplecall.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/simplecall.https.html
@@ -79,16 +79,11 @@
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onRemoteTrack = test.step_func(function(event) {
diff --git a/tests/wpt/web-platform-tests/workers/examples/general.any.js b/tests/wpt/web-platform-tests/workers/examples/general.any.js
index 8906350a7e8..cb5d61eafbe 100644
--- a/tests/wpt/web-platform-tests/workers/examples/general.any.js
+++ b/tests/wpt/web-platform-tests/workers/examples/general.any.js
@@ -7,7 +7,7 @@
 
 // testharness.js is imported (via importScripts()) by generated glue code by
 // WPT server.
-// See AnyWorkerHandler in
+// See ClassicWorkerHandler in
 // https://github.com/web-platform-tests/wpt/blob/master/tools/serve/serve.py.
 
 // ============================================================================
@@ -30,5 +30,5 @@ test(() => {
 
 // done() is NOT needed in .any.js tests, as it is called by generated
 // glue code by the WPT server.
-// See AnyWorkerHandler in
+// See ClassicWorkerHandler in
 // https://github.com/web-platform-tests/wpt/blob/master/tools/serve/serve.py.
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py b/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py
index 6cca411e8a8..90143419153 100644
--- a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py
@@ -1,3 +1,5 @@
+import datetime
+
 def main(request, response):
     # This script serves both preflight and main GET request for cross-origin
     # static imports from module service workers.
@@ -7,5 +9,7 @@ def main(request, response):
     response_headers = [(b"Content-Type", b"text/javascript"),
                         (b"Access-Control-Allow-Origin", b"*"),
                         (b"Access-Control-Allow-Headers", b"Service-Worker")]
-    return (200, response_headers,
-            b"export const importedModules = ['export-on-load-script.js'];")
+
+    body = b"export const importedModules = ['export-on-load-script.js'];"
+    body += b"// %d" % datetime.datetime.now().timestamp()
+    return (200, response_headers, body)