diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index a9005e45d6e..00000000000
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
-
-  [Blob charset should override <meta charset>.]
-    expected: TIMEOUT
-
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-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    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
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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 23c61ede1a1..c131078eace 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,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/fetch/api/body/mime-type.any.js.ini b/tests/wpt/metadata-layout-2020/fetch/api/body/mime-type.any.js.ini
new file mode 100644
index 00000000000..9df4327e18f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/api/body/mime-type.any.js.ini
@@ -0,0 +1,39 @@
+[mime-type.any.html]
+  [Request: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Response: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Request: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: removing implicit Content-Type]
+    expected: FAIL
+
+  [Request: removing implicit Content-Type]
+    expected: FAIL
+
+
+[mime-type.any.worker.html]
+  [Request: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Response: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Request: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: removing implicit Content-Type]
+    expected: FAIL
+
+  [Request: removing implicit Content-Type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 2dad0a40380..9af31093be4 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,15 +312,6 @@
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
@@ -330,3 +321,15 @@
   [<iframe>: separate 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 */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: 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 25318ac5846..d2df9b78483 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
@@ -53,6 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript x/x]
     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 30e1b851fd4..c7ffe03c4ae 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,3 +11,9 @@
   [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
+
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/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_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata/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_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
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 9a85a905394..8e2a63e3b7f 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,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d81ae5a4949..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,17 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    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..92008abe69f 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,4 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_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 e63fe7c263e..c6f45be1eb2 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,5 @@
 [iframe_sandbox_popups_escaping-2.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-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 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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 0fbc49ea1c1..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: CRASH
   [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/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 73b4e6216a3..fd2dca7c221 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,18 +2,12 @@
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
@@ -32,18 +26,9 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
@@ -53,33 +38,39 @@
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart out of range a second time (must not fire select)]
+  [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionStart a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/webapi/modified-contenttype.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/webapi/modified-contenttype.any.js.ini
new file mode 100644
index 00000000000..e057260f5a8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/webapi/modified-contenttype.any.js.ini
@@ -0,0 +1,35 @@
+[modified-contenttype.any.serviceworker.html]
+  expected: ERROR
+
+[modified-contenttype.any.sharedworker.html]
+  expected: ERROR
+
+[modified-contenttype.any.worker.html]
+  expected: TIMEOUT
+  [compileStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+  [instantiateStreaming with Content-Type set late]
+    expected: NOTRUN
+
+  [compileStreaming with Content-Type set late]
+    expected: TIMEOUT
+
+  [instantiateStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+
+[modified-contenttype.any.html]
+  expected: TIMEOUT
+  [compileStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+  [instantiateStreaming with Content-Type set late]
+    expected: NOTRUN
+
+  [compileStreaming with Content-Type set late]
+    expected: TIMEOUT
+
+  [instantiateStreaming with Content-Type removed late]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index ccc9e408a28..0c34e98c03a 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -524,3 +524,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-6.7702334005389212e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t7.2735377699704657e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index a9005e45d6e..00000000000
--- a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
-
-  [Blob charset should override <meta charset>.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index c4df368d9e3..3d7c47bb770 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -151537,6 +151537,19 @@
         {}
        ]
       ],
+      "positioned-grid-items-018.html": [
+       "0c9d21642ef828911c04d937c48052bf297baaf3",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "positioned-grid-items-sizing-001.html": [
        "7fb303c0dd0df39d614f8bee8bd003494fcd233c",
        [
@@ -152475,6 +152488,32 @@
         {}
        ]
       ],
+      "grid-gutters-015.html": [
+       "ed1048fd69714a8d813b92103719f0171f165472",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/alignment/grid-gutters-015-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gutters-016.html": [
+       "163787cfee6a9762ec018bd05ee2d3d7b4273114",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/alignment/grid-gutters-016-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-inline-axis-alignment-auto-margins-008.html": [
        "eb9666465542a34cc29853dd71dc326ff4cbbd63",
        [
@@ -175722,7 +175761,7 @@
      ],
      "snap-after-initial-layout": {
       "direction-rtl.html": [
-       "d10c013e1ee0d713057c26bd7acd961b4c0a5edc",
+       "85724c31feae72e26fd90b03d54f314311cd0137",
        [
         null,
         [
@@ -175734,8 +175773,21 @@
         {}
        ]
       ],
+      "scroll-snap-initial-layout-000.html": [
+       "ea47c9f36cc1f9bfda413dd6b6c9eb697bd54540",
+       [
+        null,
+        [
+         [
+          "/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "writing-mode-horizontal-tb.html": [
-       "aa65dde1810ebabfccfa76716063bd8e83c07bb0",
+       "9a680d10d9ff61fc7173118bbfac4fae5b08ff97",
        [
         null,
         [
@@ -175748,7 +175800,7 @@
        ]
       ],
       "writing-mode-vertical-lr.html": [
-       "898e64be6197679635290aebd22467c96a509750",
+       "f4de0411e053f0bb9505209e3ff6b4d9196961ab",
        [
         null,
         [
@@ -175761,7 +175813,7 @@
        ]
       ],
       "writing-mode-vertical-rl.html": [
-       "b3141f03f3c4b9a0a0108df8b55356e6fde3a759",
+       "1710bc16ddf6a95ff66e3305e1b591a130855a81",
        [
         null,
         [
@@ -179917,6 +179969,19 @@
         {}
        ]
       ],
+      "intrinsic-size-009.html": [
+       "139c4de6447a7e59145a969f0c0e2b21e383b3f2",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "percentage-resolution-001.html": [
        "d606bfc65e340f95fbbc355b764a7de5e7aeb6a1",
        [
@@ -194061,6 +194126,123 @@
         {}
        ]
       ],
+      "trailing-ideographic-space-017.html": [
+       "742e389950f1957a79300bbaa979dddb108973ce",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-018.html": [
+       "16bb8767512a4c9b555decda04d5d3316c911231",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-019.html": [
+       "0707000512030c2e94fae2a753c75288caeb6e4a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-020.html": [
+       "97ae007898b8e62914720b167848dfd50894b6fb",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-021.html": [
+       "b75327a64ba957ba9a4867c7c796a682c2490e5c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-022.html": [
+       "71720c2b2d7f70e54a0303e7f1a0cdeaece3e9ea",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-023.html": [
+       "ea95ab1e0f2a28f7ed6c438cedee918682d8b07a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-024.html": [
+       "2a65400c60015797f16946092ca9663e76b6d2ac",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-025.html": [
+       "5123e10524f7297a7e9a7fb890a52d458737f55d",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "trailing-ideographic-space-break-spaces-001.html": [
        "2ab5edffc0c6bee14382cb35c5960a36c62cee46",
        [
@@ -261863,7 +262045,7 @@
      []
     ],
     "beacon-common.sub.js": [
-     "3635da73b75400ed3699576e2eac6329c39bba1b",
+     "279ad2229ba3e9f4c343733809c60e31fcd492e9",
      []
     ],
     "headers": {
@@ -261914,7 +262096,7 @@
       []
      ],
      "bluetooth-test.js": [
-      "b99564bf9ec3c8262029cd36e6df4c67d12ae83f",
+      "f6e5fd0e4b5e272d87c4745fa65c78879a44b2ed",
       []
      ],
      "health-thermometer-iframe.html": [
@@ -313784,6 +313966,14 @@
        "a6ca7c5aa7a80313786abc97ffe4581e9a6d7341",
        []
       ],
+      "grid-gutters-015-ref.html": [
+       "dd4d8daf6a30c0536b0bd3a291c4207be5ac7830",
+       []
+      ],
+      "grid-gutters-016-ref.html": [
+       "a56ab07e182530ef98292fc4729884302d3bdc9e",
+       []
+      ],
       "grid-item-content-baseline-001-ref.html": [
        "e55fe0b9f96c3f3ae4a4f6b66bfd2283fb88659b",
        []
@@ -318646,6 +318836,10 @@
       []
      ],
      "snap-after-initial-layout": {
+      "scroll-snap-initial-layout-000-ref.html": [
+       "f3eaa06ac9b7c48479d439041ce51575ad8cc072",
+       []
+      ],
       "snap-after-initial-layout-ref.html": [
        "c8009b626cb63ebcef4a211f8b61249faf36c72f",
        []
@@ -319565,6 +319759,10 @@
        ]
       },
       "support": {
+       "100x100-green.png": [
+        "25b76c3c6f216793a36b1f29287dafd993898c67",
+        []
+       ],
        "1x1-green.png": [
         "b98ca0ba0a03c580ac339e4a3653539cfa8edc71",
         []
@@ -353062,7 +353260,7 @@
     ]
    },
    "lint.ignore": [
-    "27ba5497065c7858248f99a063ffe57b932c0df0",
+    "2e0fc8b39bc8df1a44d7b5469d81014c32fa844b",
     []
    ],
    "loading": {
@@ -353845,42 +354043,42 @@
      []
     ],
     "README.md": [
-     "953611f93037cfebe0459d5f67599b727539ae40",
+     "d80c0e067f965e241f9ee652cb0eb6563c7939b8",
      []
     ],
-    "detached.tentative.https.window.js.headers": [
+    "detached.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "iframe.cross-origin.tentative.https.window.js.headers": [
+    "iframe.cross-origin.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "iframe.cross-site.tentative.https.window.js.headers": [
+    "iframe.cross-site.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "iframe.same-origin.tentative.https.window.js.headers": [
+    "iframe.same-origin.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "main-frame-and-worker.tentative.https.window.js.headers": [
+    "main-frame-and-worker.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "main-frame.tentative.https.window.js.headers": [
+    "main-frame.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "randomized-breakdown.tentative.https.window.js.headers": [
+    "randomized-breakdown.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "redirect.client.tentative.https.window.js.headers": [
+    "redirect.client.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "redirect.server.tentative.https.window.js.headers": [
+    "redirect.server.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
@@ -353950,19 +354148,19 @@
       []
      ]
     },
-    "window-open.cross-origin.tentative.https.window.js.headers": [
+    "window-open.cross-origin.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "window-open.cross-site.tentative.https.window.js.headers": [
+    "window-open.cross-site.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "window-open.mix.tentative.https.window.js.headers": [
+    "window-open.mix.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ],
-    "window-open.same-origin.tentative.https.window.js.headers": [
+    "window-open.same-origin.https.window.js.headers": [
      "4fff9d9fba4c81f953826ffea010a75be626b95d",
      []
     ]
@@ -358498,7 +358696,7 @@
       []
      ],
      "web-bluetooth-test.js": [
-      "aa4b80d2831c3c69ef16d7016b41d818bd58bd7b",
+      "ee835c224b489068ad6a9f9fe8ffe1b56ab08daa",
       []
      ],
      "web-bluetooth-test.js.headers": [
@@ -360127,7 +360325,7 @@
        []
       ],
       "cache-match.js": [
-       "8bf7fda30967fbb4ed25325d49e0cd99fc16df55",
+       "60c0dd0a02f20e1d4fa7d30a4d0a5968507aca03",
        []
       ],
       "cache-matchAll.js": [
@@ -372251,7 +372449,7 @@
        []
       ],
       "handlers.py": [
-       "c748ca2e3b157fda3350e93b6c089bccf3f912b5",
+       "0fc11c190d111158ef3bf169cfd6dce02b2c6f4c",
        []
       ],
       "logger.py": [
@@ -373279,6 +373477,10 @@
      []
     ],
     "resources": {
+     "cross-origin.har": [
+      "7435393b13b1f640b0a1911e05456833febf7e8e",
+      []
+     ],
      "dynamic1": {
       "classic_script.js": [
        "5fcf045906c1ab151512a3e425b7c5c6f79cee59",
@@ -373324,7 +373526,7 @@
       ]
      },
      "generate-test-wbns.sh": [
-      "3c8a3ea68d60522452be94a7f8d0aaf9b11f5c55",
+      "8c8fd45d8172c7575fe17a30dfb308dd4fa4e2e0",
       []
      ],
      "location": {
@@ -373396,6 +373598,16 @@
        "21e57b9caca1183ecda6f5d4fb9ebd556abf769a",
        []
       ],
+      "cors": {
+       "__dir__.headers": [
+        "383abc543c68b31038d4b708b8465b2bae1ceac6",
+        []
+       ],
+       "cross-origin.wbn": [
+        "bed9bf2af7439c2637a61935c87324d0cd05f9ca",
+        []
+       ]
+      },
       "dynamic": {
        "__dir__.headers": [
         "cb762eff806849df46dc758ef7b98b63f27f54c9",
@@ -429172,7 +429384,7 @@
       ]
      ],
      "focus-visible-011.html": [
-      "d45f5d8ed0f3903da5b5c37ea5a13ccbe690ceca",
+      "b0daf34ba8dd96f343e687cef852523c92ae2c39",
       [
        null,
        {
@@ -450041,6 +450253,19 @@
        ]
       ]
      },
+     "body": {
+      "mime-type.any.js": [
+       "a0f90a0abdfc3e672997607611438ff0049ecf2c",
+       [
+        "fetch/api/body/mime-type.any.html",
+        {}
+       ],
+       [
+        "fetch/api/body/mime-type.any.worker.html",
+        {}
+       ]
+      ]
+     },
      "cors": {
       "cors-basic.any.js": [
        "23f5f91c87d49f648dbbe575cc901562a5277c8b",
@@ -502873,10 +503098,10 @@
     }
    },
    "measure-memory": {
-    "detached.tentative.https.window.js": [
+    "detached.https.window.js": [
      "179e5e727adfd9b12e82b84b0c39a7c682a6689d",
      [
-      "measure-memory/detached.tentative.https.window.html",
+      "measure-memory/detached.https.window.html",
       {
        "script_metadata": [
         [
@@ -502896,67 +503121,10 @@
       }
      ]
     ],
-    "idlharness.tentative.any.js": [
+    "idlharness.window.js": [
      "3e7589aeb95e2d06aa7bfd799a3e5afb342c0fce",
      [
-      "measure-memory/idlharness.tentative.any.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "measure-memory/idlharness.tentative.any.serviceworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "measure-memory/idlharness.tentative.any.sharedworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "measure-memory/idlharness.tentative.any.worker.html",
+      "measure-memory/idlharness.window.html",
       {
        "script_metadata": [
         [
@@ -502975,10 +503143,10 @@
       }
      ]
     ],
-    "iframe.cross-origin.tentative.https.window.js": [
+    "iframe.cross-origin.https.window.js": [
      "ac0641cc2621df534faedfe50d22dac5bde3cb15",
      [
-      "measure-memory/iframe.cross-origin.tentative.https.window.html",
+      "measure-memory/iframe.cross-origin.https.window.html",
       {
        "script_metadata": [
         [
@@ -502998,10 +503166,10 @@
       }
      ]
     ],
-    "iframe.cross-site.tentative.https.window.js": [
+    "iframe.cross-site.https.window.js": [
      "1b4dfc70b7e10ef4a304513b8b7446ea27df41c6",
      [
-      "measure-memory/iframe.cross-site.tentative.https.window.html",
+      "measure-memory/iframe.cross-site.https.window.html",
       {
        "script_metadata": [
         [
@@ -503021,10 +503189,10 @@
       }
      ]
     ],
-    "iframe.same-origin.tentative.https.window.js": [
+    "iframe.same-origin.https.window.js": [
      "1d546b27f302ace49618d448cfcb13f668631c08",
      [
-      "measure-memory/iframe.same-origin.tentative.https.window.html",
+      "measure-memory/iframe.same-origin.https.window.html",
       {
        "script_metadata": [
         [
@@ -503044,10 +503212,10 @@
       }
      ]
     ],
-    "main-frame-and-worker.tentative.https.window.js": [
+    "main-frame-and-worker.https.window.js": [
      "f0b8abf1bc6dca66f57a0bd4f2152f6c479de6f2",
      [
-      "measure-memory/main-frame-and-worker.tentative.https.window.html",
+      "measure-memory/main-frame-and-worker.https.window.html",
       {
        "script_metadata": [
         [
@@ -503067,10 +503235,10 @@
       }
      ]
     ],
-    "main-frame.tentative.https.window.js": [
+    "main-frame.https.window.js": [
      "fd58e9314b0980154a9e828e0212dee2f20309d5",
      [
-      "measure-memory/main-frame.tentative.https.window.html",
+      "measure-memory/main-frame.https.window.html",
       {
        "script_metadata": [
         [
@@ -503090,10 +503258,10 @@
       }
      ]
     ],
-    "randomized-breakdown.tentative.https.window.js": [
+    "randomized-breakdown.https.window.js": [
      "e3a65c1ba2a6a90c142b9c2da3368fc949c874b7",
      [
-      "measure-memory/randomized-breakdown.tentative.https.window.html",
+      "measure-memory/randomized-breakdown.https.window.html",
       {
        "script_metadata": [
         [
@@ -503113,10 +503281,10 @@
       }
      ]
     ],
-    "redirect.client.tentative.https.window.js": [
+    "redirect.client.https.window.js": [
      "36d9a9d44cd1734572c2b3b930cec7ff0b3eeee2",
      [
-      "measure-memory/redirect.client.tentative.https.window.html",
+      "measure-memory/redirect.client.https.window.html",
       {
        "script_metadata": [
         [
@@ -503136,10 +503304,10 @@
       }
      ]
     ],
-    "redirect.server.tentative.https.window.js": [
+    "redirect.server.https.window.js": [
      "6506730b34cbe681a72a65b290c3c2e5b012f5e5",
      [
-      "measure-memory/redirect.server.tentative.https.window.html",
+      "measure-memory/redirect.server.https.window.html",
       {
        "script_metadata": [
         [
@@ -503159,10 +503327,10 @@
       }
      ]
     ],
-    "window-open.cross-origin.tentative.https.window.js": [
+    "window-open.cross-origin.https.window.js": [
      "2e6561ad44bbd8345102e627dbe079ea7f98605e",
      [
-      "measure-memory/window-open.cross-origin.tentative.https.window.html",
+      "measure-memory/window-open.cross-origin.https.window.html",
       {
        "script_metadata": [
         [
@@ -503182,10 +503350,10 @@
       }
      ]
     ],
-    "window-open.cross-site.tentative.https.window.js": [
+    "window-open.cross-site.https.window.js": [
      "f70ad9df32b92640160503550afcbb9a4168943e",
      [
-      "measure-memory/window-open.cross-site.tentative.https.window.html",
+      "measure-memory/window-open.cross-site.https.window.html",
       {
        "script_metadata": [
         [
@@ -503205,10 +503373,10 @@
       }
      ]
     ],
-    "window-open.mix.tentative.https.window.js": [
+    "window-open.mix.https.window.js": [
      "6a913a88a4876ae096b989658384c8848b14f227",
      [
-      "measure-memory/window-open.mix.tentative.https.window.html",
+      "measure-memory/window-open.mix.https.window.html",
       {
        "script_metadata": [
         [
@@ -503228,10 +503396,10 @@
       }
      ]
     ],
-    "window-open.same-origin.tentative.https.window.js": [
+    "window-open.same-origin.https.window.js": [
      "5223a97bc7d2fc4ca55fbd5e06d979abe78d2ca1",
      [
-      "measure-memory/window-open.same-origin.tentative.https.window.html",
+      "measure-memory/window-open.same-origin.https.window.html",
       {
        "script_metadata": [
         [
@@ -548226,6 +548394,69 @@
        }
       ]
      ],
+     "modified-contenttype.any.js": [
+      "354930517c73ea54162a655c2c12e93b40cc1a73",
+      [
+       "wasm/webapi/modified-contenttype.any.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/wasm-module-builder.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "wasm/webapi/modified-contenttype.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/wasm-module-builder.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "wasm/webapi/modified-contenttype.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/wasm-module-builder.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "wasm/webapi/modified-contenttype.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/wasm-module-builder.js"
+         ]
+        ]
+       }
+      ]
+     ],
      "origin.sub.any.js": [
       "bf7901eeddee7c28413031198c4f138b7a23d6ea",
       [
@@ -549003,6 +549234,13 @@
        {}
       ]
      ],
+     "subresource-loading-cross-origin.tentative.html": [
+      "3991aef2c40ccfa6c82eee09e76e9b42e16c8cf5",
+      [
+       null,
+       {}
+      ]
+     ],
      "subresource-loading-from-web-bundle.tentative.html": [
       "53a9c1b2cc707271c8d7b0e7fb7385fd59839744",
       [
@@ -553602,6 +553840,15 @@
       }
      ]
     ],
+    "RTCDataChannel-iceRestart.html": [
+     "648c11b66a4641a44374763a38bed8cebea2267a",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "RTCDataChannel-id.html": [
      "10dc5eacb9ccf2a878d29e8b13eb082271731e65",
      [
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-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    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
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [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/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/api/body/mime-type.any.js.ini b/tests/wpt/metadata/fetch/api/body/mime-type.any.js.ini
new file mode 100644
index 00000000000..9df4327e18f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/body/mime-type.any.js.ini
@@ -0,0 +1,39 @@
+[mime-type.any.html]
+  [Request: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Response: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Request: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: removing implicit Content-Type]
+    expected: FAIL
+
+  [Request: removing implicit Content-Type]
+    expected: FAIL
+
+
+[mime-type.any.worker.html]
+  [Request: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Response: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: overriding explicit Content-Type]
+    expected: FAIL
+
+  [Request: setting missing Content-Type]
+    expected: FAIL
+
+  [Response: removing implicit Content-Type]
+    expected: FAIL
+
+  [Request: removing implicit Content-Type]
+    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 0d5d08e0976..9543c95c0ef 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,6 @@
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
@@ -330,3 +321,15 @@
   [<iframe>: separate 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 */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: 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 25318ac5846..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript x/x]
     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 30e1b851fd4..c7ffe03c4ae 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,9 @@
   [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
+
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    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/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata-layout-2020/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_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
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 442db3cb549..2532dceabac 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,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index dab21cae5d8..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -7,11 +6,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    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..f42f518d257 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,5 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 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,5 @@
 [iframe_sandbox_popups_escaping-2.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/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 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/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 0fbc49ea1c1..7a36937927c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 73b4e6216a3..fd2dca7c221 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,18 +2,12 @@
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
@@ -32,18 +26,9 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
@@ -53,33 +38,39 @@
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart out of range a second time (must not fire select)]
+  [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionStart a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/webapi/modified-contenttype.any.js.ini b/tests/wpt/metadata/wasm/webapi/modified-contenttype.any.js.ini
new file mode 100644
index 00000000000..e057260f5a8
--- /dev/null
+++ b/tests/wpt/metadata/wasm/webapi/modified-contenttype.any.js.ini
@@ -0,0 +1,35 @@
+[modified-contenttype.any.serviceworker.html]
+  expected: ERROR
+
+[modified-contenttype.any.sharedworker.html]
+  expected: ERROR
+
+[modified-contenttype.any.worker.html]
+  expected: TIMEOUT
+  [compileStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+  [instantiateStreaming with Content-Type set late]
+    expected: NOTRUN
+
+  [compileStreaming with Content-Type set late]
+    expected: TIMEOUT
+
+  [instantiateStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+
+[modified-contenttype.any.html]
+  expected: TIMEOUT
+  [compileStreaming with Content-Type removed late]
+    expected: NOTRUN
+
+  [instantiateStreaming with Content-Type set late]
+    expected: NOTRUN
+
+  [compileStreaming with Content-Type set late]
+    expected: TIMEOUT
+
+  [instantiateStreaming with Content-Type removed late]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 226bd926cc6..456c5875b13 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -752,3 +752,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-6.7702334005389212e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t7.2735377699704657e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/without-ports/017.html.ini
rename to tests/wpt/metadata/webmessaging/with-ports/017.html.ini
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js b/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
index 3635da73b75..279ad2229ba 100644
--- a/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
+++ b/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
@@ -98,8 +98,7 @@ function CreateFormDataFromPayload(payload) {
     return formData;
 }
 
-// Schedules async_test's for each of the test cases, treating them as a single session,
-// and wires up the continueAfterSendingBeacon() and waitForResults() calls.
+// Schedules promise_test's for each of the test cases.
 // Parameters:
 //     testCases: An array of test cases.
 //     suffix [optional]: A string used for the suffix for each test case name.
@@ -108,10 +107,10 @@ function CreateFormDataFromPayload(payload) {
 function runTests(testCases, suffix = '', buildUrl = self.buildUrl, sendData = self.sendData) {
     for (const testCase of testCases) {
         const id = token();
-        async_test((test) => {
+        promise_test((test) => {
             const url = buildUrl(id);
             assert_true(sendData(url, testCase.data), 'sendBeacon should succeed');
-            waitForResult(id).then(() => test.done(), test.step_func((e) => {throw e;}));
+            return waitForResult(id);
         }, `Verify 'navigator.sendbeacon()' successfully sends for variant: ${testCase.name}${suffix}`);
     };
 }
diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
index b99564bf9ec..f6e5fd0e4b5 100644
--- a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
+++ b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
@@ -29,24 +29,13 @@ function loadScript(path) {
  * @returns {Promise<void>} Resolves when Chromium specific setup is complete.
  */
 async function performChromiumSetup() {
-  const chromiumResources = [
-    '/gen/content/test/data/mojo_web_test_helper_test.mojom.js',
-    '/gen/device/bluetooth/public/mojom/uuid.mojom.js',
-    '/gen/url/mojom/origin.mojom.js',
-    '/gen/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.js',
-    '/gen/content/web_test/common/fake_bluetooth_chooser.mojom.js',
-  ];
   // Determine path prefixes.
   let resPrefix = '/resources';
-  let extra = ['/resources/chromium/web-bluetooth-test.js'];
+  const chromiumResources = ['/resources/chromium/web-bluetooth-test.js'];
   const pathname = window.location.pathname;
-  if (pathname.includes('/web_tests/')) {
-    let root = pathname.match(/.*(?:web_tests)/);
-    resPrefix = `${root}/external/wpt/resources`;
-    extra = [
-      `${root}/external/wpt/resources/chromium/web-bluetooth-test.js`,
-      `${root}/resources/bluetooth/bluetooth-fake-adapter.js`,
-    ];
+  if (pathname.includes('/wpt_internal/')) {
+    chromiumResources.push(
+        '/wpt_internal/bluetooth/resources/bluetooth-fake-adapter.js');
   }
 
   await loadScript(`${resPrefix}/test-only-api.js`);
@@ -54,11 +43,12 @@ async function performChromiumSetup() {
     return;
   }
 
-  await loadMojoResources(chromiumResources);
-  for (const path of extra) {
+  for (const path of chromiumResources) {
     await loadScript(path);
   }
 
+  await initializeChromiumResources();
+
   // Call setBluetoothFakeAdapter() to clean up any fake adapters left over by
   // legacy tests. Legacy tests that use setBluetoothFakeAdapter() sometimes
   // fail to clean their fake adapter. This is not a problem for these tests
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-018.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-018.html
new file mode 100644
index 00000000000..0c9d21642ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-018.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-grid/#abspos">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="display: grid; grid-template-columns: 200px; grid-template-rows: 200px; max-width: 100px; max-height: 100px; position: relative;">
+  <div style="background: green; position: absolute; width: 100%; height: 100%;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015-ref.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015-ref.html
new file mode 100644
index 00000000000..dd4d8daf6a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<style>
+.grid {
+  display: grid;
+  padding: 10px;
+  grid-template-columns: 40px 40px;
+  grid-template-rows: 40px 40px;
+  border: solid;
+  width: 80px;
+  height: 80px;
+  gap: 16px;
+}
+.grid > div {
+  background: green;
+}
+</style>
+<div class="grid">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015.html
new file mode 100644
index 00000000000..ed1048fd697
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#gaps">
+<link rel="match" href="grid-gutters-015-ref.html">
+<style>
+.grid {
+  display: inline-grid;
+  padding: 10px;
+  grid-template-columns: 40px 40px;
+  grid-template-rows: 40px 40px;
+  border: solid;
+  gap: 20%;
+}
+.grid > div {
+  background: green;
+}
+</style>
+<div class="grid">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016-ref.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016-ref.html
new file mode 100644
index 00000000000..a56ab07e182
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<style>
+.grid {
+  display: grid;
+  padding: 10px;
+  grid-template-columns: 40px 40px;
+  grid-template-rows: 40px 40px;
+  border: solid;
+  width: 140px;
+  height: 140px;
+  gap: 28px;
+}
+.grid > div {
+  background: green;
+}
+</style>
+<div class="grid">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016.html
new file mode 100644
index 00000000000..163787cfee6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#gaps">
+<link rel="match" href="grid-gutters-016-ref.html">
+<style>
+.grid {
+  display: inline-grid;
+  padding: 10px;
+  grid-template-columns: 40px 40px;
+  grid-template-rows: 40px 40px;
+  border: solid;
+  gap: 20%;
+  min-width: 140px;
+  min-height: 140px;
+}
+.grid > div {
+  background: green;
+}
+</style>
+<div class="grid">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html
index d10c013e1ee..85724c31fea 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html
@@ -19,10 +19,12 @@ div {
 }
 
 #close-target {
-  width: 300px;
-  height: 300px;
-  top: 100px;
-  right: 200px;
+  width: 200px;
+  height: 200px;
+  border: solid green 50px;
+  top: 50px;
+  right: 150px;
+  margin: 50px;
   background-color: green;
   scroll-snap-align: start;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html
new file mode 100644
index 00000000000..f3eaa06ac9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<title>
+  CSS Scroll Snap Reference
+</title>
+<style>
+
+.scroller {
+  width: 100px;
+  height: 100px;
+  border: solid blue;
+  margin: 10px;
+  display: inline-block;
+}
+
+.scroller > div {
+  width: 30px;
+  height: 30px;
+  background: orange;
+}
+
+.proxfar {
+  border-color: orange;
+}
+
+</style>
+
+<p>Test passes if there is an orange square precisely at the top left corner of each blue box (no gap),
+and each orange box is empty.
+
+
+<div class="mandatory">
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <!-- on-screen -->
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+</div>
+
+<div class="proximity">
+  <!-- off-screen -->
+  <div class="scroller proxfar">
+  </div>
+
+  <div class="scroller proxfar">
+  </div>
+
+  <div class="scroller proxfar">
+  </div>
+
+  <!-- on-screen -->
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+
+  <div class="scroller">
+    <div></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html
new file mode 100644
index 00000000000..ea47c9f36cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<title>
+  On-screen vs. Off-screen Snapped Initial Scroll Position (Mandatory and Proximity)
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#scroll-snap-align">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap/#re-snap">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<!-- Test assumes 2px proximity is enough to snap.
+     If your implementation has a cogent argument as to why this is too much,
+     please request a change to this test. ~fantasai -->
+<link rel="match" href="scroll-snap-initial-layout-000-ref.html">
+
+<style>
+
+.scroller {
+  scroll-snap-type: both mandatory;
+  overflow: hidden;
+  scroll-padding: 0;
+  width: 100px;
+  height: 100px;
+  border: solid blue;
+  margin: 10px;
+  display: inline-block;
+}
+
+.mandatory > .scroller {
+  scroll-snap-type: both mandatory;
+}
+
+.proximity > .scroller {
+  scroll-snap-type: both proximity;
+}
+
+.scroller > div {
+  /* padding wrapper */
+  width: 30px;
+}
+
+.scroller > div > div {
+  /* target box */
+  height: 30px;
+  background: orange;
+  scroll-snap-align: start;
+}
+
+.proxfar {
+  border-color: orange;
+}
+.proxfar > div > div {
+  background: red;
+}
+
+</style>
+
+<p>Test passes if there is an orange square precisely at the top left corner of each blue box (no gap),
+and each orange box is empty.
+
+
+<div class="mandatory">
+  <!-- off-screen -->
+  <div class="scroller">
+    <div style="padding: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding-block: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding-inline: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <!-- on-screen -->
+  <div class="scroller">
+    <div style="padding: 90px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding-block: 90px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding-inline: 90px;"><div class="small-target"></div></div>
+  </div>
+</div>
+
+<div class="proximity">
+  <!-- off-screen -->
+  <div class="scroller proxfar">
+    <div style="padding: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller proxfar">
+    <div style="padding-block: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller proxfar">
+    <div style="padding-inline: 110px;"><div class="small-target"></div></div>
+  </div>
+
+  <!-- on-screen -->
+  <div class="scroller">
+    <div style="padding: 2px 110px 110px 2px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding: 2px 110px 110px 2px;"><div class="small-target"></div></div>
+  </div>
+
+  <div class="scroller">
+    <div style="padding: 2px 110px 110px 2px;"><div class="small-target"></div></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html
index aa65dde1810..9a680d10d9f 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html
@@ -20,10 +20,12 @@ div {
 }
 
 #close-target {
-  width: 300px;
-  height: 300px;
-  top: 100px;
-  left: 200px;
+  width: 200px;
+  height: 200px;
+  border: solid green 50px;
+  top: 50px;
+  left: 150px;
+  margin: 50px;
   background-color: green;
   scroll-snap-align: start end;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html
index 898e64be619..f4de0411e05 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html
@@ -20,10 +20,12 @@ div {
 }
 
 #close-target {
-  width: 300px;
-  height: 300px;
-  top: 100px;
-  left: 200px;
+  width: 200px;
+  height: 200px;
+  border: solid green 50px;
+  top: 50px;
+  left: 150px;
+  margin: 50px;
   background-color: green;
   scroll-snap-align: end start;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html
index b3141f03f3c..1710bc16ddf 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html
@@ -23,10 +23,12 @@ div {
 }
 
 #close-target {
-  width: 300px;
-  height: 300px;
-  top: 100px;
-  left: 200px;
+  width: 200px;
+  height: 200px;
+  border: solid green 50px;
+  top: 50px;
+  left: 150px;
+  margin: 50px;
   background-color: green;
   scroll-snap-align: start;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html
new file mode 100644
index 00000000000..139c4de6447
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: max-content size contribution with replaced element</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: flex;">
+  <div>
+    <img style="width: 100%; height: 100%; vertical-align: bottom;" width="100" height="100" src="support/100x100-green.png">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/100x100-green.png b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/100x100-green.png
new file mode 100644
index 00000000000..25b76c3c6f2
Binary files /dev/null and b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/100x100-green.png differ
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-017.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-017.html
new file mode 100644
index 00000000000..742e389950f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-017.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>&#x3000;&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-018.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-018.html
new file mode 100644
index 00000000000..16bb8767512
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-018.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>XX</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-019.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-019.html
new file mode 100644
index 00000000000..07070005120
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-019.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>X&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-020.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-020.html
new file mode 100644
index 00000000000..97ae007898b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-020.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-isolate">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'isolate' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: isolate;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>&#x3000;&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-021.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-021.html
new file mode 100644
index 00000000000..b75327a64ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-021.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-isolate">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'isolate' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: isolate;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>XX</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-022.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-022.html
new file mode 100644
index 00000000000..71720c2b2d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-022.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-isolate">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Disabled hypenation and unicode-bidi 'isolate' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: isolate;
+    hyphens: none;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>X&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-023.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-023.html
new file mode 100644
index 00000000000..ea95ab1e0f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-023.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-auto">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Auto hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: auto;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>&#x3000;&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-024.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-024.html
new file mode 100644
index 00000000000..2a65400c600
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-024.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-auto">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Auto hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: auto;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>XX</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-025.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-025.html
new file mode 100644
index 00000000000..5123e10524f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-025.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#valdef-unicode-bidi-plaintext">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-auto">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Auto hypenation and unicode-bidi 'plaintext' should not affect, hence the trailing ideographic spaces must hang; however, the rest of the sequence is wrapped due to the forced break.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 50px/1 Ahem;
+    width: 1ch;
+}
+span {
+    background: green;
+    color: transparent;
+
+    unicode-bidi: plaintext;
+    hyphens: auto;
+}
+.ref {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div><span>X&#x3000;<br>X&#x3000;</span></div>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
index d45f5d8ed0f..b0daf34ba8d 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
@@ -45,6 +45,7 @@
   <button id="next" tabindex="-1">Focus moves here.</button>
   <script>
     start.addEventListener('keydown', (e) => {
+      e.preventDefault();
       next.focus();
     });
 
diff --git a/tests/wpt/web-platform-tests/fetch/api/body/mime-type.any.js b/tests/wpt/web-platform-tests/fetch/api/body/mime-type.any.js
new file mode 100644
index 00000000000..a0f90a0abdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/body/mime-type.any.js
@@ -0,0 +1,40 @@
+[
+ () => new Request("about:blank", { headers: { "Content-Type": "text/plain" } }),
+ () => new Response("", { headers: { "Content-Type": "text/plain" } })
+].forEach(bodyContainerCreator => {
+  const bodyContainer = bodyContainerCreator();
+  promise_test(async t => {
+    assert_equals(bodyContainer.headers.get("Content-Type"), "text/plain");
+    const newMIMEType = "test/test";
+    bodyContainer.headers.set("Content-Type", newMIMEType);
+    const blob = await bodyContainer.blob();
+    assert_equals(blob.type, newMIMEType);
+  }, `${bodyContainer.constructor.name}: overriding explicit Content-Type`);
+});
+
+[
+  () => new Request("about:blank", { body: new URLSearchParams(), method: "POST" }),
+  () => new Response(new URLSearchParams()),
+].forEach(bodyContainerCreator => {
+  const bodyContainer = bodyContainerCreator();
+  promise_test(async t => {
+    assert_equals(bodyContainer.headers.get("Content-Type"), "application/x-www-form-urlencoded;charset=UTF-8");
+    bodyContainer.headers.delete("Content-Type");
+    const blob = await bodyContainer.blob();
+    assert_equals(blob.type, "");
+  }, `${bodyContainer.constructor.name}: removing implicit Content-Type`);
+});
+
+[
+  () => new Request("about:blank", { body: new ArrayBuffer(), method: "POST" }),
+  () => new Response(new ArrayBuffer()),
+].forEach(bodyContainerCreator => {
+  const bodyContainer = bodyContainerCreator();
+  promise_test(async t => {
+    assert_equals(bodyContainer.headers.get("Content-Type"), null);
+    const newMIMEType = "test/test";
+    bodyContainer.headers.set("Content-Type", newMIMEType);
+    const blob = await bodyContainer.blob();
+    assert_equals(blob.type, newMIMEType);
+  }, `${bodyContainer.constructor.name}: setting missing Content-Type`);
+});
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 27ba5497065..2e0fc8b39bc 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -708,6 +708,7 @@ WEB-PLATFORM.TEST:signed-exchange/appcache/resources/*.sxg
 WEB-PLATFORM.TEST:signed-exchange/resources/generate-test-sxgs.sh
 
 # Web Bundle files have hard-coded URLs
+WEB-PLATFORM.TEST:web-bundle/resources/*.har
 WEB-PLATFORM.TEST:web-bundle/resources/generate-test-wbns.sh
 WEB-PLATFORM.TEST:web-bundle/resources/nested/*.wbn
 WEB-PLATFORM.TEST:web-bundle/resources/wbn/*.wbn
@@ -716,13 +717,13 @@ WEB-PLATFORM.TEST:web-bundle/subresource-loading/*.html
 # Tests that depend on resources in /gen/ in Chromium:
 # https://github.com/web-platform-tests/wpt/issues/16455
 # Please consult with ecosystem-infra@chromium.org before adding more.
-MISSING DEPENDENCY: bluetooth/resources/bluetooth-test.js
 MISSING DEPENDENCY: contacts/resources/helpers.js
 MISSING DEPENDENCY: credential-management/support/otpcredential-helper.js
 MISSING DEPENDENCY: generic-sensor/resources/generic-sensor-helpers.js
 MISSING DEPENDENCY: idle-detection/resources/idle-detection-helper.js
 MISSING DEPENDENCY: mediacapture-image/resources/imagecapture-helpers.js
 MISSING DEPENDENCY: orientation-event/resources/orientation-event-helpers.js
+MISSING DEPENDENCY: resources/chromium/web-bluetooth-test.js
 MISSING DEPENDENCY: resources/chromium/webusb-test.js
 MISSING DEPENDENCY: resources/test-only-api.js
 MISSING DEPENDENCY: screen_enumeration/resources/screenenumeration-helpers.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/README.md b/tests/wpt/web-platform-tests/measure-memory/README.md
index 953611f9303..d80c0e067f9 100644
--- a/tests/wpt/web-platform-tests/measure-memory/README.md
+++ b/tests/wpt/web-platform-tests/measure-memory/README.md
@@ -1,8 +1,6 @@
-# Tentative tests for performance.measureMemory API
+# Tests for performance.measureMemory API
 
-Tests in this directory are for the proposed performance.measureMemory API.
-This is not yet standardised and browsers should not be expected to pass
-these tests.
+Tests in this directory are for the performance.measureMemory API:
 
-See the explainer at https://github.com/WICG/performance-measure-memory
-for more information about the API.
+- Specification: https://wicg.github.io/performance-measure-memory
+- Explainer: https://github.com/WICG/performance-measure-memory
diff --git a/tests/wpt/web-platform-tests/measure-memory/detached.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/detached.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/detached.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/detached.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/detached.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/detached.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/detached.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/detached.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/idlharness.tentative.any.js b/tests/wpt/web-platform-tests/measure-memory/idlharness.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/idlharness.tentative.any.js
rename to tests/wpt/web-platform-tests/measure-memory/idlharness.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/main-frame.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/main-frame.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.client.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/redirect.client.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.client.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/redirect.client.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.server.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/redirect.server.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.server.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/redirect.server.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.mix.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.mix.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.mix.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.mix.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.tentative.https.window.js b/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.tentative.https.window.js
rename to tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js
diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers b/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers
rename to tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js.headers
diff --git a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js b/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
index aa4b80d2831..ee835c224b4 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
@@ -1,5 +1,9 @@
 'use strict';
 
+const content = {};
+const bluetooth = {};
+const MOJO_CHOOSER_EVENT_TYPE_MAP = {};
+
 function toMojoCentralState(state) {
   switch (state) {
     case 'absent':
@@ -54,58 +58,16 @@ function convertToMojoMap(record, keyFn, isNumberKey = false) {
   return map;
 }
 
-// Mapping of the property names of
-// BluetoothCharacteristicProperties defined in
-// https://webbluetoothcg.github.io/web-bluetooth/#characteristicproperties
-// to property names of the CharacteristicProperties mojo struct.
-const CHARACTERISTIC_PROPERTIES_WEB_TO_MOJO = {
-  broadcast: 'broadcast',
-  read: 'read',
-  write_without_response: 'write_without_response',
-  write: 'write',
-  notify: 'notify',
-  indicate: 'indicate',
-  authenticatedSignedWrites: 'authenticated_signed_writes',
-  extended_properties: 'extended_properties',
-};
-
-// Mapping of the Mojo ChooserEventType enum to a string.
-const MOJO_CHOOSER_EVENT_TYPE_MAP = (() => {
-  const ChooserEventType = content.mojom.ChooserEventType;
-  return {
-    [ChooserEventType.CHOOSER_OPENED]: 'chooser-opened',
-    [ChooserEventType.CHOOSER_CLOSED]: 'chooser-closed',
-    [ChooserEventType.ADAPTER_REMOVED]: 'adapter-removed',
-    [ChooserEventType.ADAPTER_DISABLED]: 'adapter-disabled',
-    [ChooserEventType.ADAPTER_ENABLED]: 'adapter-enabled',
-    [ChooserEventType.DISCOVERY_FAILED_TO_START]: 'discovery-failed-to-start',
-    [ChooserEventType.DISCOVERING]: 'discovering',
-    [ChooserEventType.DISCOVERY_IDLE]: 'discovery-idle',
-    [ChooserEventType.ADD_OR_UPDATE_DEVICE]: 'add-or-update-device',
-  }
-})();
-
 function ArrayToMojoCharacteristicProperties(arr) {
-  let struct = new bluetooth.mojom.CharacteristicProperties();
-
-  arr.forEach(val => {
-    let mojo_property =
-      CHARACTERISTIC_PROPERTIES_WEB_TO_MOJO[val];
-
-    if (struct.hasOwnProperty(mojo_property))
-      struct[mojo_property] = true;
-    else
-      throw `Invalid member '${val}' for CharacteristicProperties`;
-  });
-
+  const struct = {};
+  arr.forEach(property => { struct[property] = true; });
   return struct;
 }
 
 class FakeBluetooth {
   constructor() {
-    this.fake_bluetooth_ptr_ = new bluetooth.mojom.FakeBluetoothPtr();
-    Mojo.bindInterface(bluetooth.mojom.FakeBluetooth.name,
-        mojo.makeRequest(this.fake_bluetooth_ptr_).handle, 'process');
+    this.fake_bluetooth_ptr_ = new bluetooth.mojom.FakeBluetoothRemote();
+    this.fake_bluetooth_ptr_.$.bindNewPipeAndPassReceiver().bindInBrowser('process');
     this.fake_central_ = null;
   }
 
@@ -232,7 +194,7 @@ class FakeCentral {
     }
 
     await this.fake_central_ptr_.simulateAdvertisementReceived(
-        new bluetooth.mojom.ScanResult(clonedScanResult));
+        clonedScanResult);
 
     return this.fetchOrCreatePeripheral_(clonedScanResult.deviceAddress);
   }
@@ -572,21 +534,17 @@ class FakeRemoteGATTDescriptor {
 // and records the events produced by the Bluetooth chooser.
 class FakeChooser {
   constructor() {
-    let fakeBluetoothChooserFactoryPtr =
-        new content.mojom.FakeBluetoothChooserFactoryPtr();
-    Mojo.bindInterface(content.mojom.FakeBluetoothChooserFactory.name,
-        mojo.makeRequest(fakeBluetoothChooserFactoryPtr).handle, 'process');
+    let fakeBluetoothChooserFactoryRemote =
+        new content.mojom.FakeBluetoothChooserFactoryRemote();
+    fakeBluetoothChooserFactoryRemote.$.bindNewPipeAndPassReceiver().bindInBrowser('process');
 
     this.fake_bluetooth_chooser_ptr_ =
-        new content.mojom.FakeBluetoothChooserPtr();
-
-    let clientPtrInfo = new mojo.AssociatedInterfacePtrInfo();
-    this.fake_bluetooth_chooser_client_binding_ =
-        new mojo.AssociatedBinding(content.mojom.FakeBluetoothChooserClient,
-            this, mojo.makeRequest(clientPtrInfo));
-
-    fakeBluetoothChooserFactoryPtr.createFakeBluetoothChooser(
-        mojo.makeRequest(this.fake_bluetooth_chooser_ptr_), clientPtrInfo);
+        new content.mojom.FakeBluetoothChooserRemote();
+    this.fake_bluetooth_chooser_client_receiver_ =
+        new content.mojom.FakeBluetoothChooserClientReceiver(this);
+    fakeBluetoothChooserFactoryRemote.createFakeBluetoothChooser(
+        this.fake_bluetooth_chooser_ptr_.$.bindNewPipeAndPassReceiver(),
+        this.fake_bluetooth_chooser_client_receiver_.$.associateAndPassRemote());
 
     this.events_ = new Array();
     this.event_listener_ = null;
@@ -639,12 +597,31 @@ class FakeChooser {
   }
 }
 
-// If this line fails, it means that current environment does not support the
-// Web Bluetooth Test API.
-try {
-  navigator.bluetooth.test = new FakeBluetooth();
-} catch {
+async function initializeChromiumResources() {
+  content.mojom = await import(
+      '/gen/content/web_test/common/fake_bluetooth_chooser.mojom.m.js');
+  bluetooth.mojom = await import(
+      '/gen/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.m.js');
+
+  const map = MOJO_CHOOSER_EVENT_TYPE_MAP;
+  const types = content.mojom.ChooserEventType;
+  map[types.CHOOSER_OPENED] = 'chooser-opened';
+  map[types.CHOOSER_CLOSED] = 'chooser-closed';
+  map[types.ADAPTER_REMOVED] = 'adapter-removed';
+  map[types.ADAPTER_DISABLED] = 'adapter-disabled';
+  map[types.ADAPTER_ENABLED] = 'adapter-enabled';
+  map[types.DISCOVERY_FAILED_TO_START] = 'discovery-failed-to-start';
+  map[types.DISCOVERING] = 'discovering';
+  map[types.DISCOVERY_IDLE] = 'discovery-idle';
+  map[types.ADD_OR_UPDATE_DEVICE] = 'add-or-update-device';
+
+  // If this line fails, it means that current environment does not support the
+  // Web Bluetooth Test API.
+  try {
+    navigator.bluetooth.test = new FakeBluetooth();
+  } catch {
     throw 'Web Bluetooth Test API is not implemented on this ' +
         'environment. See the bluetooth README at ' +
         'https://github.com/web-platform-tests/wpt/blob/master/bluetooth/README.md#web-bluetooth-testing';
+  }
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-match.js b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-match.js
index 8bf7fda3096..60c0dd0a02f 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-match.js
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-match.js
@@ -381,6 +381,7 @@ cache_test(async (cache) => {
 cache_test(async (cache) => {
     const url = '/dummy';
     const original_type = 'text/html';
+    const override_type = 'text/plain';
     const init_with_headers = {
       headers: {
         'content-type': original_type
@@ -394,24 +395,22 @@ cache_test(async (cache) => {
     assert_true(original_response_type.includes(original_type),
                 'original response should include the expected mime type');
 
-    // Verify overwriting the content-type header does not change the mime
-    // type.  It should be fixed at Response construction time.
+    // Verify overwriting the content-type header changes the mime type.
     const overwritten_response = new Response('hello world', init_with_headers);
-    overwritten_response.headers.set('content-type', 'text/plain');
+    overwritten_response.headers.set('content-type', override_type);
     const overwritten_response_type = (await overwritten_response.blob()).type;
-    assert_equals(overwritten_response_type, original_response_type,
-                  'original and overwritten response mime types should match');
+    assert_equals(overwritten_response_type, override_type,
+                  'mime type can be overridden');
 
     // Verify the Response read from Cache uses the original mime type
     // computed when it was first constructed.
     const tmp = new Response('hello world', init_with_headers);
-    tmp.headers.set('content-type', 'text/plain');
+    tmp.headers.set('content-type', override_type);
     await cache.put(url, tmp);
     const cache_response = await cache.match(url);
     const cache_mime_type = (await cache_response.blob()).type;
-    assert_equals(cache_mime_type, original_response_type,
-                  'original and cached overwritten response mime types ' +
-                  'should match');
-  }, 'MIME type should be frozen at response construction.');
+    assert_equals(cache_mime_type, override_type,
+                  'overwritten and cached response mime types should match');
+  }, 'MIME type should reflect Content-Type headers of response.');
 
 done();
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 c748ca2e3b1..0fc11c190d1 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
@@ -98,7 +98,9 @@ class DirectoryHandler(object):
                    {"link": link, "name": ".."})
         items = []
         prev_item = None
-        for item in sorted(os.listdir(path)):
+        # This ensures that .headers always sorts after the file it provides the headers for. E.g.,
+        # if we have x, x-y, and x.headers, the order will be x, x.headers, and then x-y.
+        for item in sorted(os.listdir(path), key=lambda x: (x[:-len(".headers")], x) if x.endswith(".headers") else (x, x)):
             if prev_item and prev_item + ".headers" == item:
                 items[-1][1] = item
                 prev_item = None
diff --git a/tests/wpt/web-platform-tests/wasm/webapi/modified-contenttype.any.js b/tests/wpt/web-platform-tests/wasm/webapi/modified-contenttype.any.js
new file mode 100644
index 00000000000..354930517c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/webapi/modified-contenttype.any.js
@@ -0,0 +1,24 @@
+// META: global=window,worker
+// META: script=/wasm/jsapi/wasm-module-builder.js
+
+["compileStreaming", "instantiateStreaming"].forEach(method => {
+  promise_test(async t => {
+    const buffer = new WasmModuleBuilder().toBuffer();
+    const argument = new Response(buffer, { headers: { "Content-Type": "test/test" } });
+    argument.headers.set("Content-Type", "application/wasm");
+    // This should resolve successfully
+    await WebAssembly[method](argument);
+    // Ensure body can only be read once
+    return promise_rejects_js(t, TypeError, argument.blob());
+  }, `${method} with Content-Type set late`);
+
+  promise_test(async t => {
+    const buffer = new WasmModuleBuilder().toBuffer();
+    const argument = new Response(buffer, { headers: { "Content-Type": "application/wasm" } });
+    argument.headers.delete("Content-Type");
+    // Ensure Wasm cannot be created
+    await promise_rejects_js(t, TypeError, WebAssembly[method](argument));
+    // This should resolve successfully
+    await argument.arrayBuffer();
+  }, `${method} with Content-Type removed late`);
+});
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har
new file mode 100644
index 00000000000..7435393b13b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har
@@ -0,0 +1,48 @@
+{
+  "log": {
+    "entries": [
+      {
+        "request": {
+          "method": "GET",
+          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.cors.json",
+          "headers": []
+        },
+        "response": {
+          "status": 200,
+          "headers": [
+            {
+              "name": "Content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "Access-Control-Allow-Origin",
+              "value": "*"
+            }
+          ],
+          "content": {
+            "text": "{ cors: 1 }"
+          }
+        }
+      },
+      {
+        "request": {
+          "method": "GET",
+          "url": "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.no-cors.json",
+          "headers": []
+        },
+        "response": {
+          "status": 200,
+          "headers": [
+            {
+              "name": "Content-type",
+              "value": "application/json"
+            }
+          ],
+          "content": {
+            "text": "{ no_cors: 1}"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
index 3c8a3ea68d6..8c8fd45d817 100755
--- a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
@@ -70,3 +70,9 @@ gen-bundle \
   -har urn-uuid.har \
   -primaryURL urn:uuid:020111b3-437a-4c5c-ae07-adb6bbffb720 \
   -o wbn/urn-uuid.wbn
+
+gen-bundle \
+  -version b1 \
+  -har cross-origin.har \
+  -primaryURL $wpt_test_https_origin/web-bundle/resources/wbn/cors/resource.json \
+  -o wbn/cors/cross-origin.wbn
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/__dir__.headers b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/__dir__.headers
new file mode 100644
index 00000000000..383abc543c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/__dir__.headers
@@ -0,0 +1,2 @@
+Content-Type: application/webbundle
+Access-Control-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn
new file mode 100644
index 00000000000..bed9bf2af74
Binary files /dev/null and b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn differ
diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cross-origin.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cross-origin.tentative.html
new file mode 100644
index 00000000000..3991aef2c40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-cross-origin.tentative.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<title>Cross-origin WebBundle subresource loading</title>
+<link
+  rel="help"
+  href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <!--
+       This wpt should run on an origin which is different than https://web-platform.test:8444/,
+       from where cross-orign WebBundles are served.
+
+       This test uses the two cross-origin WebBundles:
+
+       1. https://web-platform.test:8444/web-bundle/resources/wbn/cors/cross-origin.wbn,
+          which is served with an Access-Control-Allow-Origin response header.
+       2. http://web-platform.test:8444/web-bundle/resources/wbn/subreource.wbn,
+          which is served *without* an Access-Control-Allow-Origin response header.
+
+      `cross-origin.wbn` includes two subresources:
+       a. `resource.cors.json`, which includes an Access-Control-Allow-Origin response header.
+       b. `resource.no-cors.json`, which doesn't include an Access-Control-Allow-Origin response header.
+  -->
+  <link
+    rel="webbundle"
+    href="https://web-platform.test:8444/web-bundle/resources/wbn/cors/cross-origin.wbn"
+    resources="https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.cors.json
+         https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.no-cors.json"
+  />
+  <script>
+    promise_test(async () => {
+      const response = await fetch(
+        "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.cors.json"
+      );
+      assert_true(response.ok);
+    }, "A subresource which includes an Access-Control-Allow-Origin response header can be fetched");
+
+    promise_test(async (t) => {
+      return promise_rejects_js(
+        t,
+        TypeError,
+        fetch(
+          "https://web-platform.test:8444/web-bundle/resources/wbn/cors/resource.no-cors.json"
+        )
+      );
+    }, "A subresource which does not include an Access-Control-Allow-Origin response header can not be fetched");
+
+    promise_test(async () => {
+      return addLinkAndWaitForError(
+        "http://web-platform.test:8444/web-bundle/resources/wbn/subreource.wbn"
+      );
+    }, "A cross-origin WebBundle which does not include an Access-Control-Allow-Origin response header should fire an error event on load");
+
+    function addLinkAndWaitForError(url) {
+      return new Promise((resolve, reject) => {
+        const link = document.createElement("link");
+        link.rel = "webbundle";
+        link.href = url;
+        link.onload = reject;
+        link.onerror = () => resolve(link);
+        document.body.appendChild(link);
+      });
+    }
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-iceRestart.html b/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-iceRestart.html
new file mode 100644
index 00000000000..648c11b66a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-iceRestart.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>RTCDataChannel interactions with ICE restart</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+async function checkCanPassData(channel1, channel2) {
+  channel1.send('hello');
+  const message = await awaitMessage(channel2);
+  assert_equals(message, 'hello');
+}
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  const [channel1, channel2] = await createDataChannelPair(t, {}, pc1, pc2);
+  channel2.addEventListener('error', t.unreached_func());
+  channel2.addEventListener('error', t.unreached_func());
+
+  await checkCanPassData(channel1, channel2);
+  await checkCanPassData(channel2, channel1);
+
+  pc1.restartIce();
+  await exchangeOfferAnswer(pc1, pc2);
+
+  await checkCanPassData(channel1, channel2);
+  await checkCanPassData(channel2, channel1);
+  channel1.close();
+  channel2.close();
+}, `Data channel remains usable after ICE restart`);
+
+</script>