diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/font-feature-resolution-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/font-feature-resolution-002.html.ini
new file mode 100644
index 00000000000..73995bcdf16
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/font-feature-resolution-002.html.ini
@@ -0,0 +1,2 @@
+[font-feature-resolution-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index a19f427ef6e..35c0730f5a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,3 +17,6 @@
   [test some point of the element: top left corner]
     expected: FAIL
 
+  [test the top of layer]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    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
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/custom-elements/state.tentative/ElementInternals-states.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini
similarity index 100%
rename from tests/wpt/metadata/custom-elements/state.tentative/ElementInternals-states.html.ini
rename to tests/wpt/metadata-layout-2020/custom-elements/state/tentative/ElementInternals-states.html.ini
diff --git a/tests/wpt/metadata/custom-elements/state.tentative/state-pseudo-class.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/state/tentative/state-pseudo-class.html.ini
similarity index 100%
rename from tests/wpt/metadata/custom-elements/state.tentative/state-pseudo-class.html.ini
rename to tests/wpt/metadata-layout-2020/custom-elements/state/tentative/state-pseudo-class.html.ini
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 c1f908d271a..a3f0e3742dd 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
@@ -312,18 +312,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" 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 5c001592859..b2ffc8abf78 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
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 58de838d890..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    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_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.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
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 8e2b6af33d8..9a85a905394 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,7 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index daa518bd0e3..4df5d7a35de 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     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 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 0407f0cc2b7..9eb581fcf1f 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: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..7a36937927c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    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 8752f7c4838..ff64dd590a7 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,8 +1,13 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
+
+  [Check that rel=noopener with target=_top does a normal load]
+    expected: FAIL
+
+  [Check that rel=noopener with target=_parent does a normal load]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
new file mode 100644
index 00000000000..6cf9d13975c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
@@ -0,0 +1,4 @@
+[iframe_005.html]
+  [document.write external script into iframe write back into parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/websockets/stream.tentative/abort.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
similarity index 100%
rename from tests/wpt/metadata/websockets/stream.tentative/abort.any.js.ini
rename to tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
index 2cec1ea38ed..d524c0dedb7 100644
--- a/tests/wpt/metadata/websockets/stream.tentative/abort.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
@@ -4,17 +4,6 @@
 [abort.any.sharedworker.html]
   expected: ERROR
 
-[abort.any.worker.html]
-  [abort after connect should do nothing]
-    expected: FAIL
-
-  [abort during handshake should work]
-    expected: FAIL
-
-  [abort before constructing should prevent connection]
-    expected: FAIL
-
-
 [abort.any.html]
   [abort after connect should do nothing]
     expected: FAIL
@@ -25,3 +14,14 @@
   [abort before constructing should prevent connection]
     expected: FAIL
 
+
+[abort.any.worker.html]
+  [abort after connect should do nothing]
+    expected: FAIL
+
+  [abort during handshake should work]
+    expected: FAIL
+
+  [abort before constructing should prevent connection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/stream.tentative/backpressure-receive.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-receive.any.js.ini
similarity index 100%
rename from tests/wpt/metadata/websockets/stream.tentative/backpressure-receive.any.js.ini
rename to tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-receive.any.js.ini
index 46cfd07ce47..43e567db7b2 100644
--- a/tests/wpt/metadata/websockets/stream.tentative/backpressure-receive.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-receive.any.js.ini
@@ -1,15 +1,15 @@
-[backpressure-receive.any.html]
-  [backpressure should be applied to received messages]
-    expected: FAIL
-
-
 [backpressure-receive.any.worker.html]
   [backpressure should be applied to received messages]
     expected: FAIL
 
 
+[backpressure-receive.any.sharedworker.html]
+  expected: ERROR
+
 [backpressure-receive.any.serviceworker.html]
   expected: ERROR
 
-[backpressure-receive.any.sharedworker.html]
-  expected: ERROR
+[backpressure-receive.any.html]
+  [backpressure should be applied to received messages]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/stream.tentative/backpressure-send.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-send.any.js.ini
similarity index 100%
rename from tests/wpt/metadata/websockets/stream.tentative/backpressure-send.any.js.ini
rename to tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-send.any.js.ini
index ca5fb144f2f..1329f935b0a 100644
--- a/tests/wpt/metadata/websockets/stream.tentative/backpressure-send.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/backpressure-send.any.js.ini
@@ -1,7 +1,4 @@
-[backpressure-send.any.sharedworker.html]
-  expected: ERROR
-
-[backpressure-send.any.html]
+[backpressure-send.any.worker.html]
   [backpressure should be applied to sent messages]
     expected: FAIL
 
@@ -9,7 +6,10 @@
 [backpressure-send.any.serviceworker.html]
   expected: ERROR
 
-[backpressure-send.any.worker.html]
+[backpressure-send.any.html]
   [backpressure should be applied to sent messages]
     expected: FAIL
 
+
+[backpressure-send.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/websockets/stream.tentative/close.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/close.any.js.ini
similarity index 100%
rename from tests/wpt/metadata/websockets/stream.tentative/close.any.js.ini
rename to tests/wpt/metadata-layout-2020/websockets/stream/tentative/close.any.js.ini
index 12e27b9bea6..553ea71142e 100644
--- a/tests/wpt/metadata/websockets/stream.tentative/close.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/close.any.js.ini
@@ -1,6 +1,3 @@
-[close.any.sharedworker.html]
-  expected: ERROR
-
 [close.any.worker.html]
   [unspecified close code with non-empty reason should set code to 1000]
     expected: FAIL
@@ -87,7 +84,7 @@
     expected: FAIL
 
 
-[close.any.serviceworker.html]
+[close.any.sharedworker.html]
   expected: ERROR
 
 [close.any.html]
@@ -175,3 +172,6 @@
   [unspecified close code should send empty Close frame]
     expected: FAIL
 
+
+[close.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/websockets/stream.tentative/constructor.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/constructor.any.js.ini
similarity index 100%
rename from tests/wpt/metadata/websockets/stream.tentative/constructor.any.js.ini
rename to tests/wpt/metadata-layout-2020/websockets/stream/tentative/constructor.any.js.ini
index 3c8b5e88d05..2af2fb5beb9 100644
--- a/tests/wpt/metadata/websockets/stream.tentative/constructor.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/constructor.any.js.ini
@@ -1,5 +1,28 @@
-[constructor.any.serviceworker.html]
-  expected: ERROR
+[constructor.any.worker.html]
+  [constructing with a valid URL should work]
+    expected: FAIL
+
+  [setting a protocol in the constructor should work]
+    expected: FAIL
+
+  [wss.connection should resolve to the right types]
+    expected: FAIL
+
+  [constructing with no URL should throw]
+    expected: FAIL
+
+  [constructing with invalid options should throw]
+    expected: FAIL
+
+  [connection failure should reject the promises]
+    expected: FAIL
+
+  [protocols should be required to be a list]
+    expected: FAIL
+
+  [constructing with an invalid URL should throw]
+    expected: FAIL
+
 
 [constructor.any.sharedworker.html]
   expected: ERROR
@@ -30,28 +53,5 @@
     expected: FAIL
 
 
-[constructor.any.worker.html]
-  [constructing with a valid URL should work]
-    expected: FAIL
-
-  [setting a protocol in the constructor should work]
-    expected: FAIL
-
-  [wss.connection should resolve to the right types]
-    expected: FAIL
-
-  [constructing with no URL should throw]
-    expected: FAIL
-
-  [constructing with invalid options should throw]
-    expected: FAIL
-
-  [connection failure should reject the promises]
-    expected: FAIL
-
-  [protocols should be required to be a list]
-    expected: FAIL
-
-  [constructing with an invalid URL should throw]
-    expected: FAIL
-
+[constructor.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 27d63d848b5..e4dd8e1a26b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -17516,7 +17516,7 @@
      ]
     ],
     "showSaveFilePicker-manual.https.html": [
-     "022f67771d7f17d5b0e9ef0186887224f18f4e51",
+     "451a0fb9c7ff3cc3e2bd1aba92c8d8412f9cb0b6",
      [
       null,
       {}
@@ -140320,7 +140320,7 @@
       ]
      ],
      "font-feature-resolution-001.html": [
-      "6d066176622b2880d6fc1c026cf5784770d5da2d",
+      "45f316af5c9c90e460cd11965e19f2f04a1b5b4e",
       [
        null,
        [
@@ -140332,6 +140332,19 @@
        {}
       ]
      ],
+     "font-feature-resolution-002.html": [
+      "05cc4db7464853c35548a924ea7c132e31b56f52",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-feature-resolution-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-feature-settings-descriptor-01.html": [
       "8f7c50661a7ae62af5707f02c50bfbe5067e0bcc",
       [
@@ -147269,605 +147282,607 @@
        ]
       ]
      },
-     "masonry.tentative": {
-      "masonry-align-content-001.html": [
-       "dfefd998c65c8a071faeef0991f8b9bfe9132a60",
-       [
-        null,
+     "masonry": {
+      "tentative": {
+       "masonry-align-content-001.html": [
+        "dfefd998c65c8a071faeef0991f8b9bfe9132a60",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-content-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-content-002.html": [
-       "75b82654fea45cf8460abbdd0c0b7df8ed8b2afe",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-content-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-content-002.html": [
+        "75b82654fea45cf8460abbdd0c0b7df8ed8b2afe",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-content-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-content-003.html": [
-       "ae58e79cb2b4752e08f01e3548705cdf3af1e554",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-content-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-content-003.html": [
+        "ae58e79cb2b4752e08f01e3548705cdf3af1e554",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-content-003-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-content-004.html": [
-       "3f07aa1fe75b5f0a0e62e559f1d878052ebd31b3",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-content-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-content-004.html": [
+        "3f07aa1fe75b5f0a0e62e559f1d878052ebd31b3",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-content-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-tracks-001.html": [
-       "4ff3e61087597bee960e30d245bf3aae255cec72",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-content-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-tracks-001.html": [
+        "4ff3e61087597bee960e30d245bf3aae255cec72",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-tracks-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-tracks-multi-001.html": [
-       "2dcdfe4b4bef33806f29a1a70b64037ee167f2c7",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-tracks-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-tracks-multi-001.html": [
+        "2dcdfe4b4bef33806f29a1a70b64037ee167f2c7",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-tracks-multi-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-tracks-stretch-001.html": [
-       "d2fede7a8edcd0ddec450baa2961d767ba89a81a",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-tracks-stretch-001.html": [
+        "d2fede7a8edcd0ddec450baa2961d767ba89a81a",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-align-tracks-stretch-002.html": [
-       "1631ac3c07d3f97c30ebcad6f16f9b3cd29cd4d4",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-align-tracks-stretch-002.html": [
+        "1631ac3c07d3f97c30ebcad6f16f9b3cd29cd4d4",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-001.html": [
-       "69182c5425e80f91f883d8c670ff2fe4394ccadc",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-001.html": [
+        "69182c5425e80f91f883d8c670ff2fe4394ccadc",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-002.html": [
-       "01c4de00b56af8a3c4c082244934ff0aafd5a410",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-002.html": [
+        "01c4de00b56af8a3c4c082244934ff0aafd5a410",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-003.html": [
-       "fe150e7f8382f9f0cb151400cdc3e9aa0b0846f3",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-003.html": [
+        "fe150e7f8382f9f0cb151400cdc3e9aa0b0846f3",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-003-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-004.html": [
-       "ddfc1bb331f788833e5a4e7c003fc0d4b130a984",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-004.html": [
+        "ddfc1bb331f788833e5a4e7c003fc0d4b130a984",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-005.html": [
-       "8315b8f2b557cc56459acffc682099cc5d10a447",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-005.html": [
+        "8315b8f2b557cc56459acffc682099cc5d10a447",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-005-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-fragmentation-006.html": [
-       "9dab0ddc9b6b3c73a7c5727b56a8890a4c9a41e5",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-fragmentation-006.html": [
+        "9dab0ddc9b6b3c73a7c5727b56a8890a4c9a41e5",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-fragmentation-006-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-gap-001.html": [
-       "17873d1e96c3f996bc6dcaaa08eb41325acbaa7a",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-fragmentation-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-gap-001.html": [
+        "17873d1e96c3f996bc6dcaaa08eb41325acbaa7a",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-gap-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-item-content-baseline-001.html": [
-       "60d11653b3f231a07ad7aa493a0effeae7720671",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-gap-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-item-content-baseline-001.html": [
+        "60d11653b3f231a07ad7aa493a0effeae7720671",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-item-content-baseline-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-item-self-baseline-001.html": [
-       "bb486d983d966476f24d142675c77f7907300705",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-item-content-baseline-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-item-self-baseline-001.html": [
+        "bb486d983d966476f24d142675c77f7907300705",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-item-self-baseline-002a.html": [
-       "f89217c68e04fc2e20b680bec4705f8c8a961fba",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-item-self-baseline-002a.html": [
+        "f89217c68e04fc2e20b680bec4705f8c8a961fba",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002a-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-item-self-baseline-002b.html": [
-       "eae435707d2298c7ca9d5baa507c020f5288c9ab",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002a-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-item-self-baseline-002b.html": [
+        "eae435707d2298c7ca9d5baa507c020f5288c9ab",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002b-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-placement-named-lines-001.html": [
-       "b6745f6973b4c0dfd180b778df5d73ef3ca853e3",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002b-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-placement-named-lines-001.html": [
+        "b6745f6973b4c0dfd180b778df5d73ef3ca853e3",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-grid-placement-named-lines-002.html": [
-       "0ad0dfcea370dd12f0ebf61c5675552f93b6ce6b",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-grid-placement-named-lines-002.html": [
+        "0ad0dfcea370dd12f0ebf61c5675552f93b6ce6b",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-001.html": [
-       "0f6cdb14954214e81931aa2a5cf80873dc589d84",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-001.html": [
+        "0f6cdb14954214e81931aa2a5cf80873dc589d84",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-002.html": [
-       "db83299bf5061f0c7209089facdfef277f129a5c",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-002.html": [
+        "db83299bf5061f0c7209089facdfef277f129a5c",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-003.html": [
-       "e43bc86c9b9571f362e37572be57f0b019ccbfb8",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-003.html": [
+        "e43bc86c9b9571f362e37572be57f0b019ccbfb8",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-003-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-004.html": [
-       "5365208c00f8220ae6427920eae846c0986cbec7",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-004.html": [
+        "5365208c00f8220ae6427920eae846c0986cbec7",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-005.html": [
-       "cf9b680869f58373a24a87e105dd518c9bb2ef13",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-005.html": [
+        "cf9b680869f58373a24a87e105dd518c9bb2ef13",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-005-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-intrinsic-sizing-006.html": [
-       "49fd53bb79b1e97c011c61db7aeb863067db0a01",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-intrinsic-sizing-006.html": [
+        "49fd53bb79b1e97c011c61db7aeb863067db0a01",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-006-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-001.html": [
-       "2f8cfbfacc21aade2e06f858f83abb0af468d7bf",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-001.html": [
+        "2f8cfbfacc21aade2e06f858f83abb0af468d7bf",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-002.html": [
-       "5f7083b173331f1e4593d4d97cc0513039606316",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-002.html": [
+        "5f7083b173331f1e4593d4d97cc0513039606316",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-003.html": [
-       "4d490c18d5d1d79f960e82ded542e1de5bccadc6",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-003.html": [
+        "4d490c18d5d1d79f960e82ded542e1de5bccadc6",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-003-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-004.html": [
-       "4d1a454a8654648d01dd7ab336514d6a935ab6d5",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-004.html": [
+        "4d1a454a8654648d01dd7ab336514d6a935ab6d5",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-005.html": [
-       "ddfbc9e54e40d3ae5650a598150a5ead5027fd65",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-005.html": [
+        "ddfbc9e54e40d3ae5650a598150a5ead5027fd65",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-005-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-006.html": [
-       "0082d72df26258ec61c988c7d9e46463a10f5a8f",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-006.html": [
+        "0082d72df26258ec61c988c7d9e46463a10f5a8f",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-006-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-item-placement-007.html": [
-       "67a02560f45f314bb6843cd8b5e5b046aa8da695",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-item-placement-007.html": [
+        "67a02560f45f314bb6843cd8b5e5b046aa8da695",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-item-placement-007-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-content-001.html": [
-       "3d60ac19feb130bf2d1690786c968fb72cac2cf6",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-item-placement-007-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-content-001.html": [
+        "3d60ac19feb130bf2d1690786c968fb72cac2cf6",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-content-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-content-002.html": [
-       "b1db084d4e7042fa7c641a2c91a1484f38f0e877",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-content-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-content-002.html": [
+        "b1db084d4e7042fa7c641a2c91a1484f38f0e877",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-content-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-content-003.html": [
-       "772984b9e0dac31e12ee7a8859ba9b79c8471875",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-content-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-content-003.html": [
+        "772984b9e0dac31e12ee7a8859ba9b79c8471875",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-content-003-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-content-004.html": [
-       "7d04ffeb4b26acd9d74f9e1c8f7c9504e2a27a81",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-content-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-content-004.html": [
+        "7d04ffeb4b26acd9d74f9e1c8f7c9504e2a27a81",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-content-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-tracks-001.html": [
-       "bfd3c1ca587bb0bdb534a281824f158dace0c04c",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-content-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-tracks-001.html": [
+        "bfd3c1ca587bb0bdb534a281824f158dace0c04c",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-tracks-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-tracks-multi-001.html": [
-       "22a4199642666e76bb716a8894e1e30faf58d716",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-tracks-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-tracks-multi-001.html": [
+        "22a4199642666e76bb716a8894e1e30faf58d716",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-tracks-multi-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-tracks-stretch-001.html": [
-       "17cb321821830281a65b284af2de40ab3a6f53ef",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-tracks-stretch-001.html": [
+        "17cb321821830281a65b284af2de40ab3a6f53ef",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-justify-tracks-stretch-002.html": [
-       "6b7746722dca430951c2f3be63e8d66308566b0c",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-justify-tracks-stretch-002.html": [
+        "6b7746722dca430951c2f3be63e8d66308566b0c",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-order-001.html": [
-       "d01f52ea0421199c37d04408b42d0f6929876301",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-order-001.html": [
+        "d01f52ea0421199c37d04408b42d0f6929876301",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-order-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-order-002.html": [
-       "ae68f4e631a2f44540a60a7eebb5ef9a3ac9b84a",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-order-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-order-002.html": [
+        "ae68f4e631a2f44540a60a7eebb5ef9a3ac9b84a",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-order-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-subgrid-001.html": [
-       "de07dfb78d1d3a0aa6ec8728009836aa5c06a9fb",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-order-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-subgrid-001.html": [
+        "de07dfb78d1d3a0aa6ec8728009836aa5c06a9fb",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-subgrid-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "masonry-subgrid-002.html": [
-       "466e95eb03c7ae5eb9d09f8c58b5a3dcb166cf58",
-       [
-        null,
+          [
+           "/css/css-grid/masonry/tentative/masonry-subgrid-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "masonry-subgrid-002.html": [
+        "466e95eb03c7ae5eb9d09f8c58b5a3dcb166cf58",
         [
+         null,
          [
-          "/css/css-grid/masonry.tentative/masonry-subgrid-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
+          [
+           "/css/css-grid/masonry/tentative/masonry-subgrid-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
        ]
-      ]
+      }
      },
      "placement": {
       "grid-layout-grid-span.html": [
@@ -151745,6 +151760,32 @@
        {}
       ]
      ],
+     "change-list-style-type-001.html": [
+      "9eacdd7092d328521e69964131ac26e75f7333a9",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/change-list-style-type-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "change-list-style-type-002.html": [
+      "b76e4e9c31268b55e11b90f7b61d8d76c73f6eb8",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/change-list-style-type-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "content-property": {
       "marker-text-matches-armenian.html": [
        "58f570cd1197579aba1b646a1c970ab13c23c3e3",
@@ -163214,6 +163255,32 @@
        {}
       ]
      ],
+     "marker-text-transform-default.html": [
+      "922c5b0de27b3f4bd58765242e9027390d4eba77",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-transform-default-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-text-transform-uppercase.html": [
+      "d77f4e7de2e2507b34b836efd33b882a798069e8",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-transform-uppercase-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-unicode-bidi-default-ref.html": [
       "c3c6ee8a63d3959b8be77935532d23393ce8b5e0",
       [
@@ -163292,6 +163359,58 @@
        {}
       ]
      ],
+     "selection-contenteditable-011.html": [
+      "bc01d103ea9bfd41ab40f3ad6a429266cd29bef8",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-contenteditable-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "selection-input-011.html": [
+      "77f7188c71e137a76a75fe410c23f17bbdf33c66",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-input-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "selection-intercharacter-011.html": [
+      "70ab69fb492070103f2d5caa6a8f60035f0392e8",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-intercharacter-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "selection-intercharacter-012.html": [
+      "a04fc33e2fe918f8555583d9da2c48197037dc82",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-intercharacter-012-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "selection-text-shadow-016.html": [
       "44403c1b5f5fb2bf7245c73f5eb5c15ffd19a98a",
       [
@@ -163305,6 +163424,19 @@
        {}
       ]
      ],
+     "selection-textarea-011.html": [
+      "f21e5e190ff1ed587def22a4ed87de6193dfd762",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-textarea-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "spelling-error-001.html": [
       "a71d6f0155e42ad0ebe33f6ea11aa5755201beaa",
       [
@@ -168893,6 +169025,19 @@
        {}
       ]
      ],
+     "collapsed-border-color-change-with-compositing.html": [
+      "f7b19676bdbfe90e89e4bfcc11f8ef041ab12186",
+      [
+       null,
+       [
+        [
+         "/css/css-tables/collapsed-border-color-change-with-compositing-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "dynamic-table-cell-height.html": [
       "f6cd48e5ba5616a499809293714fcbb5b5742489",
       [
@@ -244342,7 +244487,7 @@
        ]
       ],
       "reverse-running-animation.html": [
-       "65f89b3e04c0b7ff6af221a100685fa71bcf7591",
+       "c9eb2a068e65de96273fd5fee0e0a29285ffa117",
        [
         null,
         [
@@ -244368,7 +244513,7 @@
        ]
       ],
       "update-playback-rate-fast.html": [
-       "63a76ba84a62736bb7edb05d9cfa79d6dc73c1cf",
+       "c3df1c1bf0abf4fd8200ff51a3c560a7552dd131",
        [
         null,
         [
@@ -244380,21 +244525,8 @@
         {}
        ]
       ],
-      "update-playback-rate-slow.html": [
-       "db449f2ca596c274170c94c1bb5dc0c87a1ba120",
-       [
-        null,
-        [
-         [
-          "/web-animations/timing-model/animations/update-playback-rate-slow-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "update-playback-rate-zero.html": [
-       "bed08d630ca2de7960e49e26c9f40da8e772f5b0",
+       "db1544ee92d910a7d8e2b59ba68de6a282f9058c",
        [
         null,
         [
@@ -294935,7 +295067,11 @@
       []
      ],
      "font-feature-resolution-001-ref.html": [
-      "db41a32f2515c1356fdf869c7bc591b7c2e378b2",
+      "261b93f5dbadbf95f50e2582cebb9d42e92c201c",
+      []
+     ],
+     "font-feature-resolution-002-ref.html": [
+      "99084224149f42e81341b8248cb88137af64b103",
       []
      ],
      "font-feature-settings-descriptor-01-ref.html": [
@@ -295588,6 +295724,10 @@
         "e0bf4d51d5ea4d1ae1a8499cf0855a9b4549ede8",
         []
        ],
+       "Lato-Medium-Liga.ttf": [
+        "3a0beaea38b8bc0cbf6fa656bf23e28cfdf18c6f",
+        []
+       ],
        "Lato-Medium.ttf": [
         "2c612da2ae589dc264deb683f90baf75c8e18e03",
         []
@@ -302338,191 +302478,193 @@
        ]
       }
      },
-     "masonry.tentative": {
-      "masonry-align-content-001-ref.html": [
-       "fff6cf21381f2ca635cc52daa0b440ef96e77cc3",
-       []
-      ],
-      "masonry-align-content-002-ref.html": [
-       "67318b323a2817bdd0cce0cfbad8ab80b80d386d",
-       []
-      ],
-      "masonry-align-content-003-ref.html": [
-       "9780d5f5dcf069295ce97d301e37bc4253b561d0",
-       []
-      ],
-      "masonry-align-content-004-ref.html": [
-       "de11c836b8d060f94d56831bef9fda471e062ea3",
-       []
-      ],
-      "masonry-align-tracks-001-ref.html": [
-       "3b22489fdb935ed1691714ddb1ddc96b6a948db1",
-       []
-      ],
-      "masonry-align-tracks-multi-001-ref.html": [
-       "11ff5081ec1a3c6916e4124788a2e2b36223788c",
-       []
-      ],
-      "masonry-align-tracks-stretch-001-ref.html": [
-       "0712f14bb3136b96897513cc524ee0004350ccd4",
-       []
-      ],
-      "masonry-align-tracks-stretch-002-ref.html": [
-       "01f24ea986f588856cb9ea8d126632d88316ef49",
-       []
-      ],
-      "masonry-fragmentation-001-ref.html": [
-       "de3fe6f402d31c7256b3f9c36c4db857645beb97",
-       []
-      ],
-      "masonry-fragmentation-002-ref.html": [
-       "ea21350f43774f937d724bbc943c6733c3c241c1",
-       []
-      ],
-      "masonry-fragmentation-003-ref.html": [
-       "9d1036dfebde2b2c45841cdfdb0cc588f8775f1f",
-       []
-      ],
-      "masonry-fragmentation-004-ref.html": [
-       "10246dac42101bf200e15af99e8b172cf41bfc61",
-       []
-      ],
-      "masonry-fragmentation-005-ref.html": [
-       "e059f414dc7f40844f01cb892c86ba5de9d51d82",
-       []
-      ],
-      "masonry-fragmentation-006-ref.html": [
-       "5df37376190870fc162e3205bb32045a37b5f467",
-       []
-      ],
-      "masonry-gap-001-ref.html": [
-       "5e92a681a0d79d80208cc2652a31aa6486477219",
-       []
-      ],
-      "masonry-grid-item-content-baseline-001-ref.html": [
-       "cdb6d4fdf8ff8aeb8f56ae14e52b73aa370977eb",
-       []
-      ],
-      "masonry-grid-item-self-baseline-001-ref.html": [
-       "817f19ff84e272eb9a5f2bd0d48657ea65f45f92",
-       []
-      ],
-      "masonry-grid-item-self-baseline-002a-ref.html": [
-       "ddce4e34a715c9bcd9b09320cabad1068f123574",
-       []
-      ],
-      "masonry-grid-item-self-baseline-002b-ref.html": [
-       "44d8266436e29a9782234e7fce5b1dea31761464",
-       []
-      ],
-      "masonry-grid-placement-named-lines-001-ref.html": [
-       "c99b117f2ee5d669f99ddc3fc48cd48545387027",
-       []
-      ],
-      "masonry-grid-placement-named-lines-002-ref.html": [
-       "dd589f90c5ffa06f9353d1dfaa4befa707dbc0b4",
-       []
-      ],
-      "masonry-intrinsic-sizing-001-ref.html": [
-       "898bff16d8e32d4c8f47a6bb091a9fea341a5daa",
-       []
-      ],
-      "masonry-intrinsic-sizing-002-ref.html": [
-       "4f6519db949ee64dc3fd5e752e930cf3520deff5",
-       []
-      ],
-      "masonry-intrinsic-sizing-003-ref.html": [
-       "61eb21570df2b883245fcdde2430fa30e7a27ec1",
-       []
-      ],
-      "masonry-intrinsic-sizing-004-ref.html": [
-       "6a5d81fedb2ca1371a55773647a89511488dc0f6",
-       []
-      ],
-      "masonry-intrinsic-sizing-005-ref.html": [
-       "e564fb1b3e6baf1d68980a49ac41eca4bb1c3216",
-       []
-      ],
-      "masonry-intrinsic-sizing-006-ref.html": [
-       "e1cb015cfe81f2d2f1ef43a46e822872227324bb",
-       []
-      ],
-      "masonry-item-placement-001-ref.html": [
-       "7108a11a100e58ac89daec02c1e874f0c6c5ab95",
-       []
-      ],
-      "masonry-item-placement-002-ref.html": [
-       "a02009ec3087e10f94230db015a4b3a020bc776b",
-       []
-      ],
-      "masonry-item-placement-003-ref.html": [
-       "5cbd8db9ef964400865c4c0d765becfcabd1ff28",
-       []
-      ],
-      "masonry-item-placement-004-ref.html": [
-       "75d6b741c2f04de618708486dfbd0e066b4fc738",
-       []
-      ],
-      "masonry-item-placement-005-ref.html": [
-       "806f314300dd1c9127a8f59ba9e1bb09c6d99265",
-       []
-      ],
-      "masonry-item-placement-006-ref.html": [
-       "a6e9b75d0e61ce1404229781f5d55da34c4d2a68",
-       []
-      ],
-      "masonry-item-placement-007-ref.html": [
-       "50236046fb0610dcac5723f212ab69a9155847b1",
-       []
-      ],
-      "masonry-justify-content-001-ref.html": [
-       "f7d9ccf48f1d9af15826fb12610f18e73d8e645f",
-       []
-      ],
-      "masonry-justify-content-002-ref.html": [
-       "6889af7eaccb0caae8acb8aac40a80d6700ae348",
-       []
-      ],
-      "masonry-justify-content-003-ref.html": [
-       "81d0fba41070bb5b6cba5a71f1bb33ca239d6f02",
-       []
-      ],
-      "masonry-justify-content-004-ref.html": [
-       "43af71fc01f9811cc2906389cf09834a33e6bc3a",
-       []
-      ],
-      "masonry-justify-tracks-001-ref.html": [
-       "912c9c9f823ddabbf2a2ebd0c19feacc38db34fb",
-       []
-      ],
-      "masonry-justify-tracks-multi-001-ref.html": [
-       "57176e2b1ec61321808499f8285e2ec06b70c5aa",
-       []
-      ],
-      "masonry-justify-tracks-stretch-001-ref.html": [
-       "39053051cc837bff68d39e16a1e5ff27ee0d8ed9",
-       []
-      ],
-      "masonry-justify-tracks-stretch-002-ref.html": [
-       "69759484f298f1220f87c73a582131812b2cf407",
-       []
-      ],
-      "masonry-order-001-ref.html": [
-       "371699981544487f6b7c6b1e8d084e746057a07d",
-       []
-      ],
-      "masonry-order-002-ref.html": [
-       "5dd4e47d80b7777ab3e2473d33178cc00bb4cae8",
-       []
-      ],
-      "masonry-subgrid-001-ref.html": [
-       "25ec77bc518aee8dde405116566d5deab20034e7",
-       []
-      ],
-      "masonry-subgrid-002-ref.html": [
-       "4750c1899e34d6855203d802b9000179163cb172",
-       []
-      ]
+     "masonry": {
+      "tentative": {
+       "masonry-align-content-001-ref.html": [
+        "fff6cf21381f2ca635cc52daa0b440ef96e77cc3",
+        []
+       ],
+       "masonry-align-content-002-ref.html": [
+        "67318b323a2817bdd0cce0cfbad8ab80b80d386d",
+        []
+       ],
+       "masonry-align-content-003-ref.html": [
+        "9780d5f5dcf069295ce97d301e37bc4253b561d0",
+        []
+       ],
+       "masonry-align-content-004-ref.html": [
+        "de11c836b8d060f94d56831bef9fda471e062ea3",
+        []
+       ],
+       "masonry-align-tracks-001-ref.html": [
+        "3b22489fdb935ed1691714ddb1ddc96b6a948db1",
+        []
+       ],
+       "masonry-align-tracks-multi-001-ref.html": [
+        "11ff5081ec1a3c6916e4124788a2e2b36223788c",
+        []
+       ],
+       "masonry-align-tracks-stretch-001-ref.html": [
+        "0712f14bb3136b96897513cc524ee0004350ccd4",
+        []
+       ],
+       "masonry-align-tracks-stretch-002-ref.html": [
+        "01f24ea986f588856cb9ea8d126632d88316ef49",
+        []
+       ],
+       "masonry-fragmentation-001-ref.html": [
+        "de3fe6f402d31c7256b3f9c36c4db857645beb97",
+        []
+       ],
+       "masonry-fragmentation-002-ref.html": [
+        "ea21350f43774f937d724bbc943c6733c3c241c1",
+        []
+       ],
+       "masonry-fragmentation-003-ref.html": [
+        "9d1036dfebde2b2c45841cdfdb0cc588f8775f1f",
+        []
+       ],
+       "masonry-fragmentation-004-ref.html": [
+        "10246dac42101bf200e15af99e8b172cf41bfc61",
+        []
+       ],
+       "masonry-fragmentation-005-ref.html": [
+        "e059f414dc7f40844f01cb892c86ba5de9d51d82",
+        []
+       ],
+       "masonry-fragmentation-006-ref.html": [
+        "5df37376190870fc162e3205bb32045a37b5f467",
+        []
+       ],
+       "masonry-gap-001-ref.html": [
+        "5e92a681a0d79d80208cc2652a31aa6486477219",
+        []
+       ],
+       "masonry-grid-item-content-baseline-001-ref.html": [
+        "cdb6d4fdf8ff8aeb8f56ae14e52b73aa370977eb",
+        []
+       ],
+       "masonry-grid-item-self-baseline-001-ref.html": [
+        "817f19ff84e272eb9a5f2bd0d48657ea65f45f92",
+        []
+       ],
+       "masonry-grid-item-self-baseline-002a-ref.html": [
+        "ddce4e34a715c9bcd9b09320cabad1068f123574",
+        []
+       ],
+       "masonry-grid-item-self-baseline-002b-ref.html": [
+        "44d8266436e29a9782234e7fce5b1dea31761464",
+        []
+       ],
+       "masonry-grid-placement-named-lines-001-ref.html": [
+        "c99b117f2ee5d669f99ddc3fc48cd48545387027",
+        []
+       ],
+       "masonry-grid-placement-named-lines-002-ref.html": [
+        "dd589f90c5ffa06f9353d1dfaa4befa707dbc0b4",
+        []
+       ],
+       "masonry-intrinsic-sizing-001-ref.html": [
+        "898bff16d8e32d4c8f47a6bb091a9fea341a5daa",
+        []
+       ],
+       "masonry-intrinsic-sizing-002-ref.html": [
+        "4f6519db949ee64dc3fd5e752e930cf3520deff5",
+        []
+       ],
+       "masonry-intrinsic-sizing-003-ref.html": [
+        "61eb21570df2b883245fcdde2430fa30e7a27ec1",
+        []
+       ],
+       "masonry-intrinsic-sizing-004-ref.html": [
+        "6a5d81fedb2ca1371a55773647a89511488dc0f6",
+        []
+       ],
+       "masonry-intrinsic-sizing-005-ref.html": [
+        "e564fb1b3e6baf1d68980a49ac41eca4bb1c3216",
+        []
+       ],
+       "masonry-intrinsic-sizing-006-ref.html": [
+        "e1cb015cfe81f2d2f1ef43a46e822872227324bb",
+        []
+       ],
+       "masonry-item-placement-001-ref.html": [
+        "7108a11a100e58ac89daec02c1e874f0c6c5ab95",
+        []
+       ],
+       "masonry-item-placement-002-ref.html": [
+        "a02009ec3087e10f94230db015a4b3a020bc776b",
+        []
+       ],
+       "masonry-item-placement-003-ref.html": [
+        "5cbd8db9ef964400865c4c0d765becfcabd1ff28",
+        []
+       ],
+       "masonry-item-placement-004-ref.html": [
+        "75d6b741c2f04de618708486dfbd0e066b4fc738",
+        []
+       ],
+       "masonry-item-placement-005-ref.html": [
+        "806f314300dd1c9127a8f59ba9e1bb09c6d99265",
+        []
+       ],
+       "masonry-item-placement-006-ref.html": [
+        "a6e9b75d0e61ce1404229781f5d55da34c4d2a68",
+        []
+       ],
+       "masonry-item-placement-007-ref.html": [
+        "50236046fb0610dcac5723f212ab69a9155847b1",
+        []
+       ],
+       "masonry-justify-content-001-ref.html": [
+        "f7d9ccf48f1d9af15826fb12610f18e73d8e645f",
+        []
+       ],
+       "masonry-justify-content-002-ref.html": [
+        "6889af7eaccb0caae8acb8aac40a80d6700ae348",
+        []
+       ],
+       "masonry-justify-content-003-ref.html": [
+        "81d0fba41070bb5b6cba5a71f1bb33ca239d6f02",
+        []
+       ],
+       "masonry-justify-content-004-ref.html": [
+        "43af71fc01f9811cc2906389cf09834a33e6bc3a",
+        []
+       ],
+       "masonry-justify-tracks-001-ref.html": [
+        "912c9c9f823ddabbf2a2ebd0c19feacc38db34fb",
+        []
+       ],
+       "masonry-justify-tracks-multi-001-ref.html": [
+        "57176e2b1ec61321808499f8285e2ec06b70c5aa",
+        []
+       ],
+       "masonry-justify-tracks-stretch-001-ref.html": [
+        "39053051cc837bff68d39e16a1e5ff27ee0d8ed9",
+        []
+       ],
+       "masonry-justify-tracks-stretch-002-ref.html": [
+        "69759484f298f1220f87c73a582131812b2cf407",
+        []
+       ],
+       "masonry-order-001-ref.html": [
+        "371699981544487f6b7c6b1e8d084e746057a07d",
+        []
+       ],
+       "masonry-order-002-ref.html": [
+        "5dd4e47d80b7777ab3e2473d33178cc00bb4cae8",
+        []
+       ],
+       "masonry-subgrid-001-ref.html": [
+        "25ec77bc518aee8dde405116566d5deab20034e7",
+        []
+       ],
+       "masonry-subgrid-002-ref.html": [
+        "4750c1899e34d6855203d802b9000179163cb172",
+        []
+       ]
+      }
      },
      "reference": {
       "anonymous-grid-items-001-ref.html": [
@@ -303452,10 +303594,14 @@
       "01494b4dd1f6671d2ff626b0f05ceee1077e287c",
       []
      ],
-     "change-list-style-type-ref.html": [
+     "change-list-style-type-001-ref.html": [
       "033af1333132a2696d1a80ceacfc91f1ebf67a08",
       []
      ],
+     "change-list-style-type-002-ref.html": [
+      "8a9c9df59d9399152d5c757bd264d9a060e18311",
+      []
+     ],
      "content-property": {
       "marker-text-matches-armenian-ref.html": [
        "de55b7381ac1e2cf1553adcaee916e24e7348c4c",
@@ -305992,6 +306138,14 @@
       "2ad96e37bb145b4bae9aae37db8b23df7ddfdc3b",
       []
      ],
+     "marker-text-transform-default-ref.html": [
+      "ceec36dd365556e86cdbaa09efc30f7cffb64fc3",
+      []
+     ],
+     "marker-text-transform-uppercase-ref.html": [
+      "6f959dad676467abcd5696013ac99ff888b4d4f1",
+      []
+     ],
      "outside-marker-paint-order-ref.html": [
       "441a354732fc6690ea0d8af93dd33d57c8049374",
       []
@@ -306012,6 +306166,26 @@
       "active-selection-031-ref.html": [
        "0e3680844f887050520d8fb9b9bd2f68a2234e85",
        []
+      ],
+      "selection-contenteditable-011-ref.html": [
+       "0677a4b6b39f26aa4b3acc7480240b9d061e4929",
+       []
+      ],
+      "selection-input-011-ref.html": [
+       "b49b0b00fa2a8b4f802a95d1309cc26c7fde8935",
+       []
+      ],
+      "selection-intercharacter-011-ref.html": [
+       "b0c60408f760b562b98fcb4ff2682fb1e3638452",
+       []
+      ],
+      "selection-intercharacter-012-ref.html": [
+       "38650c90b4096ddac99543aeca2405ac4f288969",
+       []
+      ],
+      "selection-textarea-011-ref.html": [
+       "825a4247a202dac2bc3dde257ddff81f2e8eded8",
+       []
       ]
      },
      "selection-text-shadow-016-ref.html": [
@@ -307388,6 +307562,10 @@
       "7dc722cc2e7bded73e74b44d7b8fa6f7c3af20f1",
       []
      ],
+     "collapsed-border-color-change-with-compositing-ref.html": [
+      "ab9d83927458d5b9881b07bc7fd8a1d31e471b33",
+      []
+     ],
      "floats": {
       "floats-wrap-bfc-006b-ref.xht": [
        "93cdd3e51cab23bd4f20fb1794ae7eeeb5ff21b1",
@@ -321897,11 +322075,13 @@
       []
      ]
     },
-    "state.tentative": {
-     "README.md": [
-      "b11784bd07e689b16b316cefb7a9cb03ba8fc56c",
-      []
-     ]
+    "state": {
+     "tentative": {
+      "README.md": [
+       "b11784bd07e689b16b316cefb7a9cb03ba8fc56c",
+       []
+      ]
+     }
     }
    },
    "device-memory": {
@@ -322129,7 +322309,7 @@
       []
      ],
      "file-names.md": [
-      "57a91f0d83391b9a4a32bed5c263090131fab1d8",
+      "e68af233f15ec7c22d873753606a490d1f88631d",
       []
      ],
      "general-guidelines.md": [
@@ -329739,7 +329919,7 @@
         []
        ],
        "dispatcher.py": [
-        "2617361b0b369bd9efd3aedd42a88f8f46906fe3",
+        "2f1cf1bd4cf4f4d229de09bfb6da369f6b18adc2",
         []
        ],
        "executor.html": [
@@ -341717,11 +341897,11 @@
       []
      ],
      "messaging-serialize-helpers.js": [
-      "3ef347f98fef90322b60eef7f9b35baef2751205",
+      "3df2d48e086fcea8deb52183dcea59cc09eafdd1",
       []
      ],
      "native-fs-test-helpers.js": [
-      "cd1613eae5d9041048c8f5df049377d8176c5c24",
+      "1f944b0ad6a856c2d0881df5a322f5ab7ee4e387",
       []
      ],
      "opaque-origin-sandbox.html": [
@@ -350115,11 +350295,11 @@
       []
      ],
      "lint.py": [
-      "ad053dcca584cd2616e62dd8b414192efeb5f9d8",
+      "85c8bf341795fd8fd58e094fef8733f807b52729",
       []
      ],
      "rules.py": [
-      "c67745792d1bec367fe6e2faa28d725fdedaf1fc",
+      "1bf78b7bb405f132536d162ba920dd2de9e08f09",
       []
      ],
      "tests": {
@@ -350324,7 +350504,7 @@
        []
       ],
       "test_path_lints.py": [
-       "558b0ed4f648f41e7888d33b04c97bce720ca5da",
+       "7368216cd3dd6ba54843cfe7390b876a357d3490",
        []
       ]
      }
@@ -350369,7 +350549,7 @@
       []
      ],
      "sourcefile.py": [
-      "09316bd052c066a2dbb92d26be4ca4aa610d216a",
+      "5a7310213a75d564324791c64dfe9646fcc7355e",
       []
      ],
      "testpaths.py": [
@@ -350394,7 +350574,7 @@
        []
       ],
       "test_sourcefile.py": [
-       "b4ba4638708cadf8a65c7a3decc964791a041dec",
+       "cc97619bb571d7f850a581f69ec0c9d6e5c06412",
        []
       ],
       "test_utils.py": [
@@ -356365,7 +356545,7 @@
       []
      ],
      "browser.py": [
-      "85b7b63c21972614208bda68979fd8b974535e97",
+      "6db3415a480c7e62dca111652c388aa83471d1da",
       []
      ],
      "commands.json": [
@@ -356401,11 +356581,11 @@
       []
      ],
      "run.py": [
-      "79329a5dab4472d73fefeaf9b0d48057dc40eba1",
+      "aec874fa1969cd86a875cc445067073b8a7c8944",
       []
      ],
      "testfiles.py": [
-      "c990aa21a65f6f8f6d87f62157d0fb65fc8fc974",
+      "7f966a625262f900f50064c0949ee3f39f202c93",
       []
      ],
      "tests": {
@@ -356417,6 +356597,10 @@
        "495d5f056fc1bd898047c7a46220fa523ffb4093",
        []
       ],
+      "test_install.py": [
+       "7d55d419c1401aca559b92b0aedfdfb83c6c1bc5",
+       []
+      ],
       "test_markdown.py": [
        "dec9ad9c48906766624ec594c994d52e70c96fa0",
        []
@@ -356430,11 +356614,11 @@
        []
       ],
       "test_testfiles.py": [
-       "81f528457c6d6820e1f011a4732351269bf55ec2",
+       "c4d40ff9fd0f00a4fa435ddff353234178542eb8",
        []
       ],
       "test_wpt.py": [
-       "d2d0b541a3796528929522ef62c2e80cb7e8735c",
+       "b5ae79d13112bec1a4f264686338204ba3d62abc",
        []
       ]
      },
@@ -356447,7 +356631,7 @@
       []
      ],
      "utils.py": [
-      "6608af754b2adaf77610552f0db4ee67e4b4e621",
+      "6556ff48b36f2cb38e5b8a3961099bad9a1b56f5",
       []
      ],
      "virtualenv.py": [
@@ -356719,7 +356903,7 @@
         []
        ],
        "chrome.py": [
-        "f65a17897ad2fe560af0fb47f6a0445afba77c4c",
+        "327231eb7befa3f86ba9d7da2eff2e774b8a0383",
         []
        ],
        "chrome_android.py": [
@@ -356802,7 +356986,7 @@
        []
       ],
       "environment.py": [
-       "ad648374af9f0f0720cbbae0ed20c83beb57fbce",
+       "65f82005f317f8614e5a2febc35a996b9b0c3871",
        []
       ],
       "executors": {
@@ -357112,7 +357296,7 @@
        []
       ],
       "wptcommandline.py": [
-       "8087947670456b5e72c467222df9000e54f75b56",
+       "f322d77fbddefabc8fd187ebbc8cadaea8ea1086",
        []
       ],
       "wptlogging.py": [
@@ -357182,7 +357366,7 @@
        }
       },
       "wptrunner.py": [
-       "86cc36d3af53ad4c7b04ef25d23eb38caa3601ab",
+       "a397fd6f0b857e02b6eccd003e7b0a4541e0955b",
        []
       ],
       "wpttest.py": [
@@ -357350,11 +357534,11 @@
          []
         ],
         "sub_params.sub.txt": [
-         "8323878d6f81888a9c8487ba3e427da135c31145",
+         "4431c21fc5caeba67359bd73b84a6ed6fc1846d8",
          []
         ],
         "sub_params.txt": [
-         "8323878d6f81888a9c8487ba3e427da135c31145",
+         "4431c21fc5caeba67359bd73b84a6ed6fc1846d8",
          []
         ],
         "sub_url_base.sub.txt": [
@@ -357429,7 +357613,7 @@
         []
        ],
        "test_handlers.py": [
-        "8163d365c919c2f0d867f5d6026d2f8b6f1c20b9",
+        "965a214f166cfcb31baaeada3ca2bb747b86342a",
         []
        ],
        "test_input_file.py": [
@@ -357437,7 +357621,7 @@
         []
        ],
        "test_pipes.py": [
-        "a6a703e304902dafaf43975ab1ac0580e160fdc3",
+        "5278843833640e7944df4e2305469d380a92dcc5",
         []
        ],
        "test_request.py": [
@@ -357492,7 +357676,7 @@
        []
       ],
       "handlers.py": [
-       "3743ba01644c5f5ebc654091215e69384e3d63fc",
+       "d315b0212c48aae4f2c805f3f055cd8d1096088b",
        []
       ],
       "logger.py": [
@@ -357512,7 +357696,7 @@
        []
       ],
       "response.py": [
-       "895f174d5f057afdec7ca6fc7388a39263fea874",
+       "b7bfcebd10b6af40bc1f26278cf29557381fff3d",
        []
       ],
       "router.py": [
@@ -358446,7 +358630,7 @@
        []
       ],
       "reverse-running-animation-ref.html": [
-       "7fcdf9156f82ae51ed3004fa00ef1fc1f01192db",
+       "7bf5b03c1e1a3c3870ee1c94dccb5ff2eab46f54",
        []
       ],
       "sync-start-times-ref.html": [
@@ -358454,15 +358638,11 @@
        []
       ],
       "update-playback-rate-fast-ref.html": [
-       "af69b26100ae02ee711274071df416c45f71d868",
-       []
-      ],
-      "update-playback-rate-slow-ref.html": [
-       "11b87deecca4bcea480c9bec9221a02cd1c97a9b",
+       "e996815da8d4076ca034e8415023b0a946fe1774",
        []
       ],
       "update-playback-rate-zero-ref.html": [
-       "26293a3aebbb004dbc03742544c86d237081a56b",
+       "399fd5ce7d6710670374d122c7f35cd64bd58b98",
        []
       ]
      }
@@ -360329,16 +360509,18 @@
       []
      ]
     },
-    "stream.tentative": {
-     "README.md": [
-      "6c5158877417a3271ff0179449eace740cf157a1",
-      []
-     ],
-     "resources": {
-      "url-constants.js": [
-       "9bc77aa3264a157f3da9e37504febfe8563d40bb",
+    "stream": {
+     "tentative": {
+      "README.md": [
+       "6c5158877417a3271ff0179449eace740cf157a1",
        []
-      ]
+      ],
+      "resources": {
+       "url-constants.js": [
+        "9bc77aa3264a157f3da9e37504febfe8563d40bb",
+        []
+       ]
+      }
      }
     },
     "unload-a-document": {
@@ -385938,7 +386120,7 @@
      ]
     ],
     "change_eventhandler_for_no_name_and_no_value.tentative.https.window.js": [
-     "fbf3acecd26ec067c9df46fac90461c982bb1eaa",
+     "4498caf59689cc3da875d1c56937f6d2a235cb5d",
      [
       "cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.html",
       {
@@ -386148,7 +386330,7 @@
      ]
     ],
     "cookieStore_delete_arguments.tentative.https.any.js": [
-     "5989dcb8be6b3e93adebbfd456898c7dba40e1f9",
+     "ddae23888f4f2a7ff203b4189afeb1ced11b0a3d",
      [
       "cookie-store/cookieStore_delete_arguments.tentative.https.any.html",
       {
@@ -396600,21 +396782,23 @@
        ]
       ]
      },
-     "masonry.tentative": {
-      "masonry-grid-template-columns-computed-withcontent.html": [
-       "f2a47d9809a139b042945cf34b4158b44fb4b3e4",
-       [
-        null,
-        {}
+     "masonry": {
+      "tentative": {
+       "masonry-grid-template-columns-computed-withcontent.html": [
+        "f2a47d9809a139b042945cf34b4158b44fb4b3e4",
+        [
+         null,
+         {}
+        ]
+       ],
+       "masonry-parsing.html": [
+        "e3245095fadb760ea5414af7997abc5f296aff1a",
+        [
+         null,
+         {}
+        ]
        ]
-      ],
-      "masonry-parsing.html": [
-       "e3245095fadb760ea5414af7997abc5f296aff1a",
-       [
-        null,
-        {}
-       ]
-      ]
+      }
      },
      "parsing": {
       "grid-area-computed.html": [
@@ -399702,7 +399886,7 @@
       ]
      ],
      "marker-default-styles.html": [
-      "05da6f89a9e2f858eadfdfb63e5194feda5ce3fc",
+      "865a2d01a9927cfc1e26b8655109d14411fc782c",
       [
        null,
        {}
@@ -399740,14 +399924,14 @@
      ],
      "parsing": {
       "marker-supported-properties-in-animation.html": [
-       "faf7c904fb04460ad08cc7b8a0e9d3504bbfe158",
+       "bc26e202696e9f3892fcacc92ca96a473ca86807",
        [
         null,
         {}
        ]
       ],
       "marker-supported-properties.html": [
-       "e27decc133424ba01b96ff7960ecbe62d5033077",
+       "669d040671bc62862721583cf6917b754b317a89",
        [
         null,
         {}
@@ -401959,6 +402143,13 @@
        {}
       ]
      ],
+     "available-height-for-replaced-content-001.html": [
+      "f6ea13618eebc352cebe7db567b517dd540251a2",
+      [
+       null,
+       {}
+      ]
+     ],
      "button-min-width.html": [
       "d27d0e1dd024856763ca10253a493fa49115b086",
       [
@@ -414322,21 +414513,23 @@
       ]
      ]
     },
-    "state.tentative": {
-     "ElementInternals-states.html": [
-      "7290a84d410dd7874124fa54e603d485b69ef9da",
-      [
-       null,
-       {}
+    "state": {
+     "tentative": {
+      "ElementInternals-states.html": [
+       "7290a84d410dd7874124fa54e603d485b69ef9da",
+       [
+        null,
+        {}
+       ]
+      ],
+      "state-pseudo-class.html": [
+       "9a810b6b000c31b9521c205b65002e2c6205bccf",
+       [
+        null,
+        {}
+       ]
       ]
-     ],
-     "state-pseudo-class.html": [
-      "9a810b6b000c31b9521c205b65002e2c6205bccf",
-      [
-       null,
-       {}
-      ]
-     ]
+     }
     },
     "throw-on-dynamic-markup-insertion-counter-construct.html": [
      "3e9254e2a50f0ca572b9e9aa1641a4dab5f22e50",
@@ -457059,7 +457252,7 @@
         ]
        ],
        "openee-accessed_opener-coop-ro.https.html": [
-        "d0db661c66e3555357bff1c5acc72e9d4100bc37",
+        "c693425a7ccd7c70deab6098fd8e272ecddaa51f",
         [
          null,
          {
@@ -457068,7 +457261,7 @@
         ]
        ],
        "openee-accessed_opener-coop.https.html": [
-        "48dfa5113d03e801bdbc7b03b58d91597f9a282e",
+        "fc3ff122f9e06e9ff1002eb046ade3d842867502",
         [
          null,
          {
@@ -457095,7 +457288,7 @@
         ]
        ],
        "opener-accessed_opener-coop-ro.https.html": [
-        "05e1320e992eb37550aa440b42ac96cfd5e8dc94",
+        "1c9436ce8ba4f28c99df29985c1c10559295cec9",
         [
          null,
          {
@@ -457104,7 +457297,7 @@
         ]
        ],
        "opener-accessed_opener-coop.https.html": [
-        "de2974aa637000444f8df2abd14227135fcf50c7",
+        "1d4c117ed2bae2d47304a9d68ce928f6b52dc86f",
         [
          null,
          {
@@ -457194,7 +457387,7 @@
         ]
        ],
        "reporting-popup-same-origin-coep-report-to.https.html": [
-        "494c9df67b9d7913d74b6b0904878f8b4e8b26af",
+        "f056bc54b93d1ad70eb5bd4b452a54663deda13c",
         [
          null,
          {
@@ -499572,6 +499765,13 @@
       {}
      ]
     ],
+    "constructor.tentative.html": [
+     "799b1460dc1baa15eb26b52ff927aa903ece5b24",
+     [
+      null,
+      {}
+     ]
+    ],
     "css": {
      "animation-timeline-computed.html": [
       "02836d714b59081b3a14c2bd124d2ac254d23d58",
@@ -519207,7 +519407,7 @@
        ]
       ],
       "processing-a-keyframes-argument-001.html": [
-       "654d4db7c79bd7f94727a38e595ab8d78c2172f2",
+       "271a47b3011fd623a302f70c9312e34fe2628f1b",
        [
         null,
         {}
@@ -528364,458 +528564,460 @@
       ]
      ]
     },
-    "stream.tentative": {
-     "abort.any.js": [
-      "09664f31ea6fa34f6df20f3aafe0b3ecaf39a7c3",
-      [
-       "websockets/stream.tentative/abort.any.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "global",
-          "window,worker"
+    "stream": {
+     "tentative": {
+      "abort.any.js": [
+       "9d64899c551129ba1c4436f954a571f6624cc96a",
+       [
+        "websockets/stream/tentative/abort.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
          ]
-        ]
-       }
+        }
+       ],
+       [
+        "websockets/stream/tentative/abort.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/abort.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/abort.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ]
       ],
-      [
-       "websockets/stream.tentative/abort.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
+      "backpressure-receive.any.js": [
+       "17c75bd51cd204f3910b757cfda1e0a9fd0f5394",
+       [
+        "websockets/stream/tentative/backpressure-receive.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "script",
-          "resources/url-constants.js"
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-receive.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "script",
-          "/common/utils.js"
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-receive.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-receive.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
       ],
-      [
-       "websockets/stream.tentative/abort.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
+      "backpressure-send.any.js": [
+       "2848a3f1564a4e01ebe861a75511cfe0a83e4435",
+       [
+        "websockets/stream/tentative/backpressure-send.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "script",
-          "resources/url-constants.js"
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-send.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "script",
-          "/common/utils.js"
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-send.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
          ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
+         "timeout": "long"
+        }
+       ],
+       [
+        "websockets/stream/tentative/backpressure-send.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
       ],
-      [
-       "websockets/stream.tentative/abort.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "global",
-          "window,worker"
+      "close.any.js": [
+       "d44883139c6a86c9995f678b2a80194d8737e4da",
+       [
+        "websockets/stream/tentative/close.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
          ]
-        ]
-       }
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ]
+      ],
+      "constructor.any.js": [
+       "a5bea2ac61b4b5e28c11cbceb89669559bafd086",
+       [
+        "websockets/stream/tentative/constructor.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/constructor.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/constructor.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/constructor.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../websocket.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ]
+         ]
+        }
+       ]
       ]
-     ],
-     "backpressure-receive.any.js": [
-      "22705c6ed11d60148bfc41590e7e335f9351ef79",
-      [
-       "websockets/stream.tentative/backpressure-receive.any.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-receive.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-receive.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-receive.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
-     "backpressure-send.any.js": [
-      "6619a0b08f3ee39e1845d69c20ca3ae7c2d4ca5f",
-      [
-       "websockets/stream.tentative/backpressure-send.any.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-send.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-send.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "websockets/stream.tentative/backpressure-send.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
-     "close.any.js": [
-      "0e6149e7a635eb649910fbd813228f36f7eb0283",
-      [
-       "websockets/stream.tentative/close.any.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/close.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/close.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/close.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ]
-     ],
-     "constructor.any.js": [
-      "24f96cc308252be2467bc73f027994542c92987c",
-      [
-       "websockets/stream.tentative/constructor.any.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/constructor.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/constructor.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "websockets/stream.tentative/constructor.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "../websocket.sub.js"
-         ],
-         [
-          "script",
-          "resources/url-constants.js"
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ]
-     ]
+     }
     },
     "unload-a-document": {
      "001.html": [
@@ -557703,13 +557905,6 @@
      }
     },
     "css-lists": {
-     "change-list-style-type.html": [
-      "3d68ca4a7eaa0fe9bbc94c94fa290ce6026272c6",
-      [
-       null,
-       {}
-      ]
-     ],
      "list-style-type-armenian-002.xht": [
       "fa7b47d7358de7fdf0dcc467075c90f6d81b796d",
       [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/font-feature-resolution-002.html.ini b/tests/wpt/metadata/css/css-fonts/font-feature-resolution-002.html.ini
new file mode 100644
index 00000000000..73995bcdf16
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-feature-resolution-002.html.ini
@@ -0,0 +1,2 @@
+[font-feature-resolution-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini b/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini
new file mode 100644
index 00000000000..36bbe637384
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/state/tentative/ElementInternals-states.html.ini
@@ -0,0 +1,10 @@
+[ElementInternals-states.html]
+  [DOMTokenList behavior of ElementInternals.states: Initial state]
+    expected: FAIL
+
+  [DOMTokenList behavior of ElementInternals.states: Exceptions]
+    expected: FAIL
+
+  [DOMTokenList behavior of ElementInternals.states: Modifications]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/state/tentative/state-pseudo-class.html.ini b/tests/wpt/metadata/custom-elements/state/tentative/state-pseudo-class.html.ini
new file mode 100644
index 00000000000..cd5eb9f4605
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/state/tentative/state-pseudo-class.html.ini
@@ -0,0 +1,16 @@
+[state-pseudo-class.html]
+  [:state() and :host()]
+    expected: FAIL
+
+  [:state() and ::part()]
+    expected: FAIL
+
+  [:state() in simple cases]
+    expected: FAIL
+
+  [:state() and other pseudo classes]
+    expected: FAIL
+
+  [:state() serialization]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index b83f375ce04..a012d413504 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,18 +312,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" 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 5c001592859..b2ffc8abf78 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 58de838d890..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    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_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.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
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 fd369192a02..442db3cb549 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,4 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -7,5 +6,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index daa518bd0e3..4df5d7a35de 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     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 f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index d43f38b40cd..45d8be1c898 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: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..dc856a3d5a3 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/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 089a472c3b8..2b2500feb7e 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
 
@@ -8,5 +7,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
+
+  [Check that rel=noopener with target=_top does a normal load]
+    expected: FAIL
+
+  [Check that rel=noopener with target=_parent does a normal load]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
new file mode 100644
index 00000000000..6cf9d13975c
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
@@ -0,0 +1,4 @@
+[iframe_005.html]
+  [document.write external script into iframe write back into parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini
new file mode 100644
index 00000000000..d524c0dedb7
--- /dev/null
+++ b/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini
@@ -0,0 +1,27 @@
+[abort.any.serviceworker.html]
+  expected: ERROR
+
+[abort.any.sharedworker.html]
+  expected: ERROR
+
+[abort.any.html]
+  [abort after connect should do nothing]
+    expected: FAIL
+
+  [abort during handshake should work]
+    expected: FAIL
+
+  [abort before constructing should prevent connection]
+    expected: FAIL
+
+
+[abort.any.worker.html]
+  [abort after connect should do nothing]
+    expected: FAIL
+
+  [abort during handshake should work]
+    expected: FAIL
+
+  [abort before constructing should prevent connection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini
new file mode 100644
index 00000000000..43e567db7b2
--- /dev/null
+++ b/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini
@@ -0,0 +1,15 @@
+[backpressure-receive.any.worker.html]
+  [backpressure should be applied to received messages]
+    expected: FAIL
+
+
+[backpressure-receive.any.sharedworker.html]
+  expected: ERROR
+
+[backpressure-receive.any.serviceworker.html]
+  expected: ERROR
+
+[backpressure-receive.any.html]
+  [backpressure should be applied to received messages]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/stream/tentative/backpressure-send.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/backpressure-send.any.js.ini
new file mode 100644
index 00000000000..1329f935b0a
--- /dev/null
+++ b/tests/wpt/metadata/websockets/stream/tentative/backpressure-send.any.js.ini
@@ -0,0 +1,15 @@
+[backpressure-send.any.worker.html]
+  [backpressure should be applied to sent messages]
+    expected: FAIL
+
+
+[backpressure-send.any.serviceworker.html]
+  expected: ERROR
+
+[backpressure-send.any.html]
+  [backpressure should be applied to sent messages]
+    expected: FAIL
+
+
+[backpressure-send.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/websockets/stream/tentative/close.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/close.any.js.ini
new file mode 100644
index 00000000000..553ea71142e
--- /dev/null
+++ b/tests/wpt/metadata/websockets/stream/tentative/close.any.js.ini
@@ -0,0 +1,177 @@
+[close.any.worker.html]
+  [unspecified close code with non-empty reason should set code to 1000]
+    expected: FAIL
+
+  [canceling the readable with an invalid code should be ignored]
+    expected: FAIL
+
+  [close() with an overlong reason should throw]
+    expected: FAIL
+
+  [close() with invalid code 5000 should throw]
+    expected: FAIL
+
+  [aborting the writable with a DOMException should be ignored]
+    expected: FAIL
+
+  [close() with invalid code 999 should throw]
+    expected: FAIL
+
+  [canceling the readable with a DOMException should be ignored]
+    expected: FAIL
+
+  [close(true) should throw a TypeError]
+    expected: FAIL
+
+  [canceling the readable with a reason but no code should be ignored]
+    expected: FAIL
+
+  [closing the writable should result in a clean close]
+    expected: FAIL
+
+  [close during handshake should work]
+    expected: FAIL
+
+  [canceling the readable should result in a clean close]
+    expected: FAIL
+
+  [aborting the writable with an invalid code should be ignored]
+    expected: FAIL
+
+  [aborting the writable with a code and reason should use them]
+    expected: FAIL
+
+  [canceling the readable with a code and reason should use them]
+    expected: FAIL
+
+  [canceling the readable with a code should send that code]
+    expected: FAIL
+
+  [close() with invalid code 2999 should throw]
+    expected: FAIL
+
+  [aborting the writable with a reason but no code should be ignored]
+    expected: FAIL
+
+  [aborting the writable with an invalid reason should be ignored]
+    expected: FAIL
+
+  [writer close() promise should not resolve until handshake completes]
+    expected: FAIL
+
+  [aborting the writable with a code should send that code]
+    expected: FAIL
+
+  [canceling the readable with an invalid reason should be ignored]
+    expected: FAIL
+
+  [close() with invalid code 1001 should throw]
+    expected: FAIL
+
+  [close code should be sent to server and reflected back]
+    expected: FAIL
+
+  [no close argument should send empty Close frame]
+    expected: FAIL
+
+  [unspecified close code with empty reason should send empty Close frame]
+    expected: FAIL
+
+  [aborting the writable should result in a clean close]
+    expected: FAIL
+
+  [unspecified close code should send empty Close frame]
+    expected: FAIL
+
+
+[close.any.sharedworker.html]
+  expected: ERROR
+
+[close.any.html]
+  [unspecified close code with non-empty reason should set code to 1000]
+    expected: FAIL
+
+  [canceling the readable with an invalid code should be ignored]
+    expected: FAIL
+
+  [close() with an overlong reason should throw]
+    expected: FAIL
+
+  [close() with invalid code 5000 should throw]
+    expected: FAIL
+
+  [aborting the writable with a DOMException should be ignored]
+    expected: FAIL
+
+  [close() with invalid code 999 should throw]
+    expected: FAIL
+
+  [canceling the readable with a DOMException should be ignored]
+    expected: FAIL
+
+  [close(true) should throw a TypeError]
+    expected: FAIL
+
+  [canceling the readable with a reason but no code should be ignored]
+    expected: FAIL
+
+  [closing the writable should result in a clean close]
+    expected: FAIL
+
+  [close during handshake should work]
+    expected: FAIL
+
+  [canceling the readable should result in a clean close]
+    expected: FAIL
+
+  [aborting the writable with an invalid code should be ignored]
+    expected: FAIL
+
+  [aborting the writable with a code and reason should use them]
+    expected: FAIL
+
+  [canceling the readable with a code and reason should use them]
+    expected: FAIL
+
+  [canceling the readable with a code should send that code]
+    expected: FAIL
+
+  [close() with invalid code 2999 should throw]
+    expected: FAIL
+
+  [aborting the writable with a reason but no code should be ignored]
+    expected: FAIL
+
+  [aborting the writable with an invalid reason should be ignored]
+    expected: FAIL
+
+  [writer close() promise should not resolve until handshake completes]
+    expected: FAIL
+
+  [aborting the writable with a code should send that code]
+    expected: FAIL
+
+  [canceling the readable with an invalid reason should be ignored]
+    expected: FAIL
+
+  [close() with invalid code 1001 should throw]
+    expected: FAIL
+
+  [close code should be sent to server and reflected back]
+    expected: FAIL
+
+  [no close argument should send empty Close frame]
+    expected: FAIL
+
+  [unspecified close code with empty reason should send empty Close frame]
+    expected: FAIL
+
+  [aborting the writable should result in a clean close]
+    expected: FAIL
+
+  [unspecified close code should send empty Close frame]
+    expected: FAIL
+
+
+[close.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/websockets/stream/tentative/constructor.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/constructor.any.js.ini
new file mode 100644
index 00000000000..2af2fb5beb9
--- /dev/null
+++ b/tests/wpt/metadata/websockets/stream/tentative/constructor.any.js.ini
@@ -0,0 +1,57 @@
+[constructor.any.worker.html]
+  [constructing with a valid URL should work]
+    expected: FAIL
+
+  [setting a protocol in the constructor should work]
+    expected: FAIL
+
+  [wss.connection should resolve to the right types]
+    expected: FAIL
+
+  [constructing with no URL should throw]
+    expected: FAIL
+
+  [constructing with invalid options should throw]
+    expected: FAIL
+
+  [connection failure should reject the promises]
+    expected: FAIL
+
+  [protocols should be required to be a list]
+    expected: FAIL
+
+  [constructing with an invalid URL should throw]
+    expected: FAIL
+
+
+[constructor.any.sharedworker.html]
+  expected: ERROR
+
+[constructor.any.html]
+  [constructing with a valid URL should work]
+    expected: FAIL
+
+  [setting a protocol in the constructor should work]
+    expected: FAIL
+
+  [wss.connection should resolve to the right types]
+    expected: FAIL
+
+  [constructing with no URL should throw]
+    expected: FAIL
+
+  [constructing with invalid options should throw]
+    expected: FAIL
+
+  [connection failure should reject the promises]
+    expected: FAIL
+
+  [protocols should be required to be a list]
+    expected: FAIL
+
+  [constructing with an invalid URL should throw]
+    expected: FAIL
+
+
+[constructor.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
index fbf3acecd26..4498caf5968 100644
--- a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
@@ -14,15 +14,25 @@ cookie_test(async t => {
     eventPromise, {changed: [{name: '', value: 'first-value'}]},
     'Observed no-name change');
 
-  eventPromise = observeNextCookieChangeEvent();
-  await cookieStore.set('', '');
-  const actual2 =
-      (await cookieStore.getAll('')).map(({ value }) => value).join(';');
-  const expected2 = '';
-  assert_equals(actual2, expected2);
-  await verifyCookieChangeEvent(
-    eventPromise, {changed: [{name: '', value: ''}]},
-    'Observed no-name change');
+  await promise_rejects_js(
+    t,
+    TypeError,
+    cookieStore.set('', ''),
+    'Expected promise rejection when setting a cookie with' +
+      ' no name and no value');
+
+  await promise_rejects_js(
+    t,
+    TypeError,
+    cookieStore.set({name: '', value: ''}),
+    'Expected promise rejection when setting a cookie with' +
+      ' no name and no value');
+
+  const cookies = await cookieStore.getAll('');
+  assert_equals(cookies.length, 1);
+  assert_equals(cookies[0].name, '');
+  assert_equals(cookies[0].value, 'first-value',
+      'Cookie with no name should still have previous value.');
 
   eventPromise = observeNextCookieChangeEvent();
   await cookieStore.delete('');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
index 5989dcb8be6..ddae23888f4 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
@@ -147,3 +147,25 @@ promise_test(async testCase => {
   const cookie = await cookieStore.get('cookie-name');
   assert_equals(cookie, null);
 }, 'cookieStore.delete with get result');
+
+promise_test(async testCase => {
+  await cookieStore.set('', 'cookie-value');
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete('');
+  });
+
+  await cookieStore.delete('');
+  const cookie = await cookieStore.get('');
+  assert_equals(cookie, null);
+}, 'cookieStore.delete with positional empty name');
+
+promise_test(async testCase => {
+  await cookieStore.set('', 'cookie-value');
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete('');
+  });
+
+  await cookieStore.delete({ name: '' });
+  const cookie = await cookieStore.get('');
+  assert_equals(cookie, null);
+}, 'cookieStore.delete with empty name in options');
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html
index db41a32f251..261b93f5dba 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html
@@ -8,7 +8,7 @@
 <style>
   @font-face {
     font-family: lato-ffs-;
-    src: url(support/fonts/Lato-Medium.ttf);
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
   }
   .test, .ref {
     font-family: lato-ffs-;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html
index 6d066176622..45f316af5c9 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html
@@ -10,16 +10,16 @@
 <style>
   @font-face {
     font-family: lato-ffs-;
-    src: url(support/fonts/Lato-Medium.ttf);
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
   }
   @font-face {
     font-family: lato-ffs-0;
-    src: url(support/fonts/Lato-Medium.ttf);
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
     font-feature-settings: 'liga' off;
   }
   @font-face {
     font-family: lato-ffs-1;
-    src: url(support/fonts/Lato-Medium.ttf);
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
     font-feature-settings: 'liga' on;
   }
   .test, .ref {
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002-ref.html
new file mode 100644
index 00000000000..99084224149
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002-ref.html
@@ -0,0 +1,356 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>CSS Test: feature property settings are resolved in the correct order for 'dlig'.</title>
+<link rel="author" title="Ben Wagner" href="bungeman@chromium.org" />
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#feature-precedence" />
+<style>
+  @font-face {
+    font-family: lato-ffs-;
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
+  }
+ .test, .ref {
+    font-family: lato-ffs-;
+    font-size: 2em;
+    position: absolute;
+  }
+  .test { color: green; }
+  .ref { color: red; }
+
+  .align { width: 1em; }
+
+  .ls-0 { letter-spacing: 0em; }
+  .ls-1 { letter-spacing: 0.1em; }
+</style>
+</head>
+<body>
+<p>Test passes if there is no red visible.</p>
+<table class="ref"><tr>
+
+  <td class="align ff-  fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-0 fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-1 fvl-  ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-n ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr></table>
+<table class="test"><tr>
+
+  <td class="align ff-  fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-0 fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-1 fvl-  ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-n ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr></table>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002.html
new file mode 100644
index 00000000000..05cc4db7464
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002.html
@@ -0,0 +1,383 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>CSS Test: feature property settings are resolved in the correct order for 'dlig'.</title>
+<link rel="author" title="Ben Wagner" href="bungeman@chromium.org" />
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#feature-precedence" />
+<link rel="match" href="font-feature-resolution-002-ref.html" />
+<meta name="assert" content="default < @font-face < font-variant < letter-spacing < font-feature-settings" />
+<style>
+  @font-face {
+    font-family: lato-ffs-;
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
+  }
+  @font-face {
+    font-family: lato-ffs-0;
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
+    font-feature-settings: 'dlig' off;
+  }
+  @font-face {
+    font-family: lato-ffs-1;
+    src: url(support/fonts/Lato-Medium-Liga.ttf);
+    font-feature-settings: 'dlig' on;
+  }
+  .test, .ref {
+    font-family: lato-ffs-;
+    font-size: 2em;
+    position: absolute;
+  }
+  .test { color: green; }
+  .ref { color: red; }
+
+  .align { width: 1em; }
+
+  .ff-  { font-family: lato-ffs- ; }
+  .ff-0 { font-family: lato-ffs-0; }
+  .ff-1 { font-family: lato-ffs-1; }
+
+  .fvl-  { }
+  .fvl-n { font-variant-ligatures: normal; }
+  .fvl-0 { font-variant-ligatures: no-discretionary-ligatures; }
+  .fvl-1 { font-variant-ligatures: discretionary-ligatures; }
+
+  .ls-  { }
+  .ls-0 { letter-spacing: 0em; }
+  .ls-1 { letter-spacing: 0.1em; }
+
+  .ffs-  { }
+  .ffs-n { font-feature-settings: normal; }
+  .ffs-0 { font-feature-settings: 'dlig' off; }
+  .ffs-1 { font-feature-settings: 'dlig' on; }
+</style>
+</head>
+<body>
+<p>Test passes if there is no red visible.</p>
+<table class="ref"><tr>
+
+  <td class="align ff-  fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-  fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-  fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-0 fvl-  ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-n ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-0 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr><tr>
+
+  <td class="align ff-1 fvl-  ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-  ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-n ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-n ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-0 ls-  ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-1">&#xfb06;</td>
+</tr><tr>
+  <td class="align ff-1 fvl-1 ls-  ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs- ">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-n">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-1">&#xfb06;</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs- ">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-n">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-0">s&zwnj;t</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-1">&#xfb06;</td>
+
+</tr></table>
+<table class="test"><tr>
+
+  <td class="align ff-  fvl-  ls-  ffs- ">st</td>
+  <td class="align ff-  fvl-  ls-  ffs-n">st</td>
+  <td class="align ff-  fvl-  ls-  ffs-0">st</td>
+  <td class="align ff-  fvl-  ls-  ffs-1">st</td>
+  <td class="align ff-  fvl-  ls-0 ffs- ">st</td>
+  <td class="align ff-  fvl-  ls-0 ffs-n">st</td>
+  <td class="align ff-  fvl-  ls-0 ffs-0">st</td>
+  <td class="align ff-  fvl-  ls-0 ffs-1">st</td>
+  <td class="align ff-  fvl-  ls-1 ffs- ">st</td>
+  <td class="align ff-  fvl-  ls-1 ffs-n">st</td>
+  <td class="align ff-  fvl-  ls-1 ffs-0">st</td>
+  <td class="align ff-  fvl-  ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-  fvl-n ls-  ffs- ">st</td>
+  <td class="align ff-  fvl-n ls-  ffs-n">st</td>
+  <td class="align ff-  fvl-n ls-  ffs-0">st</td>
+  <td class="align ff-  fvl-n ls-  ffs-1">st</td>
+  <td class="align ff-  fvl-n ls-0 ffs- ">st</td>
+  <td class="align ff-  fvl-n ls-0 ffs-n">st</td>
+  <td class="align ff-  fvl-n ls-0 ffs-0">st</td>
+  <td class="align ff-  fvl-n ls-0 ffs-1">st</td>
+  <td class="align ff-  fvl-n ls-1 ffs- ">st</td>
+  <td class="align ff-  fvl-n ls-1 ffs-n">st</td>
+  <td class="align ff-  fvl-n ls-1 ffs-0">st</td>
+  <td class="align ff-  fvl-n ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-  fvl-0 ls-  ffs- ">st</td>
+  <td class="align ff-  fvl-0 ls-  ffs-n">st</td>
+  <td class="align ff-  fvl-0 ls-  ffs-0">st</td>
+  <td class="align ff-  fvl-0 ls-  ffs-1">st</td>
+  <td class="align ff-  fvl-0 ls-0 ffs- ">st</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-n">st</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-0">st</td>
+  <td class="align ff-  fvl-0 ls-0 ffs-1">st</td>
+  <td class="align ff-  fvl-0 ls-1 ffs- ">st</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-n">st</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-0">st</td>
+  <td class="align ff-  fvl-0 ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-  fvl-1 ls-  ffs- ">st</td>
+  <td class="align ff-  fvl-1 ls-  ffs-n">st</td>
+  <td class="align ff-  fvl-1 ls-  ffs-0">st</td>
+  <td class="align ff-  fvl-1 ls-  ffs-1">st</td>
+  <td class="align ff-  fvl-1 ls-0 ffs- ">st</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-n">st</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-0">st</td>
+  <td class="align ff-  fvl-1 ls-0 ffs-1">st</td>
+  <td class="align ff-  fvl-1 ls-1 ffs- ">st</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-n">st</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-0">st</td>
+  <td class="align ff-  fvl-1 ls-1 ffs-1">st</td>
+
+</tr><tr>
+
+  <td class="align ff-0 fvl-  ls-  ffs- ">st</td>
+  <td class="align ff-0 fvl-  ls-  ffs-n">st</td>
+  <td class="align ff-0 fvl-  ls-  ffs-0">st</td>
+  <td class="align ff-0 fvl-  ls-  ffs-1">st</td>
+  <td class="align ff-0 fvl-  ls-0 ffs- ">st</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-n">st</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-0">st</td>
+  <td class="align ff-0 fvl-  ls-0 ffs-1">st</td>
+  <td class="align ff-0 fvl-  ls-1 ffs- ">st</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-n">st</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-0">st</td>
+  <td class="align ff-0 fvl-  ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-0 fvl-n ls-  ffs- ">st</td>
+  <td class="align ff-0 fvl-n ls-  ffs-n">st</td>
+  <td class="align ff-0 fvl-n ls-  ffs-0">st</td>
+  <td class="align ff-0 fvl-n ls-  ffs-1">st</td>
+  <td class="align ff-0 fvl-n ls-0 ffs- ">st</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-n">st</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-0">st</td>
+  <td class="align ff-0 fvl-n ls-0 ffs-1">st</td>
+  <td class="align ff-0 fvl-n ls-1 ffs- ">st</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-n">st</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-0">st</td>
+  <td class="align ff-0 fvl-n ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-0 fvl-0 ls-  ffs- ">st</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-n">st</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-0">st</td>
+  <td class="align ff-0 fvl-0 ls-  ffs-1">st</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs- ">st</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-n">st</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-0">st</td>
+  <td class="align ff-0 fvl-0 ls-0 ffs-1">st</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs- ">st</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-n">st</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-0">st</td>
+  <td class="align ff-0 fvl-0 ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-0 fvl-1 ls-  ffs- ">st</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-n">st</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-0">st</td>
+  <td class="align ff-0 fvl-1 ls-  ffs-1">st</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs- ">st</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-n">st</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-0">st</td>
+  <td class="align ff-0 fvl-1 ls-0 ffs-1">st</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs- ">st</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-n">st</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-0">st</td>
+  <td class="align ff-0 fvl-1 ls-1 ffs-1">st</td>
+
+</tr><tr>
+
+  <td class="align ff-1 fvl-  ls-  ffs- ">st</td>
+  <td class="align ff-1 fvl-  ls-  ffs-n">st</td>
+  <td class="align ff-1 fvl-  ls-  ffs-0">st</td>
+  <td class="align ff-1 fvl-  ls-  ffs-1">st</td>
+  <td class="align ff-1 fvl-  ls-0 ffs- ">st</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-n">st</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-0">st</td>
+  <td class="align ff-1 fvl-  ls-0 ffs-1">st</td>
+  <td class="align ff-1 fvl-  ls-1 ffs- ">st</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-n">st</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-0">st</td>
+  <td class="align ff-1 fvl-  ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-1 fvl-n ls-  ffs- ">st</td>
+  <td class="align ff-1 fvl-n ls-  ffs-n">st</td>
+  <td class="align ff-1 fvl-n ls-  ffs-0">st</td>
+  <td class="align ff-1 fvl-n ls-  ffs-1">st</td>
+  <td class="align ff-1 fvl-n ls-0 ffs- ">st</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-n">st</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-0">st</td>
+  <td class="align ff-1 fvl-n ls-0 ffs-1">st</td>
+  <td class="align ff-1 fvl-n ls-1 ffs- ">st</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-n">st</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-0">st</td>
+  <td class="align ff-1 fvl-n ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-1 fvl-0 ls-  ffs- ">st</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-n">st</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-0">st</td>
+  <td class="align ff-1 fvl-0 ls-  ffs-1">st</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs- ">st</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-n">st</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-0">st</td>
+  <td class="align ff-1 fvl-0 ls-0 ffs-1">st</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs- ">st</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-n">st</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-0">st</td>
+  <td class="align ff-1 fvl-0 ls-1 ffs-1">st</td>
+</tr><tr>
+  <td class="align ff-1 fvl-1 ls-  ffs- ">st</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-n">st</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-0">st</td>
+  <td class="align ff-1 fvl-1 ls-  ffs-1">st</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs- ">st</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-n">st</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-0">st</td>
+  <td class="align ff-1 fvl-1 ls-0 ffs-1">st</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs- ">st</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-n">st</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-0">st</td>
+  <td class="align ff-1 fvl-1 ls-1 ffs-1">st</td>
+
+</tr></table>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf b/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf
new file mode 100644
index 00000000000..3a0beaea38b
Binary files /dev/null and b/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf differ
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-003.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-003.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-004.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-content-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-multi-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-multi-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-multi-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-multi-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-align-tracks-stretch-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-tracks-stretch-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-003.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-003.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-004.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-005-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-005.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-005.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-005.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-006-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-006.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-006.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-fragmentation-006.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-fragmentation-006.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-gap-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-gap-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-gap-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-gap-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-gap-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-gap-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-gap-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-gap-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-content-baseline-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-content-baseline-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-content-baseline-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-content-baseline-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-content-baseline-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-content-baseline-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-content-baseline-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-content-baseline-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002a-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002a-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002a-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002a-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002a.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002a.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002a.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002b-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002b-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002b-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002b-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002b.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-item-self-baseline-002b.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-item-self-baseline-002b.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-placement-named-lines-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-placement-named-lines-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-template-columns-computed-withcontent.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-grid-template-columns-computed-withcontent.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-003.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-003.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-004.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-005-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-005.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-005.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-005.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-006-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-006.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-006.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-intrinsic-sizing-006.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-intrinsic-sizing-006.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-003.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-003.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-004.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-005-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-005.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-005.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-005.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-006-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-006.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-006.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-006.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-006.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-007-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-007.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-007.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-item-placement-007.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-item-placement-007.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-003.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-003.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-004.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-content-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-content-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-multi-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-multi-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-multi-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-multi-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-justify-tracks-stretch-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-justify-tracks-stretch-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-order-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-order-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-parsing.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-parsing.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-parsing.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-parsing.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-001.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-002.html b/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/masonry.tentative/masonry-subgrid-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-ref.html b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-ref.html
rename to tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type.html b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type.html
rename to tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001.html
index 3d68ca4a7ea..9eacdd7092d 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Lists: test the change of list-style-type</title>
+<link rel="match" href="change-list-style-type-001-ref.html">
 <link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
 <link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=966750">
 <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002-ref.html b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002-ref.html
new file mode 100644
index 00000000000..8a9c9df59d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Lists: test the change of list-style-type</title>
+<ol>
+  <li>text</li>
+  <li><p>text</p></li>
+  <li>
+    <p>text</p>
+  </li>
+  <li>
+    <p></p>
+    <p>text</p>
+  </li>
+  <li>
+    <div>
+      <p>text</p>
+    </div>
+  </li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002.html b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002.html
new file mode 100644
index 00000000000..b76e4e9c312
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Lists: test the change of list-style-type</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="match" href="change-list-style-type-002-ref.html">
+<link rel="help" href="https://www.w3.org/TR/CSS22/generate.html#lists">
+<style>
+.no-marker li {
+  list-style-type: none;
+}
+</style>
+<ol>
+  <li>text</li>
+  <li><p>text</p></li>
+  <li>
+    <p>text</p>
+  </li>
+  <li>
+    <p></p>
+    <p>text</p>
+  </li>
+  <li>
+    <div>
+      <p>text</p>
+    </div>
+  </li>
+</ol>
+<script>
+// Force layout
+document.body.offsetHeight;
+
+// Remove list markers
+document.body.className = "no-marker";
+
+// Force layout
+document.body.offsetHeight;
+
+// Recover list markers
+document.body.className = "";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
index 05da6f89a9e..865a2d01a99 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
@@ -11,6 +11,7 @@
 .decimal { list-style-type: decimal }
 .string { list-style-type: "string" }
 .marker::marker { content: "marker" }
+li { text-transform: lowercase }
 </style>
 <div id="log"></div>
 <ul>
@@ -30,6 +31,7 @@
 const defaultStyles = [
   ["unicode-bidi", "isolate"],
   ["font-variant-numeric", "tabular-nums"],
+  ["text-transform", "none"],
 ];
 for (const target of document.querySelectorAll("li")) {
   const cs = getComputedStyle(target, "::marker");
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default-ref.html
new file mode 100644
index 00000000000..ceec36dd365
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+.outside { list-style-position: outside }
+.inside { list-style-position: inside }
+.type-roman { list-style-type: lower-roman }
+.type-string { list-style-type: "ii. " }
+.content-counter::marker { content: counter(list-item, lower-roman) ". " }
+.content-string::marker { content: "iv. " }
+</style>
+<ol class="outside">
+  <li class="type-roman">TYPE-ROMAN</li>
+  <li class="type-string">TYPE-STRING</li>
+  <li class="content-counter">CONTENT-COUNTER</li>
+  <li class="content-string">CONTENT-STRING</li>
+</ol>
+<ol class="inside">
+  <li class="type-roman">TYPE-ROMAN</li>
+  <li class="type-string">TYPE-STRING</li>
+  <li class="content-counter">CONTENT-COUNTER</li>
+  <li class="content-string">CONTENT-STRING</li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default.html
new file mode 100644
index 00000000000..922c5b0de27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker has 'text-transform: none' by default</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-text-transform-default-ref.html">
+<meta name="assert" content="Checks that ::marker does not inherit the text-transform of the list item">
+<style>
+.outside { list-style-position: outside }
+.inside { list-style-position: inside }
+.type-roman { list-style-type: lower-roman }
+.type-string { list-style-type: "ii. " }
+.content-counter::marker { content: counter(list-item, lower-roman) ". " }
+.content-string::marker { content: "iv. " }
+li {
+  text-transform: uppercase;
+}
+</style>
+<ol class="outside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
+<ol class="inside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase-ref.html
new file mode 100644
index 00000000000..6f959dad676
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+.outside { list-style-position: outside }
+.inside { list-style-position: inside }
+.type-roman { list-style-type: upper-roman }
+.type-string { list-style-type: "II. " }
+.content-counter::marker { content: counter(list-item, upper-roman) ". " }
+.content-string::marker { content: "IV. " }
+</style>
+<ol class="outside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
+<ol class="inside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase.html
new file mode 100644
index 00000000000..d77f4e7de2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker accepts 'text-transform: uppercase'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-text-transform-uppercase-ref.html">
+<meta name="assert" content="Checks that the marker default 'text-transform: none' can be overridden with 'text-transform: uppercase'">
+<style>
+.outside { list-style-position: outside }
+.inside { list-style-position: inside }
+.type-roman { list-style-type: lower-roman }
+.type-string { list-style-type: "ii. " }
+.content-counter::marker { content: counter(list-item, lower-roman) ". " }
+.content-string::marker { content: "iv. " }
+::marker {
+  text-transform: uppercase;
+}
+</style>
+<ol class="outside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
+<ol class="inside">
+  <li class="type-roman">type-roman</li>
+  <li class="type-string">type-string</li>
+  <li class="content-counter">content-counter</li>
+  <li class="content-string">content-string</li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
index faf7c904fb0..bc26e202696 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
@@ -158,6 +158,14 @@ const interpolationTests = [
     midPoint: "\"bar\"",
   },
 
+  // ::marker supports `text-transform`
+  {
+    property: "text-transform",
+    from: "lowercase",
+    to: "uppercase",
+    midPoint: "uppercase",
+  },
+
   // ::marker does NOT support layout properties
   {
     property: "display",
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
index e27decc1334..669d040671b 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
@@ -63,6 +63,9 @@ test_pseudo_computed_value("::marker", "transition-duration", "2s");
 test_pseudo_computed_value("::marker", "transition-property", "display");
 test_pseudo_computed_value("::marker", "transition-timing-function", "linear");
 
+// ::marker supports `text-transform`
+test_pseudo_computed_value("::marker", "text-transform", "uppercase");
+
 // ::marker does NOT support layout properties
 test_pseudo_computed_value("::marker", "display", "none", ["block", "inline", "inline-block"]);
 test_pseudo_computed_value("::marker", "position", "absolute", "static");
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html
new file mode 100644
index 00000000000..0677a4b6b39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: yellow;
+      color: green;
+      display: inline;
+      font-size: 300%;
+    }
+  </style>
+
+  <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div contenteditable="true" id="test">Selected Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html
new file mode 100644
index 00000000000..b49b0b00fa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  input
+    {
+      background-color: yellow;
+      color: green;
+      font-family: monospace;
+      font-size: 48px;
+      line-height: 56px;
+      padding: 0px;
+      width: 13ch;
+    }
+  </style>
+
+  <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div><input type="text" value="Selected Text"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html
new file mode 100644
index 00000000000..b0c60408f76
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: yellow;
+      display: inline-block;
+      font-size: 48px;
+      letter-spacing: 1em;
+    }
+
+  span
+    {
+      background-color: orange;
+    }
+  </style>
+
+  <p>Test passes if the background of characters "c" and "t" is orange (and only those 2 characters) and if the space between those 2 characters is also orange.
+
+  <div>Sele<span>ct</span>ed Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html
new file mode 100644
index 00000000000..38650c90b40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: yellow;
+      display: inline-block;
+      font-size: 48px;
+      letter-spacing: 1em;
+    }
+
+  span
+    {
+      background-color: orange;
+    }
+  </style>
+
+  <p>Test passes if the background of characters "c" and "t" is orange and if the space between those 2 characters is yellow (and not orange).
+
+  <div>Sele<span>c</span> <span>t</span>ed Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html
new file mode 100644
index 00000000000..825a4247a20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  textarea
+    {
+      background-color: yellow;
+      color: green;
+      font-family: monospace;
+      font-size: 48px;
+      height: 112px;
+      line-height: 56px;
+      padding: 0px;
+      resize: none;
+      width: 8ch;
+    }
+  </style>
+
+  <p>Test passes if each glyph of both "Selected" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div><textarea rows="2" cols="8">Selected Selected </textarea></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-contenteditable-011.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-contenteditable-011.html
new file mode 100644
index 00000000000..bc01d103ea9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-contenteditable-011.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: active selection and contenteditable element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-selectors">
+  <link rel="match" href="reference/selection-contenteditable-011-ref.html">
+
+  <meta content="" name="flags">
+
+  <style>
+  div
+    {
+      background-color: red;
+      color: yellow;
+      display: inline;
+      font-size: 300%;
+    }
+
+  div::selection
+    {
+      background-color: yellow;
+      color: green;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  var targetRange = document.createRange();
+  /* We first create an empty range */
+  targetRange.selectNodeContents(document.getElementById("test"));
+  /* Then we set the range boundaries to the children of div#test */
+  window.getSelection().addRange(targetRange);
+  /* Finally, we now select such range of content */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div contenteditable="true" id="test">Selected Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-input-011.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-input-011.html
new file mode 100644
index 00000000000..77f7188c71e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-input-011.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: active selection and input type="text" element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-selectors">
+  <link rel="match" href="reference/selection-input-011-ref.html">
+
+  <meta content="" name="flags">
+
+  <style>
+  input
+    {
+      background-color: red;
+      color: yellow;
+      font-family: monospace;
+      font-size: 48px;
+      line-height: 56px;
+      padding: 0px;
+      width: 13ch;
+    }
+
+  input::selection
+    {
+      background-color: yellow;
+      color: green;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  document.getElementById("test").select();
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div><input type="text" value="Selected Text" id="test"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-011.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-011.html
new file mode 100644
index 00000000000..70ab69fb492
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-011.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: active selection and inter-character spacing</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-bounds">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#letter-spacing-property">
+  <link rel="match" href="reference/selection-intercharacter-011-ref.html">
+
+  <meta content="may" name="flags">
+  <meta name="assert" content="This test verifies that intercharacter spacing may be part of the overlay area. When intercharacter spacing is part of the overlay area, then it belongs to the innermost element which contains both characters and which contains such spacing when both characters are selected. In this test, the 'c' and the 't' characters and the space between these characters belong to the same element. Therefore, the 'c' character, the 't' character and the space between these characters have the same orange background color painting.">
+
+  <style>
+  div
+    {
+      font-size: 48px;
+      letter-spacing: 1em;
+    }
+
+  div::selection
+    {
+      background-color: yellow;
+    }
+
+  span::selection
+    {
+      background-color: orange;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  var targetRange = document.createRange();
+  /* We first create an empty range */
+  targetRange.selectNodeContents(document.getElementById("test"));
+  /* Then we set the range boundaries to the children of div#test */
+  window.getSelection().addRange(targetRange);
+  /* Finally, we now select such range of content */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>Test passes if the background of characters "c" and "t" is orange (and only those 2 characters) and if the space between those 2 characters is also orange.
+
+  <div id="test">Sele<span>ct</span>ed Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-012.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-012.html
new file mode 100644
index 00000000000..a04fc33e2fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-012.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: active selection and inter-character spacing</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-bounds">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#letter-spacing-property">
+  <link rel="match" href="reference/selection-intercharacter-012-ref.html">
+
+  <meta content="may" name="flags">
+  <meta name="assert" content="In this test, the 'c' and the 't' characters share the same level in the containment hierarchy but the space between these characters does not. Therefore, only the 'c' and the 't' characters themselves have an orange background color painting.">
+
+  <style>
+  div
+    {
+      font-size: 48px;
+      letter-spacing: 1em;
+    }
+
+  div::selection
+    {
+      background-color: yellow;
+    }
+
+  span::selection
+    {
+      background-color: orange;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  var targetRange = document.createRange();
+  /* We first create an empty range */
+  targetRange.selectNodeContents(document.getElementById("test"));
+  /* Then we set the range boundaries to the children of div#test */
+  window.getSelection().addRange(targetRange);
+  /* Finally, we now select such range of content */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>Test passes if the background of characters "c" and "t" is orange and if the space between those 2 characters is yellow (and not orange).
+
+  <div id="test">Sele<span>c</span> <span>t</span>ed Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-textarea-011.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-textarea-011.html
new file mode 100644
index 00000000000..f21e5e190ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-textarea-011.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: active selection and textarea element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-selectors">
+  <link rel="match" href="reference/selection-textarea-011-ref.html">
+
+  <meta content="" name="flags">
+
+  <style>
+  textarea
+    {
+      background-color: red;
+      color: yellow;
+      font-family: monospace;
+      font-size: 48px;
+      height: 112px;
+      line-height: 56px;
+      padding: 0px;
+      resize: none;
+      width: 8ch;
+    }
+
+  textarea::selection
+    {
+      background-color: yellow;
+      color: green;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  document.getElementById("test").select();
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>Test passes if each glyph of both "Selected" is green with a yellow background and if there is <strong>no red</strong>.
+
+  <div><textarea id="test" rows="2" cols="8">Selected Selected </textarea></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/available-height-for-replaced-content-001.html b/tests/wpt/web-platform-tests/css/css-sizing/available-height-for-replaced-content-001.html
new file mode 100644
index 00000000000..f6ea13618ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/available-height-for-replaced-content-001.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: available height for replaced content</title>
+<link rel="help" href="https://drafts.csswg.org/css-sizing/#available">
+<link rel="help" href="https://crrev.com/acc04ddbdc31a7c5bda78f88719df43367630fed">
+<meta name="assert" content="This test ensures that the available height for replaced content is calculated correctly when the parent has border, padding or min-height."/>
+<style>
+#wrapper {
+  width: 200px;
+  min-height: 1px;
+  height: 20px;
+  border: 1px solid green;
+  padding: 50px;
+}
+img {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  width: 100%;
+  height: 100%;
+  background: silver;
+}
+</style>
+<div id="log"></div>
+<div id="wrapper">
+  <img src="" data-expected-height="20">
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script>
+  checkLayout('img');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html
new file mode 100644
index 00000000000..ab9d8392745
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html
@@ -0,0 +1,20 @@
+<!doctype HTML>
+<html>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS2/tables.html#borders">
+<link rel="help" href="https://drafts.csswg.org/css-will-change/#will-change">
+<style>
+  td { border: 3px solid black; }
+  .composited { will-change: transform; }
+</style>
+<table style="border-collapse: collapse">
+  <tr class=composited>
+    <td style="border-color: green">First</td>
+    <td >Second</td>
+  </tr>
+  <tr class=composited>
+    <td>Third</td>
+    <td>Fourth</td>
+  </tr>
+</table>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing.html b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing.html
new file mode 100644
index 00000000000..f7b19676bdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing.html
@@ -0,0 +1,29 @@
+<!doctype HTML>
+<html class=reftest-wait>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS2/tables.html#borders">
+<link rel="help" href="https://drafts.csswg.org/css-will-change/#will-change">
+<link rel="match" href="collapsed-border-color-change-with-compositing-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+  td { border: 3px solid black; }
+  .composited { will-change: transform; }
+</style>
+<table style="border-collapse: collapse">
+  <tr class=composited>
+    <td id=target style="border-color: red">First</td>
+    <td >Second</td>
+  </tr>
+  <tr class=composited>
+    <td>Third</td>
+    <td>Fourth</td>
+  </tr>
+</table>
+</html>
+<script>
+  onload = () => requestAnimationFrame(() =>
+    requestAnimationFrame(() => {
+      target.style.borderColor = 'green';
+      document.documentElement.classList.remove('reftest-wait');
+    }));
+</script>
diff --git a/tests/wpt/web-platform-tests/custom-elements/state.tentative/ElementInternals-states.html b/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html
similarity index 100%
rename from tests/wpt/web-platform-tests/custom-elements/state.tentative/ElementInternals-states.html
rename to tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html
diff --git a/tests/wpt/web-platform-tests/custom-elements/state.tentative/README.md b/tests/wpt/web-platform-tests/custom-elements/state/tentative/README.md
similarity index 100%
rename from tests/wpt/web-platform-tests/custom-elements/state.tentative/README.md
rename to tests/wpt/web-platform-tests/custom-elements/state/tentative/README.md
diff --git a/tests/wpt/web-platform-tests/custom-elements/state.tentative/state-pseudo-class.html b/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html
similarity index 100%
rename from tests/wpt/web-platform-tests/custom-elements/state.tentative/state-pseudo-class.html
rename to tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/file-names.md b/tests/wpt/web-platform-tests/docs/writing-tests/file-names.md
index 57a91f0d833..e68af233f15 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/file-names.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/file-names.md
@@ -4,6 +4,10 @@ The test filename is significant in determining the type of test it
 contains, and enabling specific optional features. This page documents
 the various flags available and their meaning.
 
+In some cases flags can also be set via a directory name, such that any file
+that is a (recursive) descendent of the directory inherits the flag value.
+These are individually documented for each flag that supports it.
+
 
 ### Test Type
 
@@ -33,7 +37,7 @@ themselves precede any test type flag, but are otherwise unordered.
  : Indicates that a test is loaded over HTTP/2.
 
 `.sub`
- : Indicates that a test uses the [server-side substitution][]
+ : Indicates that a test uses the [server-side substitution](server-pipes.html#sub)
    feature.
 
 `.window`
@@ -61,8 +65,11 @@ themselves precede any test type flag, but are otherwise unordered.
    context why the test is tentative and what needs to be resolved to make it
    non-tentative.
 
+   This flag can be enabled for an entire directory (and all its descendents),
+   by naming the directory 'tentative'. For example, every test underneath
+   'foo/tentative/' will be considered tentative.
+
 It's preferable that `.window`, `.worker`, and `.any` are immediately followed
 by their final `.js` extension.
 
-[server-side substitution]: https://wptserve.readthedocs.io/en/latest/pipes.html#sub
 [RFC 2119]: https://tools.ietf.org/html/rfc2119
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html
index d0db661c66e..c693425a7cc 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html
@@ -61,7 +61,7 @@ promise_test(async t => {
   let report = await receiveReport(opener_report_token, "access-from-coop-page")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
-  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
+  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
   assert_equals(report.body["violation-type"], "access-from-coop-page");
   assert_equals(report.body["disposition"], "reporting");
   assert_equals(report.body["effective-policy"], "same-origin-plus-coep");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop.https.html
index 48dfa5113d0..fc3ff122f9e 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop.https.html
@@ -61,7 +61,7 @@ promise_test(async t => {
   let report = await receiveReport(opener_report_token, "access-from-coop-page")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
-  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
+  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
   assert_equals(report.body["violation-type"], "access-from-coop-page");
   assert_equals(report.body["disposition"], "enforce");
   assert_equals(report.body["effective-policy"], "same-origin-plus-coep");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html
index 05e1320e992..1c9436ce8ba 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html
@@ -55,7 +55,7 @@ promise_test(async t => {
   let report = await receiveReport(opener_report_token, "access-to-coop-page")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
-  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
+  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
   assert_equals(report.body["violation-type"], "access-to-coop-page");
   assert_equals(report.body["disposition"], "reporting");
   assert_equals(report.body["effective-policy"], "same-origin-plus-coep");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop.https.html
index de2974aa637..1d4c117ed2b 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop.https.html
@@ -55,7 +55,7 @@ promise_test(async t => {
   let report = await receiveReport(opener_report_token, "access-to-coop-page")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
-  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
+  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
   assert_equals(report.body["violation-type"], "access-to-coop-page");
   assert_equals(report.body["disposition"], "enforce");
   assert_equals(report.body["effective-policy"], "same-origin-plus-coep");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
index 494c9df67b9..f056bc54b93 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
@@ -111,7 +111,7 @@ let tests = [
     SAME_ORIGIN,
     "",
     "",
-    `same-origin; report-to="${popupReportEndpoint.name}"`,
+    `same-origin; report-to="${popupReportOnlyEndpoint.name}"`,
     "require-corp",
     [
       {
@@ -127,7 +127,8 @@ let tests = [
           "url": `${location.href}`,
           "type": "coop"
         }
-      },]
+      }
+    ]
   ],
   // Open a cross-origin popup with a same-origin COOP report only. A report is
   // sent to both this page's endpoint and the popup's.
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.py b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.py
index 2617361b0b3..2f1cf1bd4cf 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.py
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/dispatcher.py
@@ -9,12 +9,17 @@ def main(request, response):
         return b''
 
     uuid = request.GET[b'uuid']
+    stashed = request.server.stash.take(uuid)
+    if stashed is None:
+        stashed = []
 
     if request.method == u'POST':
-        return request.server.stash.put(uuid, request.body)
+        stashed.append(request.body)
+        ret = b'done'
     else:
-        body = request.server.stash.take(uuid)
-        if body is None:
-            return b'not ready'
+        if len(stashed) == 0:
+            ret = b'not ready'
         else:
-            return body
+            ret = stashed.pop(0)
+    request.server.stash.put(uuid, stashed)
+    return ret;
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js b/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js
index 3ef347f98fe..3df2d48e086 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js
@@ -31,10 +31,10 @@ async function serialize_handle(handle) {
 // FileSystemDirectoryHandle.
 async function serialize_file_system_handle(handle) {
   const read_permission =
-    await handle.queryPermission({ writable: false });
+    await handle.queryPermission({ mode: 'read' });
 
   const write_permission =
-    await handle.queryPermission({ writable: true })
+    await handle.queryPermission({ mode: 'readwrite' })
 
   return {
     kind: handle.kind,
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js b/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
index cd1613eae5d..1f944b0ad6a 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
@@ -41,14 +41,14 @@ function directory_test(func, description) {
 }
 
 directory_test(async (t, dir) => {
-  assert_equals(await dir.queryPermission({writable: false}), 'granted');
+  assert_equals(await dir.queryPermission({mode: 'read'}), 'granted');
 }, 'User succesfully selected an empty directory.');
 
 directory_test(async (t, dir) => {
-  const status = await dir.queryPermission({writable: true});
+  const status = await dir.queryPermission({mode: 'readwrite'});
   if (status == 'granted')
     return;
 
   await window.test_driver.bless('ask for write permission');
-  assert_equals(await dir.requestPermission({writable: true}), 'granted');
+  assert_equals(await dir.requestPermission({mode: 'readwrite'}), 'granted');
 }, 'User granted write access.');
diff --git a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html b/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
index 022f67771d7..451a0fb9c7f 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
@@ -26,7 +26,7 @@
 
     promise_test(async t => {
       assert_equals(await file.queryPermission(), 'granted');
-      assert_equals(await file.queryPermission({ writable: true }), 'granted');
+      assert_equals(await file.queryPermission({ mode: 'readwrite' }), 'granted');
     }, 'showSaveFilePicker returns correct permissions');
   }, 'showSaveFilePicker works');
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html
new file mode 100644
index 00000000000..799b1460dc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ScrollTimeline constructor</title>
+  <link rel="help" href="https://wicg.github.io/scroll-animations/#scrolltimeline-interface">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+.scroller {
+  height: 100px;
+  width: 100px;
+  overflow: scroll;
+}
+
+.content {
+  height: 500px;
+  width: 500px;
+}
+</style>
+
+<div class="scroller">
+  <div class="content"></div>
+</div>
+
+<script>
+'use strict';
+
+test(t => {
+  assert_array_equals(new ScrollTimeline({timeRange: 100}).scrollOffsets, []);
+}, 'A ScrollTimeline created with the default scrollOffsets should default to []');
+
+test(t => {
+  assert_array_equals(new ScrollTimeline({timeRange: 100, scrollOffsets: []}).scrollOffsets, []);
+}, 'A ScrollTimeline created with empty scrollOffsets should resolve to []');
+
+test(t => {
+  assert_array_equals(new ScrollTimeline({timeRange: 100, scrollOffsets: ['20%', 'auto']}).scrollOffsets, ['20%', 'auto']);
+}, 'A ScrollTimeline created with last \'auto\' offset in scrollOffsets should be allowed.');
+
+test(t => {
+  let constructorFunc = function() {
+    new ScrollTimeline({timeRange: 100, scrollOffsets: null})
+  };
+  assert_throws_js(TypeError, constructorFunc);
+}, 'Creating a ScrollTimeline with an invalid scrollOffsets value should throw');
+
+test(t => {
+  let constructorFunc = function() {
+    new ScrollTimeline({timeRange: 100, scrollOffsets: ['auto']})
+  };
+  assert_throws_js(TypeError, constructorFunc);
+}, 'Creating a ScrollTimeline with an scrollOffsets value of [\'auto\'] should throw');
+
+const gValidScrollOffsetValues = [
+  0,
+  'calc(100% - 80px)',
+];
+
+const gValidScrollOffsetSuffixes = [
+  // Relative lengths.
+  'em',
+  'ex',
+  'ch',
+  'rem',
+  'vw',
+  'vh',
+  'vmin',
+  'vmax',
+  // Absolute lengths.
+  'cm',
+  'mm',
+  'q',
+  'in',
+  'pc',
+  'pt',
+  'px',
+  // Percentage.
+  '%',
+];
+
+for (let offset of gValidScrollOffsetValues) {
+  test(function() {
+    const scrollTimeline = new ScrollTimeline(
+        {timeRange: 100, scrollOffsets: [offset, offset]});
+
+    // Special case for 0; this is a valid value, but like computed style will
+    // be output as '0px' when queried.
+    if (offset === 0) offset = '0px';
+
+    assert_array_equals(scrollTimeline.scrollOffsets, [offset, offset]);
+  }, '\'' + offset + '\' is a valid scroll offset value');
+}
+
+for (const suffix of gValidScrollOffsetSuffixes) {
+  test(function() {
+    const offset = '75' + suffix;
+    const scrollTimeline = new ScrollTimeline(
+        {timeRange: 100, scrollOffsets: [offset, offset]});
+
+    assert_array_equals(scrollTimeline.scrollOffsets, [offset, offset]);
+  }, '\'' + suffix + '\' is a valid scroll offset unit');
+}
+
+// These are deliberately incomplete, just a random sampling of invalid
+// values/units.
+const gInvalidScrollOffsetValues = [
+  '',
+  'calc(360deg / 4)',
+  'left',
+  '#ff0000',
+  'rgb(0, 128, 0)',
+  'url("http://www.example.com/pinkish.gif")',
+  'this_is_garbage',
+  // Multiple valid values.
+  '100px 5%',
+];
+
+const gInvalidScrollOffsetSuffixes = [
+  'deg',
+  's',
+  'Hz',
+  'dpi',
+];
+
+for (const offset of gInvalidScrollOffsetValues) {
+  test(function() {
+    const constructorFunc = function() {
+      new ScrollTimeline(
+          {timeRange: 100, scrollOffsets: ['0px', offset]})
+    };
+    assert_throws_js(TypeError, constructorFunc);
+  }, '\'' + offset + '\' is an invalid scroll offset value in scrollOffsets');
+}
+
+for (const suffix of gInvalidScrollOffsetSuffixes) {
+  test(function() {
+    const offset = '75' + suffix;
+    const constructorFunc = function() {
+      new ScrollTimeline(
+          {timeRange: 100, scrollOffsets: ['0px', offset]});
+    };
+    assert_throws_js(TypeError, constructorFunc);
+  }, '\'' + suffix + '\' is an invalid scroll offset unit in scrollOffsets');
+}
+
+const offset_target = document.createElement('div');
+
+const gValidElementBasedScrollOffsetValues = [
+  {target: offset_target},
+  {target: offset_target, threshold: 0},
+  {target: offset_target, threshold: 0.5},
+  {target: offset_target, threshold: 1},
+];
+
+for (let offset of gValidElementBasedScrollOffsetValues) {
+  test(function() {
+    const scrollTimeline = new ScrollTimeline(
+        {timeRange: 100, scrollOffsets: [offset, offset]});
+
+    // Special case unspecified threshold since it gets initialized to 0.
+    if (!offset.hasOwnProperty('threshold'))
+      offset.threshold = 0;
+
+    assert_equals(scrollTimeline.scrollOffsets[0].target, offset.target);
+    assert_equals(scrollTimeline.scrollOffsets[0].threshold, offset.threshold);
+    assert_equals(scrollTimeline.scrollOffsets[1].target, offset.target);
+    assert_equals(scrollTimeline.scrollOffsets[1].threshold, offset.threshold);
+  }, '\'' + JSON.stringify(offset) + '\' is a valid scroll offset value');
+}
+
+const gInvalidElementBasedScrollOffsetValues = [
+  {}, // empty
+  {target: offset_target, threshold: "test"},
+  {target: offset_target, threshold: 2},
+  {target: offset_target, threshold: -0.2},
+];
+
+for (let offset of gInvalidElementBasedScrollOffsetValues) {
+  test(function() {
+    const constructorFunc = function() {
+      new ScrollTimeline(
+          {timeRange: 100, scrollOffsets: [offset]})
+    };
+    assert_throws_js(TypeError, constructorFunc);
+  }, '\'' + JSON.stringify(offset) + '\' is an invalid scroll offset value in scrollOffsets');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index ad053dcca58..85c8bf34179 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -206,6 +206,15 @@ def check_ahem_copy(repo_root, path):
     return []
 
 
+def check_tentative_directories(repo_root, path):
+    # type: (Text, Text) -> List[rules.Error]
+    path_parts = path.split(os.path.sep)
+    for directory in path_parts[:-1]:
+        if "tentative" in directory and directory != "tentative":
+            return [rules.TentativeDirectoryName.error(path)]
+    return []
+
+
 def check_git_ignore(repo_root, paths):
     # type: (Text, List[Text]) -> List[rules.Error]
     errors = []
@@ -987,7 +996,7 @@ def lint(repo_root, paths, output_format, ignore_glob=None):
     return sum(itervalues(error_count))
 
 path_lints = [check_file_type, check_path_length, check_worker_collision, check_ahem_copy,
-              check_gitignore_file]
+              check_tentative_directories, check_gitignore_file]
 all_paths_lints = [check_css_globally_unique, check_unique_testharness_basenames]
 file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata,
               check_ahem_system_font]
diff --git a/tests/wpt/web-platform-tests/tools/lint/rules.py b/tests/wpt/web-platform-tests/tools/lint/rules.py
index c67745792d1..1bf78b7bb40 100644
--- a/tests/wpt/web-platform-tests/tools/lint/rules.py
+++ b/tests/wpt/web-platform-tests/tools/lint/rules.py
@@ -341,6 +341,12 @@ class DuplicateBasenamePath(Rule):
     to_fix = "rename files so they have unique basename paths"
 
 
+class TentativeDirectoryName(Rule):
+    name = "TENTATIVE-DIRECTORY-NAME"
+    description = "Directories for tentative tests must be named exactly 'tentative'"
+    to_fix = "rename directory to be called 'tentative'"
+
+
 class Regexp(six.with_metaclass(abc.ABCMeta)):
     @abc.abstractproperty
     def pattern(self):
@@ -414,6 +420,11 @@ class WebPlatformTestRegexp(Regexp):
     pattern = br"web\-platform\.test"
     name = "WEB-PLATFORM.TEST"
     description = "Internal web-platform.test domain used"
+    to_fix = """
+        use [server-side substitution](https://web-platform-tests.org/writing-tests/server-pipes.html#sub),
+        along with the [`.sub` filename-flag](https://web-platform-tests.org/writing-tests/file-names.html#test-features),
+        to replace web-platform.test with `{{domains[]}}`
+    """
 
 
 class Webidl2Regexp(Regexp):
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
index 558b0ed4f64..7368216cd3d 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
@@ -79,6 +79,29 @@ def test_ahem_copy_negative(path):
 
     assert errors == []
 
+@pytest.mark.parametrize("path", ["css/foo.tentative/bar.html",
+                                  "css/.tentative/bar.html",
+                                  "css/tentative.bar/baz.html",
+                                  "css/bar-tentative/baz.html"])
+def test_tentative_directories(path):
+    path = os.path.join(*path.split("/"))
+    expected_error = ("TENTATIVE-DIRECTORY-NAME",
+                      "Directories for tentative tests must be named exactly 'tentative'",
+                      path,
+                      None)
+
+    errors = check_path("/foo/", path)
+
+    assert errors == [expected_error]
+
+@pytest.mark.parametrize("path", ["css/bar.html",
+                                  "css/tentative/baz.html"])
+def test_tentative_directories_negative(path):
+    path = os.path.join(*path.split("/"))
+    errors = check_path("/foo/", path)
+
+    assert errors == []
+
 @pytest.mark.parametrize("path", ["elsewhere/.gitignore",
                                   "else/where/.gitignore"
                                   "elsewhere/tools/.gitignore",
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index 09316bd052c..5a7310213a7 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -418,7 +418,7 @@ class SourceFile(object):
         tentative file.
 
         See https://web-platform-tests.org/writing-tests/file-names.html#test-features"""
-        return "tentative" in self.meta_flags
+        return "tentative" in self.meta_flags or "tentative" in self.dir_path.split(os.path.sep)
 
     @property
     def name_is_print_reftest(self):
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
index b4ba4638708..cc97619bb57 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
@@ -126,6 +126,9 @@ def test_name_is_tentative():
     s = create("css/css-ui/appearance-revert-001.tentative.html")
     assert s.name_is_tentative
 
+    s = create("css/css-ui/tentative/appearance-revert-001.html")
+    assert s.name_is_tentative
+
     s = create("css/css-ui/appearance-revert-001.html")
     assert not s.name_is_tentative
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 85b7b63c219..6db3415a480 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -560,6 +560,11 @@ class Chrome(Browser):
         os.remove(installer_path)
         return self.find_nightly_binary(dest, channel)
 
+    def install_mojojs(self, dest):
+        url = self._latest_chromium_snapshot_url() + "mojojs.zip"
+        self.logger.info("Downloading Mojo bindings from %s" % url)
+        unzip(get(url).raw, dest)
+
     def _chromedriver_platform_string(self):
         platform = self.platforms.get(uname[0])
 
@@ -675,13 +680,21 @@ class Chrome(Browser):
             else self._chromium_chromedriver_url(None)
         self.logger.info("Downloading ChromeDriver from %s" % url)
         unzip(get(url).raw, dest)
+
+        # The two sources of ChromeDriver have different zip structures:
+        # * Chromium archives the binary inside a chromedriver_* directory;
+        # * Chrome archives the binary directly.
+        # We want to make sure the binary always ends up directly in bin/.
         chromedriver_dir = os.path.join(
             dest, 'chromedriver_%s' % self._chromedriver_platform_string())
-        unzipped_path = find_executable("chromedriver", chromedriver_dir)
-        assert unzipped_path is not None
-        shutil.move(unzipped_path, dest)
-        rmtree(chromedriver_dir)
-        return find_executable("chromedriver", dest)
+        binary_path = find_executable("chromedriver", chromedriver_dir)
+        if binary_path is not None:
+            shutil.move(binary_path, dest)
+            rmtree(chromedriver_dir)
+
+        binary_path = find_executable("chromedriver", dest)
+        assert binary_path is not None
+        return binary_path
 
     def install_webdriver(self, dest=None, channel=None, browser_binary=None):
         if channel == "nightly":
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 79329a5dab4..aec874fa196 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -321,6 +321,13 @@ class Chrome(BrowserSetup):
                 kwargs["binary"] = binary
             else:
                 raise WptrunError("Unable to locate Chrome binary")
+        if browser_channel == "nightly":
+            try:
+                self.browser.install_mojojs(self.venv.path)
+                kwargs["enable_mojojs"] = True
+                logger.info("MojoJS enabled")
+            except Exception as e:
+                logger.error("Cannot enable MojoJS: %s" % e)
         if kwargs["webdriver_binary"] is None:
             webdriver_binary = None
             if not kwargs["install_webdriver"]:
@@ -744,12 +751,8 @@ def setup_wptrunner(venv, **kwargs):
 
     affected_revish = kwargs.get("affected")
     if affected_revish is not None:
-        # TODO: Consolidate with `./wpt tests-affected --ignore-rules`:
-        # https://github.com/web-platform-tests/wpt/issues/14560
         files_changed, _ = testfiles.files_changed(
-            affected_revish,
-            ignore_rules=["resources/testharness*"],
-            include_uncommitted=True, include_new=True)
+            affected_revish, include_uncommitted=True, include_new=True)
         # TODO: Perhaps use wptrunner.testloader.ManifestLoader here
         # and remove the manifest-related code from testfiles.
         # https://github.com/web-platform-tests/wpt/issues/14421
diff --git a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
index c990aa21a65..7f966a62526 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
@@ -35,6 +35,8 @@ if MYPY:
     from typing import Text
     from typing import Tuple
 
+DEFAULT_IGNORE_RULERS = ("resources/testharness*", "resources/testdriver*")
+
 here = ensure_text(os.path.dirname(__file__))
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 
@@ -167,8 +169,8 @@ def repo_files_changed(revish, include_uncommitted=False, include_new=False):
 def exclude_ignored(files, ignore_rules):
     # type: (Iterable[Text], Optional[Sequence[Text]]) -> Tuple[List[Text], List[Text]]
     if ignore_rules is None:
-        ignore_rules = []
-    compiled_ignore_rules = [compile_ignore_rule(item) for item in ignore_rules]
+        ignore_rules = DEFAULT_IGNORE_RULERS
+    compiled_ignore_rules = [compile_ignore_rule(item) for item in set(ignore_rules)]
 
     changed = []
     ignored = []
@@ -334,14 +336,13 @@ def get_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument("revish", default=None, help="Commits to consider. Defaults to the "
                         "commits on the current branch", nargs="?")
-    # TODO: Consolidate with `./wpt run --affected`:
-    # https://github.com/web-platform-tests/wpt/issues/14560
-    parser.add_argument("--ignore-rules", nargs="*", type=set,  # type: ignore
-                        default={"resources/testharness*"},
-                        help="Rules for paths to exclude from lists of changes. Rules are paths "
-                        "relative to the test root, with * before a separator or the end matching "
-                        "anything other than a path separator and ** in that position matching "
-                        "anything")
+    parser.add_argument("--ignore-rule", action="append",
+                        help="Override the rules for paths to exclude from lists of changes. "
+                        "Rules are paths relative to the test root, with * before a separator "
+                        "or the end matching anything other than a path separator and ** in that "
+                        "position matching anything. This flag can be used multiple times for "
+                        "multiple rules. Specifying this flag overrides the default: " +
+                        ", ".join(DEFAULT_IGNORE_RULERS))
     parser.add_argument("--modified", action="store_true",
                         help="Include files under version control that have been "
                         "modified or staged")
@@ -377,7 +378,7 @@ def run_changed_files(**kwargs):
     # type: (**Any) -> None
     revish = get_revish(**kwargs)
     changed, _ = files_changed(revish,
-                               kwargs["ignore_rules"],
+                               kwargs["ignore_rule"],
                                include_uncommitted=kwargs["modified"],
                                include_new=kwargs["new"])
 
@@ -391,7 +392,8 @@ def run_changed_files(**kwargs):
 def run_tests_affected(**kwargs):
     # type: (**Any) -> None
     revish = get_revish(**kwargs)
-    changed, _ = files_changed(revish, kwargs["ignore_rules"],
+    changed, _ = files_changed(revish,
+                               kwargs["ignore_rule"],
                                include_uncommitted=kwargs["modified"],
                                include_new=kwargs["new"])
     manifest_path = os.path.join(kwargs["metadata_root"], "MANIFEST.json")
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_install.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_install.py
new file mode 100644
index 00000000000..7d55d419c14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_install.py
@@ -0,0 +1,86 @@
+import logging
+import os
+import sys
+
+import pytest
+
+from tools.wpt import browser, utils, wpt
+
+
+@pytest.mark.slow
+@pytest.mark.remote_network
+def test_install_chromium():
+    if sys.platform == "win32":
+        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-win")
+    elif sys.platform == "darwin":
+        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-mac")
+    else:
+        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-linux")
+
+    if os.path.exists(chromium_path):
+        utils.rmtree(chromium_path)
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["install", "chrome", "browser", "--channel=nightly"])
+    assert excinfo.value.code == 0
+    assert os.path.exists(chromium_path)
+    utils.rmtree(chromium_path)
+
+
+@pytest.mark.slow
+@pytest.mark.remote_network
+def test_install_chromedriver_official():
+    # This is not technically an integration test as we do not want to require Chrome Stable to run it.
+    chrome = browser.Chrome(logging.getLogger("Chrome"))
+    if sys.platform == "win32":
+        dest = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "Scripts")
+        chromedriver_path = os.path.join(dest, "chromedriver.exe")
+    else:
+        dest = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "bin")
+        chromedriver_path = os.path.join(dest, "chromedriver")
+    if os.path.exists(chromedriver_path):
+        os.unlink(chromedriver_path)
+    # This is a stable version.
+    binary_path = chrome.install_webdriver_by_version("84.0.4147.89", dest=dest)
+    assert binary_path == chromedriver_path
+    assert os.path.exists(chromedriver_path)
+    os.unlink(chromedriver_path)
+
+
+@pytest.mark.slow
+@pytest.mark.remote_network
+def test_install_chromedriver_nightly():
+    if sys.platform == "win32":
+        chromedriver_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "Scripts", "chromedriver.exe")
+    else:
+        chromedriver_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "bin", "chromedriver")
+    if os.path.exists(chromedriver_path):
+        os.unlink(chromedriver_path)
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["install", "chrome", "webdriver"])
+    assert excinfo.value.code == 0
+    assert os.path.exists(chromedriver_path)
+    # FIXME: On Windows, this may sometimes fail (access denied), possibly
+    # because the file handler is not released immediately.
+    try:
+        os.unlink(chromedriver_path)
+    except OSError:
+        if sys.platform != "win32":
+            raise
+
+
+@pytest.mark.slow
+@pytest.mark.remote_network
+@pytest.mark.xfail(sys.platform == "win32",
+                   reason="https://github.com/web-platform-tests/wpt/issues/17074")
+def test_install_firefox():
+    if sys.platform == "darwin":
+        fx_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "Firefox Nightly.app")
+    else:
+        fx_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "firefox")
+    if os.path.exists(fx_path):
+        utils.rmtree(fx_path)
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["install", "firefox", "browser", "--channel=nightly"])
+    assert excinfo.value.code == 0
+    assert os.path.exists(fx_path)
+    utils.rmtree(fx_path)
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py
index 81f528457c6..c4d40ff9fd0 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py
@@ -44,3 +44,26 @@ def test_affected_testfiles():
             testfiles.wpt_root, "a", "b", "c", "foo-crash.html")
         tests_changed, _ = testfiles.affected_testfiles([full_test_path])
         assert tests_changed == set([full_test_path])
+
+
+def test_exclude_ignored():
+    default_ignored = [
+        "resources/testharness.js",
+        "resources/testharnessreport.js",
+        "resources/testdriver.js",
+        "resources/testdriver-vendor.js",
+    ]
+    default_ignored_abs = sorted(os.path.join(testfiles.wpt_root, x) for x in default_ignored)
+    default_changed = [
+        "foo/bar.html"
+    ]
+    default_changed_abs = sorted(os.path.join(testfiles.wpt_root, x) for x in default_changed)
+    files = default_ignored + default_changed
+
+    changed, ignored = testfiles.exclude_ignored(files, None)
+    assert sorted(changed) == default_changed_abs
+    assert sorted(ignored) == default_ignored_abs
+
+    changed, ignored = testfiles.exclude_ignored(files, [])
+    assert sorted(changed) == sorted(default_changed_abs + default_ignored_abs)
+    assert sorted(ignored) == []
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 d2d0b541a37..b5ae79d1311 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
@@ -239,65 +239,6 @@ def test_run_verify_unstable(temp_test):
     assert excinfo.value.code == 0
 
 
-@pytest.mark.slow
-@pytest.mark.remote_network
-def test_install_chromium():
-    if sys.platform == "win32":
-        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-win")
-    elif sys.platform == "darwin":
-        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-mac")
-    else:
-        chromium_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "chrome-linux")
-
-    if os.path.exists(chromium_path):
-        utils.rmtree(chromium_path)
-    with pytest.raises(SystemExit) as excinfo:
-        wpt.main(argv=["install", "chrome", "browser", "--channel=nightly"])
-    assert excinfo.value.code == 0
-    assert os.path.exists(chromium_path)
-    utils.rmtree(chromium_path)
-
-
-@pytest.mark.slow
-@pytest.mark.remote_network
-def test_install_chromedriver():
-    if sys.platform == "win32":
-        chromedriver_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "Scripts", "chromedriver.exe")
-    else:
-        chromedriver_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "bin", "chromedriver")
-    if os.path.exists(chromedriver_path):
-        os.unlink(chromedriver_path)
-    with pytest.raises(SystemExit) as excinfo:
-        wpt.main(argv=["install", "chrome", "webdriver"])
-    assert excinfo.value.code == 0
-    assert os.path.exists(chromedriver_path)
-    # FIXME: On Windows, this may sometimes fail (access denied), possibly
-    # because the file handler is not released immediately.
-    try:
-        os.unlink(chromedriver_path)
-    except OSError:
-        if sys.platform != "win32":
-            raise
-
-
-@pytest.mark.slow
-@pytest.mark.remote_network
-@pytest.mark.xfail(sys.platform == "win32",
-                   reason="https://github.com/web-platform-tests/wpt/issues/17074")
-def test_install_firefox():
-    if sys.platform == "darwin":
-        fx_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "Firefox Nightly.app")
-    else:
-        fx_path = os.path.join(wpt.localpaths.repo_root, wpt.venv_dir(), "browsers", "nightly", "firefox")
-    if os.path.exists(fx_path):
-        utils.rmtree(fx_path)
-    with pytest.raises(SystemExit) as excinfo:
-        wpt.main(argv=["install", "firefox", "browser", "--channel=nightly"])
-    assert excinfo.value.code == 0
-    assert os.path.exists(fx_path)
-    utils.rmtree(fx_path)
-
-
 def test_files_changed(capsys):
     commit = "9047ac1d9f51b1e9faa4f9fad9c47d109609ab09"
     with pytest.raises(SystemExit) as excinfo:
diff --git a/tests/wpt/web-platform-tests/tools/wpt/utils.py b/tests/wpt/web-platform-tests/tools/wpt/utils.py
index 6608af754b2..6556ff48b36 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/utils.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/utils.py
@@ -107,7 +107,7 @@ def rmtree(path):
     #    hasn't been fully released (a common issue).
     def handle_remove_readonly(func, path, exc):
         excvalue = exc[1]
-        if func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES:
+        if func in (os.rmdir, os.remove, os.unlink) and excvalue.errno == errno.EACCES:
             os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
             func(path)
         else:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
index f65a17897ad..327231eb7be 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -78,6 +78,9 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     # Point all .test domains to localhost for Chrome
     chrome_options["args"].append("--host-resolver-rules=MAP nonexistent.*.test ~NOTFOUND, MAP *.test 127.0.0.1")
 
+    if kwargs["enable_mojojs"]:
+        chrome_options["args"].append("--enable-blink-features=MojoJS,MojoJSTest")
+
     # Copy over any other flags that were passed in via --binary_args
     if kwargs["binary_args"] is not None:
         chrome_options["args"].extend(kwargs["binary_args"])
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
index ad648374af9..65f82005f31 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
@@ -55,7 +55,7 @@ class TestEnvironment(object):
     websockets servers"""
     def __init__(self, test_paths, testharness_timeout_multipler,
                  pause_after_test, debug_info, options, ssl_config, env_extras,
-                 enable_quic=False):
+                 enable_quic=False, serve_mojojs=False):
         self.test_paths = test_paths
         self.server = None
         self.config_ctx = None
@@ -72,6 +72,7 @@ class TestEnvironment(object):
         self.env_extras_cms = None
         self.ssl_config = ssl_config
         self.enable_quic = enable_quic
+        self.serve_mojojs = serve_mojojs
 
     def __enter__(self):
         self.config_ctx = self.build_config()
@@ -162,7 +163,7 @@ class TestEnvironment(object):
     def setup_server_logging(self):
         server_logger = get_default_logger(component="wptserve")
         assert server_logger is not None
-        log_filter = handlers.LogLevelFilter(lambda x:x, "info")
+        log_filter = handlers.LogLevelFilter(lambda x: x, "info")
         # Downgrade errors to warnings for the server
         log_filter = LogLevelRewriter(log_filter, ["error"], "warning")
         server_logger.component_filter = log_filter
@@ -170,7 +171,7 @@ class TestEnvironment(object):
         server_logger = proxy.QueuedProxyLogger(server_logger)
 
         try:
-            #Set as the default logger for wptserve
+            # Set as the default logger for wptserve
             serve.set_logger(server_logger)
             serve.logger = server_logger
         except Exception:
@@ -216,6 +217,10 @@ class TestEnvironment(object):
         if "/" not in self.test_paths:
             del route_builder.mountpoint_routes["/"]
 
+        if self.serve_mojojs:
+            # TODO(Hexcles): Properly pass venv.path in.
+            route_builder.add_mount_point("/gen/", "_venv2/mojojs/gen")
+
         return route_builder.get_routes()
 
     def ensure_started(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 80879476704..f322d77fbdd 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -240,7 +240,6 @@ scheme host and port.""")
                             default=None,
                             help="Build is a release (overrides any mozinfo file)")
 
-
     chunking_group = parser.add_argument_group("Test Chunking")
     chunking_group.add_argument("--total-chunks", action="store", type=int, default=1,
                                 help="Total number of chunks to use")
@@ -251,20 +250,20 @@ scheme host and port.""")
 
     ssl_group = parser.add_argument_group("SSL/TLS")
     ssl_group.add_argument("--ssl-type", action="store", default=None,
-                        choices=["openssl", "pregenerated", "none"],
-                        help="Type of ssl support to enable (running without ssl may lead to spurious errors)")
+                           choices=["openssl", "pregenerated", "none"],
+                           help="Type of ssl support to enable (running without ssl may lead to spurious errors)")
 
     ssl_group.add_argument("--openssl-binary", action="store",
-                        help="Path to openssl binary", default="openssl")
+                           help="Path to openssl binary", default="openssl")
     ssl_group.add_argument("--certutil-binary", action="store",
-                        help="Path to certutil binary for use with Firefox + ssl")
+                           help="Path to certutil binary for use with Firefox + ssl")
 
     ssl_group.add_argument("--ca-cert-path", action="store", type=abs_path,
-                        help="Path to ca certificate when using pregenerated ssl certificates")
+                           help="Path to ca certificate when using pregenerated ssl certificates")
     ssl_group.add_argument("--host-key-path", action="store", type=abs_path,
-                        help="Path to host private key when using pregenerated ssl certificates")
+                           help="Path to host private key when using pregenerated ssl certificates")
     ssl_group.add_argument("--host-cert-path", action="store", type=abs_path,
-                        help="Path to host certificate when using pregenerated ssl certificates")
+                           help="Path to host certificate when using pregenerated ssl certificates")
 
     gecko_group = parser.add_argument_group("Gecko-specific")
     gecko_group.add_argument("--prefs-root", dest="prefs_root", action="store", type=abs_path,
@@ -313,6 +312,11 @@ scheme host and port.""")
                              default=[], action="append", dest="user_stylesheets",
                              help="Inject a user CSS stylesheet into every test.")
 
+    servo_group = parser.add_argument_group("Chrome-specific")
+    servo_group.add_argument("--enable-mojojs", action="store_true", default=False,
+                             help="Enable MojoJS for testing. Mojo bindings need to be available in "
+                             "_venv2/mojojs.")
+
     sauce_group = parser.add_argument_group("Sauce Labs-specific")
     sauce_group.add_argument("--sauce-browser", dest="sauce_browser",
                              help="Sauce Labs browser name")
@@ -346,7 +350,7 @@ scheme host and port.""")
 
     webkit_group = parser.add_argument_group("WebKit-specific")
     webkit_group.add_argument("--webkit-port", dest="webkit_port",
-                             help="WebKit port")
+                              help="WebKit port")
 
     parser.add_argument("test_list", nargs="*",
                         help="List of URLs for tests to run, or paths including tests to run. "
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index 86cc36d3af5..a397fd6f0b8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -218,7 +218,8 @@ def run_tests(config, test_paths, product, **kwargs):
                                  product.env_options,
                                  ssl_config,
                                  env_extras,
-                                 kwargs["enable_quic"]) as test_environment:
+                                 kwargs["enable_quic"],
+                                 kwargs["enable_mojojs"]) as test_environment:
             recording.set(["startup", "ensure_environment"])
             try:
                 test_environment.ensure_started()
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt
index 8323878d6f8..4431c21fc5c 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt
@@ -1 +1 @@
-{{GET[test]}}
+{{GET[plus pct-20 pct-3D=]}}
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt
index 8323878d6f8..4431c21fc5c 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt
@@ -1 +1 @@
-{{GET[test]}}
+{{GET[plus pct-20 pct-3D=]}}
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 8163d365c91..965a214f166 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
@@ -99,8 +99,8 @@ class TestFileHandler(TestUsingServer):
         assert resp.read().rstrip() == expected
 
     def test_sub_params(self):
-        resp = self.request("/sub_params.sub.txt", query="test=PASS")
-        expected = b"PASS"
+        resp = self.request("/sub_params.txt", query="plus+pct-20%20pct-3D%3D=PLUS+PCT-20%20PCT-3D%3D&pipe=sub")
+        expected = b"PLUS PCT-20 PCT-3D="
         assert resp.read().rstrip() == expected
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
index a6a703e3049..52788438336 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
@@ -38,6 +38,10 @@ class TestHeader(TestUsingServer):
         resp = self.request("/document.txt", query="pipe=header(X-Test,1)|header(X-Test,2,True)")
         self.assert_multiple_headers(resp, "X-Test", ["1", "2"])
 
+    def test_semicolon(self):
+        resp = self.request("/document.txt", query="pipe=header(Refresh,3;url=http://example.com)")
+        self.assertEqual(resp.info()["Refresh"], "3;url=http://example.com")
+
 class TestSlice(TestUsingServer):
     def test_both_bounds(self):
         resp = self.request("/document.txt", query="pipe=slice(1,10)")
@@ -94,8 +98,8 @@ server: http://localhost:{0}""".format(self.server.port).encode("ascii")
         self.assertEqual(resp.read().rstrip(), expected.strip())
 
     def test_sub_params(self):
-        resp = self.request("/sub_params.txt", query="test=PASS&pipe=sub")
-        expected = b"PASS"
+        resp = self.request("/sub_params.txt", query="plus+pct-20%20pct-3D%3D=PLUS+PCT-20%20PCT-3D%3D&pipe=sub")
+        expected = b"PLUS PCT-20 PCT-3D="
         self.assertEqual(resp.read().rstrip(), expected)
 
     def test_sub_url_base(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
index 3743ba01644..d315b0212c4 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
@@ -2,8 +2,9 @@ import json
 import os
 import sys
 import traceback
+from collections import defaultdict
 
-from six.moves.urllib.parse import parse_qs, quote, unquote, urljoin
+from six.moves.urllib.parse import quote, unquote, urljoin
 from six import iteritems
 
 from .constants import content_types
@@ -120,6 +121,24 @@ class DirectoryHandler(object):
                    {"link": link, "name": escape(item), "class": class_,
                     "headers": dot_headers_markup})
 
+def parse_qs(qs):
+    """Parse a query string given as a string argument (data of type
+    application/x-www-form-urlencoded). Data are returned as a dictionary. The
+    dictionary keys are the unique query variable names and the values are
+    lists of values for each name.
+
+    This implementation is used instead of Python's built-in `parse_qs` method
+    in order to support the semicolon character (which the built-in method
+    interprets as a parameter delimiter)."""
+    pairs = [item.split("=", 1) for item in qs.split('&') if item]
+    rv = defaultdict(list)
+    for pair in pairs:
+        if len(pair) == 1 or len(pair[1]) == 0:
+            continue
+        name = unquote(pair[0].replace('+', ' '))
+        value = unquote(pair[1].replace('+', ' '))
+        rv[name].append(value)
+    return dict(rv)
 
 def wrap_pipeline(path, request, response):
     query = parse_qs(request.url_parts.query)
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py
index 895f174d5f0..b7bfcebd10b 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py
@@ -742,7 +742,7 @@ class ResponseWriter(object):
         if not self._headers_complete:
             self._response.content = data
             self.end_headers()
-        self.write_raw_content(data)
+        return self.write_raw_content(data)
 
     def write_raw_content(self, data):
         """Writes the data 'as is'"""
@@ -750,11 +750,9 @@ class ResponseWriter(object):
             raise ValueError('data cannot be None')
         if isinstance(data, (text_type, binary_type)):
             # Deliberately allows both text and binary types. See `self.encode`.
-            self.write(data)
+            return self.write(data)
         else:
-            self.write_content_file(data)
-        if not self._response.explicit_flush:
-            self.flush()
+            return self.write_content_file(data)
 
     def write(self, data):
         """Write directly to the response, converting unicode to bytes
@@ -771,15 +769,19 @@ class ResponseWriter(object):
         """Write a file-like object directly to the response in chunks.
         Does not flush."""
         self.content_written = True
+        success = True
         while True:
             buf = data.read(self.file_chunk_size)
             if not buf:
+                success = False
                 break
             try:
                 self._wfile.write(buf)
             except socket.error:
+                success = False
                 break
         data.close()
+        return success
 
     def encode(self, data):
         """Convert unicode to bytes according to response.encoding."""
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
index 654d4db7c79..271a47b3011 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
@@ -38,6 +38,7 @@ const gNonAnimatableProps = [
   'contain',
   'direction',
   'display',
+  'textCombineUpright',
   'textOrientation',
   'unicodeBidi',
   'willChange',
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html
index 7fcdf9156f8..7bf5b03c1e1 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html
@@ -1,18 +1,17 @@
 <!DOCTYPE html>
 <title>Reference for reverse running animation</title>
 <style>
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-  body {
-    backgrond: white;
+  #box {
+    background: green;
+    height: 40px;
+    width: 40px;
   }
 </style>
 <body>
+  <div id="box"></div>
   <p id="notes">
-    This test reverses the animation shortly after the box starts moving. If
-    any blue pixels are visible the test has failed.
+    This test animates the box color from green to red and reverses the play
+    direction shortly after the midpoint. If the box remains red, the test
+    failed.
   </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html
index 65f89b3e04c..c9eb2a068e6 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html
@@ -7,62 +7,42 @@
 <script src="/common/reftest-wait.js"></script>
 <script src="../../testcommon.js"></script>
 <style>
-  #box, #overlay {
-    /* Add a border to ensure that anti-aliasing does not leak blue pixels
-       outside of the  element's bounds. */
-    border: 1px solid white;
+  #box {
+    background: green;
     height: 40px;
-    position: absolute;
-    top: 40px;
     width: 40px;
   }
-  #box {
-    background: blue;
-    left: 40px;
-    z-index: 1;
-  }
-  #overlay {
-    background: white;
-    left: 140px;
-    z-index: 2;
-  }
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-  body {
-    backgrond: white;
-  }
 </style>
-
 <body>
   <div id="box"></div>
-  <div id="overlay"></div>
   <p id="notes">
-    This test reverses the animation shortly after the box starts moving. If
-    any blue pixels are visible the test has failed.
+    This test animates the box color from green to red and reverses the play
+    direction shortly after the midpoint. If the box remains red, the test
+    failed.
   </p>
 </body>
 <script>
   onload = async function() {
-    // Double rAF to ensure that we are not bogged down during initialization
-    // and the compositor is ready.
-    waitForAnimationFrames(2).then(() => {
-      const elem = document.getElementById('box');
-      const anim = elem.animate([
-          { transform: 'translateX(100px)' },
-          { transform: 'translateX(100px)', offset: 0.49 },
-          { transform: 'translateX(200px)', offset: 0.51 },
-          { transform: 'translateX(200px)' }
-        ], {
-          duration: 10000,
-        });
-      anim.ready.then(() => {
-        anim.currentTime = 5000;
-        requestAnimationFrame(() => {
-          anim.reverse();
-          takeScreenshotDelayed(1000);
+    const box = document.getElementById('box');
+    const duration = 10000;
+    const anim =
+        box.animate({ bacground: [ 'green', 'red' ] },
+                    { duration: duration, easing: 'steps(2, jump-none)' });
+    anim.currentTime = duration / 2;
+    anim.ready.then(() => {
+      const startTime = anim.timeline.currentTime;
+      waitForAnimationFrames(2).then(() => {
+        anim.reverse();
+        anim.ready.then(() => {
+          const reversalTime = anim.timeline.currentTime;
+          const forwardPlayingTime = reversalTime - startTime;
+          const checkIfDone = () => {
+            if (anim.timeline.currentTime - reversalTime > forwardPlayingTime)
+              takeScreenshot();
+            else
+              requestAnimationFrame(checkIfDone);
+          };
+          requestAnimationFrame(checkIfDone);
         });
       });
     });
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html
index af69b26100a..e996815da8d 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html
@@ -1,20 +1,17 @@
 <!DOCTYPE html>
 <title>Reference for update playback rate zero</title>
 <style>
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-  body {
-    background: white;
+  #box {
+    background: green;
+    height: 40px;
+    width: 40px;
   }
 </style>
 <body>
   <div id="box"></div>
   <p id="notes">
     This test creates a running animation and changes its playback rate
-    part way through. The animation finishes ahead of the screenshot.
-    If any blue pixels appear in the screenshot, the test fails.
+    part way through. If the box remains red when the screenshot is captured
+    the test fails.
   </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html
index 63a76ba84a6..c3df1c1bf0a 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html
@@ -5,58 +5,48 @@
 <title>Update playback rate zero</title>
 <link rel="match" href="update-playback-rate-fast-ref.html">
 <script src="/common/reftest-wait.js"></script>
+<script src="../../testcommon.js"></script>
 <style>
-  #box-1, #box-2 {
-    border: 1px solid white;
+  #box {
+    background: green;
     height: 40px;
-    left: 40px;
-    position: absolute;
-    top: 40px;
     width: 40px;
   }
-  #box-1 {
-    background: blue;
-    z-index: 1;
-  }
-  #box-2 {
-    background: white;
-    transform: translateX(0px);
-    z-index: 2;
-  }
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-  body {
-    background: white;
-  }
 </style>
-
 <body>
-  <div id="box-1"></div>
-  <div id="box-2"></div>
+  <div id="box"></div>
   <p id="notes">
     This test creates a running animation and changes its playback rate
-    part way through. The animation finishes ahead of the screenshot.
-    If any blue pixels appear in the screenshot, the test fails.
+    part way through. If the box remains red when the screenshot is captured
+    the test fails.
   </p>
 </body>
 <script>
-  onload = function() {
-    const elem = document.getElementById('box-1');
-    const anim = elem.animate([
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(200px)' },
-        { transform: 'translateX(200px)' }
-      ], {
-        duration: 1000
-      });
-
+  onload = async function() {
+    const box = document.getElementById('box');
+    const duration = 2000;
+    const anim =
+        box.animate({ bacground: [ 'red', 'green' ] },
+                    { duration: duration, easing: 'steps(2, jump-none)' });
     anim.ready.then(() => {
-      anim.updatePlaybackRate(2);
-      takeScreenshotDelayed(750);
+      const startTime = anim.timeline.currentTime;
+      waitForAnimationFrames(2).then(() => {
+        anim.updatePlaybackRate(2);
+        anim.ready.then(() => {
+          const updateTime = anim.timeline.currentTime;
+          const baseProgress = (updateTime - startTime) / duration;
+          const checkIfDone = () => {
+            const progress =
+               2 * (anim.timeline.currentTime - updateTime) / duration +
+               baseProgress;
+            if (progress > 0.5)
+              takeScreenshot();
+            else
+              requestAnimationFrame(checkIfDone);
+          };
+          requestAnimationFrame(checkIfDone);
+        });
+      });
     });
   };
 </script>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow-ref.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow-ref.html
deleted file mode 100644
index 11b87deecca..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow-ref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<title>Reference for update playback rate zero</title>
-<style>
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-</style>
-<body>
-  <div id="box"></div>
-  <p id="notes">
-    This test creates a running animation and changes its playback rate
-    part way through. The animation slows down so that it does not finish
-    before the screenshot. If any blue pixels appear in the screenshot,
-    the test fails.
-  </p>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow.html
deleted file mode 100644
index db449f2ca59..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-slow.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-<!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="UTF-8">
-<title>Update playback rate zero</title>
-<link rel="match" href="update-playback-rate-slow-ref.html">
-<script src="/common/reftest-wait.js"></script>
-<style>
-  #box-1, #box-2 {
-    border: 1px solid white;
-    height: 40px;
-    left: 40px;
-    position: absolute;
-    top: 40px;
-    width: 40px;
-  }
-  #box-1 {
-    background: blue;
-    z-index: 1;
-  }
-  #box-2 {
-    background: white;
-    transform: translateX(200px);
-    z-index: 2;
-  }
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-</style>
-
-<body>
-  <div id="box-1"></div>
-  <div id="box-2"></div>
-  <p id="notes">
-    This test creates a running animation and changes its playback rate
-    part way through. The animation slows down so that it does not finish
-    before the screenshot. If any blue pixels appear in the screenshot,
-    the test fails.
-  </p>
-</body>
-<script>
-  onload = function() {
-    const elem = document.getElementById('box-1');
-    const anim = elem.animate([
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(200px)' },
-        { transform: 'translateX(200px)' }
-      ], {
-        duration: 1000
-      });
-
-    anim.ready.then(() => {
-      setTimeout(() => {
-        anim.updatePlaybackRate(0.5);
-      }, 500);
-      takeScreenshotDelayed(1000);
-    });
-  };
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html
index 26293a3aebb..399fd5ce7d6 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <title>Reference for update playback rate zero</title>
 <style>
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
+  #box {
+    background: green;
+    height: 40px;
+    width: 40px;
   }
 </style>
 <body>
   <div id="box"></div>
   <p id="notes">
-    This test creates a running animation and changes its playback rate
-    part way through. The animation should stop behind an occluding rectangle.
-    If not fully occluded, the test fails.
+    This test creates a running animation and halts its playback rate
+    part way through. If the box transitions to red the test fails.
   </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html
index bed08d630ca..db1544ee92d 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html
@@ -5,57 +5,42 @@
 <title>Update playback rate zero</title>
 <link rel="match" href="update-playback-rate-zero-ref.html">
 <script src="/common/reftest-wait.js"></script>
+<script src="../../testcommon.js"></script>
 <style>
-  #box-1, #box-2 {
-    border: 1px solid white;
+  #box {
+    background: green;
     height: 40px;
-    left: 40px;
-    position: absolute;
-    top: 40px;
     width: 40px;
   }
-  #box-1 {
-    background: blue;
-    z-index: 1;
-  }
-  #box-2 {
-    background: white;
-    transform: translateX(200px);
-    z-index: 2;
-  }
-  #notes {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
 </style>
-
 <body>
-  <div id="box-1"></div>
-  <div id="box-2"></div>
+  <div id="box"></div>
   <p id="notes">
-    This test creates a running animation and changes its playback rate
-    part way through. The animation should stop behind an occluding rectangle.
-    If not fully occluded, the test fails.
+    This test creates a running animation and halts its playback rate
+    part way through. If the box transitions to red the test fails.
   </p>
 </body>
 <script>
-  onload = function() {
-    const elem = document.getElementById('box-1');
-    const anim = elem.animate([
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(100px)' },
-        { transform: 'translateX(200px)' },
-        { transform: 'translateX(200px)' }
-      ], {
-        duration: 1000
-      });
-
+  onload = async function() {
+    const box = document.getElementById('box');
+    const duration = 2000;
+    const anim =
+        box.animate({ bacground: [ 'green', 'red' ] },
+                    { duration: duration, easing: 'steps(2, jump-none)' });
     anim.ready.then(() => {
-      setTimeout(() => {
+      const startTime = anim.timeline.currentTime;
+      waitForAnimationFrames(2).then(() => {
         anim.updatePlaybackRate(0);
-      }, 750);
-      takeScreenshotDelayed(1200);
+        anim.ready.then(() => {
+          const checkIfDone = () => {
+            if (anim.timeline.currentTime - startTime > duration / 2)
+              takeScreenshot();
+            else
+              requestAnimationFrame(checkIfDone);
+          };
+          requestAnimationFrame(checkIfDone);
+        });
+      });
     });
   };
 </script>
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/README.md b/tests/wpt/web-platform-tests/websockets/stream/tentative/README.md
similarity index 100%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/README.md
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/README.md
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/abort.any.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/abort.any.js
similarity index 98%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/abort.any.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/abort.any.js
index 09664f31ea6..9d64899c551 100644
--- a/tests/wpt/web-platform-tests/websockets/stream.tentative/abort.any.js
+++ b/tests/wpt/web-platform-tests/websockets/stream/tentative/abort.any.js
@@ -1,4 +1,4 @@
-// META: script=../websocket.sub.js
+// META: script=../../websocket.sub.js
 // META: script=resources/url-constants.js
 // META: script=/common/utils.js
 // META: global=window,worker
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-receive.any.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-receive.any.js
similarity index 97%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-receive.any.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-receive.any.js
index 22705c6ed11..17c75bd51cd 100644
--- a/tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-receive.any.js
+++ b/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-receive.any.js
@@ -1,4 +1,4 @@
-// META: script=../websocket.sub.js
+// META: script=../../websocket.sub.js
 // META: script=resources/url-constants.js
 // META: global=window,worker
 // META: timeout=long
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-send.any.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-send.any.js
similarity index 95%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-send.any.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-send.any.js
index 6619a0b08f3..2848a3f1564 100644
--- a/tests/wpt/web-platform-tests/websockets/stream.tentative/backpressure-send.any.js
+++ b/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-send.any.js
@@ -1,4 +1,4 @@
-// META: script=../websocket.sub.js
+// META: script=../../websocket.sub.js
 // META: script=resources/url-constants.js
 // META: global=window,worker
 // META: timeout=long
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/close.any.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/close.any.js
similarity index 99%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/close.any.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/close.any.js
index 0e6149e7a63..d44883139c6 100644
--- a/tests/wpt/web-platform-tests/websockets/stream.tentative/close.any.js
+++ b/tests/wpt/web-platform-tests/websockets/stream/tentative/close.any.js
@@ -1,4 +1,4 @@
-// META: script=../websocket.sub.js
+// META: script=../../websocket.sub.js
 // META: script=resources/url-constants.js
 // META: global=window,worker
 
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/constructor.any.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/constructor.any.js
similarity index 98%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/constructor.any.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/constructor.any.js
index 24f96cc3082..a5bea2ac61b 100644
--- a/tests/wpt/web-platform-tests/websockets/stream.tentative/constructor.any.js
+++ b/tests/wpt/web-platform-tests/websockets/stream/tentative/constructor.any.js
@@ -1,4 +1,4 @@
-// META: script=../websocket.sub.js
+// META: script=../../websocket.sub.js
 // META: script=resources/url-constants.js
 // META: global=window,worker
 
diff --git a/tests/wpt/web-platform-tests/websockets/stream.tentative/resources/url-constants.js b/tests/wpt/web-platform-tests/websockets/stream/tentative/resources/url-constants.js
similarity index 100%
rename from tests/wpt/web-platform-tests/websockets/stream.tentative/resources/url-constants.js
rename to tests/wpt/web-platform-tests/websockets/stream/tentative/resources/url-constants.js