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-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/parsing/background-image-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/parsing/background-image-valid.html.ini
new file mode 100644
index 00000000000..e3db293e1b9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/parsing/background-image-valid.html.ini
@@ -0,0 +1,10 @@
+[background-image-valid.html]
+  [e.style['background-image'\] = "cross-fade(33% red, 33% white, blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "cross-fade(blue, linear-gradient(90deg, rgb(2, 0, 36) 0%, rgb(0, 212, 255) 100%))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "cross-fade(50% url(http://www.example.com), 50% url(http://www.example.com))" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    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
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini b/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini
new file mode 100644
index 00000000000..691c5bc64c7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini
@@ -0,0 +1,34 @@
+[prefers-contrast.html]
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: low)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast)']
+    expected: FAIL
+
+  [Check boolean context evaluation.]
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: no-preference)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: high)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: forced)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: low)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: forced)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: no-preference)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: high)']
+    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 665e9b4f334..2dc2f97299e 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,18 +312,9 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<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;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
@@ -333,3 +324,12 @@
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..646a46c0cbb 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,3 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [separate text/javascript error]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 7277f622b20..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
new file mode 100644
index 00000000000..429bec13114
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
@@ -0,0 +1,7 @@
+[iframe_sandbox_anchor_download_block_downloads.sub.tentative.html]
+  [<a download> triggered download in sandbox is blocked before a request is made]
+    expected: FAIL
+
+  [<a download> triggered download in sandbox is blocked.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
new file mode 100644
index 00000000000..380d474f385
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
@@ -0,0 +1,8 @@
+[iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html]
+  expected: TIMEOUT
+  [Navigation resulted download in sandbox is allowed by allow-downloads.]
+    expected: FAIL
+
+  [Navigation resulted download in sandbox from <object> is allowed by allow-downloads.]
+    expected: TIMEOUT
+
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 92008abe69f..3d627c10223 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,4 +1,5 @@
 [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: 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 daa518bd0e3..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: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..3080be9afc0 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-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..0218bc9ba9d 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,4 @@
 [iframe_sandbox_popups_nonescaping-2.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/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..7a36937927c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index ff64dd590a7..ed872bb35ff 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -2,9 +2,6 @@
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
-  [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
-
   [Check that rel=noopener with target=_top does a normal load]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
deleted file mode 100644
index 6cf9d13975c..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_005.html]
-  [document.write external script into iframe write back into parent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
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 09797eaab78..a1fa8abf237 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -135140,6 +135140,19 @@
        {}
       ]
      ],
+     "flex-item-contains-size-layout-001.html": [
+      "fde2a311268737f7cbf749b92f50ea5e7546c463",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flex-item-vertical-align.html": [
       "be9b66d07f316a01e8c2d46f60533706e0442856",
       [
@@ -139863,6 +139876,19 @@
        {}
       ]
      ],
+     "position-relative-percentage-top-003.html": [
+      "0570b246af1ce71f3669ff758d7ee942f48b2c5f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scrollbars-auto.html": [
       "ed1ffb8d93aec7c95eb3c9bbdbb6bd31ae402593",
       [
@@ -339859,7 +339885,7 @@
      []
     ],
     "image-capture.idl": [
-     "5cd83befe2b2801b093b7f3d3ef463994c94c42e",
+     "f4ad3705f04b972b82672b9c0db66b86e6c8a581",
      []
     ],
     "input-device-capabilities.idl": [
@@ -342150,7 +342176,7 @@
       []
      ],
      "FileSystemWritableFileStream-write.js": [
-      "c49f0f62848d9687847eadada46ffcbb7841790b",
+      "141a9771d2a93201b0484a2f4104795c5364b315",
       []
      ],
      "FileSystemWritableFileStream.js": [
@@ -364390,7 +364416,7 @@
       []
      ],
      "inspect-headers.py": [
-      "e0db9feeab03e80d6610e7d431500645e28e4aad",
+      "36ef17488ce5241f21caf48ac44c877bf86fbae8",
       []
      ],
      "invalid-utf8-html.py": [
@@ -364424,7 +364450,7 @@
       []
      ],
      "redirect.py": [
-      "9d9bb332a7098e5f7a145e38e9a5d4962cba9d2a",
+      "3839b635e022a347a7877e9022d9820d55831588",
       []
      ],
      "requri.py": [
@@ -390108,14 +390134,14 @@
        ]
       ],
       "background-image-invalid.html": [
-       "7f1bc98ab63907eb8ab71abc1dd1cc214737bac3",
+       "c971811441edb30fce3f62d9f80f2ec326970cc5",
        [
         null,
         {}
        ]
       ],
       "background-image-valid.html": [
-       "51c67b96ccb52ac09ef6d78e598506317ff784ab",
+       "7632a6b7c6def0e123b9bcfb01a705fd741ebdf9",
        [
         null,
         {}
@@ -413136,6 +413162,13 @@
        {}
       ]
      ],
+     "prefers-contrast.html": [
+      "617e0b97256db36b4b84024251c01e48a1400a79",
+      [
+       null,
+       {}
+      ]
+     ],
      "prefers-reduced-data.html": [
       "4c2668fe78ed0804304e0b7b5699d780b99c789b",
       [
@@ -464498,7 +464531,7 @@
         ]
        ],
        "iframe_sandbox_anchor_download_block_downloads.sub.tentative.html": [
-        "abd4d7c5e0d76d04cd678b00a153d5a8f10bddf7",
+        "bf4347c202e9dc2248feb87b2b3ac8df119fdf37",
         [
          null,
          {}
@@ -464582,7 +464615,7 @@
         ]
        ],
        "iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html": [
-        "50e28f650c74ca734f63f970e61dfea77e7ab0bd",
+        "6b3b3104ef38a9cbc1596961e62cb7804489dd94",
         [
          null,
          {
@@ -464591,7 +464624,7 @@
         ]
        ],
        "iframe_sandbox_navigation_download_block_downloads.sub.tentative.html": [
-        "9b9246c393ec9b4ee3b9762d6d06ea65ff0ff5d1",
+        "87d1d722d5bf333f5fed669fd657d30970d04a8a",
         [
          null,
          {}
@@ -479304,7 +479337,7 @@
      ]
     ],
     "idlharness.window.js": [
-     "b76348b59df51867bea664dc12ba9ec97c9328da",
+     "2977138647b11c5c9a48b779ec2a9f8507221b46",
      [
       "mediacapture-image/idlharness.window.html",
       {
@@ -525081,7 +525114,7 @@
       ]
      ],
      "split.https.html": [
-      "102771e23a536848f00249166ece10217766a380",
+      "5eb8329517fbefe94682fe791ae81769d03da197",
       [
        null,
        {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-backgrounds/parsing/background-image-valid.html.ini b/tests/wpt/metadata/css/css-backgrounds/parsing/background-image-valid.html.ini
new file mode 100644
index 00000000000..e3db293e1b9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/parsing/background-image-valid.html.ini
@@ -0,0 +1,10 @@
+[background-image-valid.html]
+  [e.style['background-image'\] = "cross-fade(33% red, 33% white, blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "cross-fade(blue, linear-gradient(90deg, rgb(2, 0, 36) 0%, rgb(0, 212, 255) 100%))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "cross-fade(50% url(http://www.example.com), 50% url(http://www.example.com))" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/position-relative-percentage-top-003.html.ini b/tests/wpt/metadata/css/css-flexbox/position-relative-percentage-top-003.html.ini
new file mode 100644
index 00000000000..f658a84e4b5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/position-relative-percentage-top-003.html.ini
@@ -0,0 +1,2 @@
+[position-relative-percentage-top-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    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
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini b/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini
new file mode 100644
index 00000000000..691c5bc64c7
--- /dev/null
+++ b/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini
@@ -0,0 +1,34 @@
+[prefers-contrast.html]
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: low)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast)']
+    expected: FAIL
+
+  [Check boolean context evaluation.]
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: no-preference)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: high)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: forced)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: low)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: forced)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: no-preference)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: high)']
+    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 2629b039767..6e9bc97130e 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,18 +312,9 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<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;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
@@ -333,3 +324,12 @@
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..646a46c0cbb 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [separate text/javascript error]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 7277f622b20..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
index 74b7ec3926f..ad6a2856cbd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
@@ -1,3 +1,7 @@
 [iframe_sandbox_anchor_download_block_downloads.sub.tentative.html]
   [<a download> triggered download in sandbox is blocked.]
     expected: FAIL
+
+  [<a download> triggered download in sandbox is blocked before a request is made]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
index 9a2b8fdb7e7..7d701b7d05b 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
@@ -1,6 +1,11 @@
 [iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html]
+  expected: TIMEOUT
   [Navigation resulted download in sandbox is allowed by allow-downloads.]
     expected: FAIL
 
   [Navigation resulted download in sandbox is blocked.]
     expected: FAIL
+
+  [Navigation resulted download in sandbox from <object> is allowed by allow-downloads.]
+    expected: TIMEOUT
+
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 f42f518d257..86fee8a454a 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,5 +1,6 @@
 [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: 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 daa518bd0e3..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: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..963d4cd20ef 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..3a32693ffa8 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,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  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/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..dc856a3d5a3 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 2b2500feb7e..d6bb751ddc2 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -6,9 +6,6 @@
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
-  [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
-
   [Check that rel=noopener with target=_top does a normal load]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
deleted file mode 100644
index 6cf9d13975c..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_005.html]
-  [document.write external script into iframe write back into parent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html
index 7f1bc98ab63..c971811441e 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html
@@ -23,6 +23,8 @@ test_invalid_value("background-image", "radial-gradient(ellipse -20px 30px at ce
 test_invalid_value("background-image", "repeating-radial-gradient(-20% 30% at center, red, blue)");
 test_invalid_value("background-image", "radial-gradient(20px -30px at center, red, blue)");
 test_invalid_value("background-image", "repeating-radial-gradient(20px -30px ellipse at center, red, blue)");
+
+test_invalid_value("background-image", "cross-fade(auto blue, 50% red)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html
index 51c67b96ccb..7632a6b7c6d 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html
@@ -17,6 +17,19 @@ test_valid_value("background-image", "none");
 // Safari removes quotes.
 test_valid_value("background-image", 'url("http://www.example.com/")', ['url("http://www.example.com/")', 'url(http://www.example.com/)']);
 test_valid_value("background-image", 'none, url("http://www.example.com/")', ['none, url("http://www.example.com/")', 'none, url(http://www.example.com/)']);
+
+test_valid_value(
+    "background-image",
+    "cross-fade(50% url(http://www.example.com), 50% url(http://www.example.com))", [
+        "cross-fade(50% url(http://www.example.com), 50% url(http://www.example.com))",
+        'cross-fade(50% url("http://www.example.com"), 50% url("http://www.example.com"))'
+    ]);
+test_valid_value(
+    "background-image",
+    "cross-fade(33% red, 33% white, blue)");
+test_valid_value(
+    "background-image",
+    "cross-fade(blue, linear-gradient(90deg, rgb(2, 0, 36) 0%, rgb(0, 212, 255) 100%))");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-size-layout-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-size-layout-001.html
new file mode 100644
index 00000000000..fde2a311268
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-size-layout-001.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html class=reftest-wait>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="">
+<meta name="assert" content="Flex items with contain: layout size are sized properly.">
+<link rel="bookmark" href="https://crbug.com/1108675">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+#flex {
+  display: flex;
+  width: 100px;
+  height: 100px;
+}
+#grid {
+  background-color: green;
+  display: grid;
+  flex: 1;
+  contain: layout size;
+}
+.item {
+  height: 50px;
+  width: 50px;
+}
+#reference-overlapped-red {
+  position: absolute;
+  background-color: red;
+  width: 100px;
+  height: 100px;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="reference-overlapped-red"></div>
+
+<div id="flex">
+  <div id="grid" data-expected-height=100 data-expected-width=100>
+    <div class="item"></div>
+  </div>
+</div>
+
+<script>
+  document.body.offsetTop;
+  let item = document.querySelector(".item");
+  let cloned = item.cloneNode(true);
+  let parent = item.parentElement;
+  parent.appendChild(cloned);
+  document.documentElement.classList.remove("reftest-wait");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-003.html
new file mode 100644
index 00000000000..0570b246af1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-003.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta name="assert" content="This ensures that a relative-positioned great-grandchild (of a flexbox) correctly resolves percentages against its stretched parent.">
+<link rel="help" href="https://crbug.com/1108508">
+<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; width: 100px; height: 100px;">
+  <div>
+    <div style="width: 100%; height: 100%;">
+      <div style="width: 100px; height: 100px; background: red;"></div>
+      <div style="width: 100px; height: 100px; background: green; position: relative; top: -100%;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
new file mode 100644
index 00000000000..617e0b97256
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/mediaqueries-5/#prefers-contrast" />
+<script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
+
+<script type="text/javascript" src="resources/matchmedia-utils.js"></script>
+<script>
+query_should_be_css_parseable("(prefers-contrast)");
+query_should_be_css_parseable("(prefers-contrast: no-preference)");
+query_should_be_css_parseable("(prefers-contrast: high)");
+query_should_be_css_parseable("(prefers-contrast: low)");
+query_should_be_css_parseable("(prefers-contrast: forced)");
+
+query_should_not_be_css_parseable("(prefers-contrast: increase)");
+query_should_not_be_css_parseable("(prefers-contrast: none)");
+query_should_not_be_css_parseable("(prefers-contrast: forced high)");
+query_should_not_be_css_parseable("(prefers-contrast: forced low)");
+query_should_not_be_css_parseable("(prefers-contrast > increase)");
+query_should_not_be_css_parseable("(prefers-increased-contrast)");
+query_should_not_be_css_parseable("(prefers-decreased-contrast)");
+
+query_should_be_js_parseable("(prefers-contrast)");
+query_should_be_js_parseable("(prefers-contrast: no-preference)");
+query_should_be_js_parseable("(prefers-contrast: high)");
+query_should_be_js_parseable("(prefers-contrast: low)");
+query_should_be_js_parseable("(prefers-contrast: forced)");
+
+query_should_not_be_js_parseable("(prefers-contrast: increase)");
+query_should_not_be_js_parseable("(prefers-contrast: none)");
+query_should_not_be_js_parseable("(prefers-contrast: forced high)");
+query_should_not_be_js_parseable("(prefers-contrast: forced low)");
+query_should_not_be_js_parseable("(prefers-contrast > increase)");
+query_should_not_be_js_parseable("(prefers-increased-contrast)");
+query_should_not_be_js_parseable("(prefers-decreased-contrast)");
+
+test(() => {
+  // no-preference is the default and all other values evaluate to
+  // true in the boolean context. If no-preference matches, then
+  // boolean context should be false. If no-preference does not match
+  // then boolean context should be true. Therefore, these two values
+  // should always be each others inverse irrespective of OS level
+  // settings.
+  let booleanContext = window.matchMedia("(prefers-contrast)");
+  let noPref = window.matchMedia("(prefers-contrast: no-preference)");
+  assert_equals(noPref.matches, !booleanContext.matches);
+}, "Check boolean context evaluation.");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html
index abd4d7c5e0d..bf4347c202e 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html
@@ -19,13 +19,32 @@ async_test(t => {
         iframe.contentWindow.addEventListener(
             "unload", t.unreached_func("Unexpected navigation."));
         var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        anchor.href = "support/download_stash.py?token=" + token;
+        anchor.href = "support/download_stash.py?token=" + token + "&finish-delay=" + StreamDownloadFinishDelay();
+        anchor.download = null;
+        anchor.click();
+        AssertDownloadFailure(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
+    });
+
+    document.body.appendChild(iframe);
+}, "<a download> triggered download in sandbox is blocked.");
+
+async_test(t => {
+    const token = "{{$id:uuid()}}";
+    var iframe = document.createElement("iframe");
+    iframe.srcdoc = "<a>Download</a>";
+    iframe.sandbox = "allow-same-origin";
+    iframe.onload = t.step_func(function () {
+        iframe.contentWindow.addEventListener(
+            "unload", t.unreached_func("Unexpected navigation."));
+        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
+        anchor.href = "support/download_stash.py?token=" + token ;
         anchor.download = null;
         anchor.click();
         AssertDownloadFailure(t, token, DownloadVerifyDelay());
     });
 
     document.body.appendChild(iframe);
-}, "<a download> triggered download in sandbox is blocked.");
+}, "<a download> triggered download in sandbox is blocked before a request is made");
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
index 50e28f650c7..6b3b3104ef3 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
@@ -30,5 +30,23 @@ async_test(t => {
 
     document.body.appendChild(iframe);
 }, "Navigation resulted download in sandbox is allowed by allow-downloads.");
+
+async_test(t => {
+    const token = "{{$id:uuid()}}";
+    var iframe = document.createElement("iframe");
+
+    const folder = location.origin+"/html/semantics/embedded-content/the-iframe-element/";
+    const href = `${folder}support/download_stash.py?token=${token}&finish-delay=${StreamDownloadFinishDelay() }`;
+    const objectDoc =`<a href="${href}">download</a>
+    <${"script"}> document.querySelector("a").click(); </${"script"}>`;
+
+    iframe.srcdoc = `<object data='data:text/html,${objectDoc}'></object>`;
+    iframe.sandbox = "allow-same-origin  allow-scripts allow-downloads";
+    iframe.addEventListener("load",()=>{
+        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
+    })
+    document.body.appendChild(iframe);
+}, "Navigation resulted download in sandbox from <object> is allowed by allow-downloads.");
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html
index 9b9246c393e..87d1d722d5b 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html
@@ -29,5 +29,24 @@ async_test(t => {
 
     document.body.appendChild(iframe);
 }, "Navigation resulted download in sandbox is blocked.");
+
+
+async_test(t => {
+    const token = "{{$id:uuid()}}";
+    var iframe = document.createElement("iframe");
+
+    const folder = location.origin+"/html/semantics/embedded-content/the-iframe-element/";
+    const href = `${folder}support/download_stash.py?token=${token}&finish-delay=${StreamDownloadFinishDelay() }`;
+    const objectDoc =`<a href="${href}">download</a>
+    <${"script"}> document.querySelector("a").click(); </${"script"}>`;
+
+    iframe.srcdoc = `<object data='data:text/html,${objectDoc}'></object>`;
+    iframe.sandbox = "allow-same-origin  allow-scripts";
+    iframe.addEventListener("load",()=>{
+        AssertDownloadFailure(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
+    })
+    document.body.appendChild(iframe);
+}, "Navigation resulted download in sandbox from <object> is blocked.");
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/interfaces/image-capture.idl b/tests/wpt/web-platform-tests/interfaces/image-capture.idl
index 5cd83befe2b..f4ad3705f04 100644
--- a/tests/wpt/web-platform-tests/interfaces/image-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/image-capture.idl
@@ -15,11 +15,11 @@ interface ImageCapture {
    readonly attribute MediaStreamTrack track;
 };
 
-[Exposed=Window] interface PhotoCapabilities {
-  readonly attribute RedEyeReduction            redEyeReduction;
-  readonly attribute MediaSettingsRange         imageHeight;
-  readonly attribute MediaSettingsRange         imageWidth;
-  readonly attribute FrozenArray<FillLightMode> fillLightMode;
+dictionary PhotoCapabilities {
+  RedEyeReduction         redEyeReduction;
+  MediaSettingsRange      imageHeight;
+  MediaSettingsRange      imageWidth;
+  sequence<FillLightMode> fillLightMode;
 };
 
 dictionary PhotoSettings {
@@ -29,11 +29,10 @@ dictionary PhotoSettings {
   boolean         redEyeReduction;
 };
 
-[Exposed=Window] interface MediaSettingsRange {
-    readonly attribute double max;
-    readonly attribute double min;
-    readonly attribute double step;
-    [Default] object toJSON();
+dictionary MediaSettingsRange {
+    double max;
+    double min;
+    double step;
 };
 
 enum RedEyeReduction {
diff --git a/tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js b/tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js
index b76348b59df..2977138647b 100644
--- a/tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js
@@ -9,10 +9,9 @@
 idl_test(
   ['image-capture'],
   ['mediacapture-streams', 'html', 'dom'],
-  async idl_array => {
+  idl_array => {
     idl_array.add_objects({
       ImageCapture : ['capture'],
-      PhotoCapabilities: ['capabilities'],
     });
 
     const canvas = document.createElement('canvas');
@@ -22,6 +21,5 @@ idl_test(
     context.fillRect(0, 0, 10, 10);
     const track = canvas.captureStream().getVideoTracks()[0];
     self.capture = new ImageCapture(track);
-    self.capabilities = await capture.getPhotoCapabilities();
   }
 );
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js b/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js
index c49f0f62848..141a9771d2a 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js
+++ b/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js
@@ -337,3 +337,18 @@ directory_test(async (t, root) => {
       t, "SyntaxError", stream.write({type: 'seek'}), 'seek without position');
 
 }, 'WriteParams: seek missing position param');
+
+directory_test(async (t, root) => {
+  const source_file =
+      await createFileWithContents(t, 'source_file', 'source data', root);
+  const source_blob = await source_file.getFile();
+  await root.removeEntry(source_file.name);
+
+  const handle = await createEmptyFile(t, 'invalid_blob_test', root);
+  const stream = await handle.createWritable();
+  await promise_rejects_dom(t, "NotFoundError", stream.write(source_blob));
+  await promise_rejects_js(t, TypeError, stream.close());
+
+  assert_equals(await getFileContents(handle), '');
+  assert_equals(await getFileSize(handle), 0);
+}, 'write() with an invalid blob to an empty file should reject');
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html b/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
index 102771e23a5..5eb8329517f 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html
@@ -53,7 +53,7 @@ promise_test(async t => {
 
   const offer = await caller.createOffer();
   const sections = SDPUtils.splitSections(offer.sdp);
-  // remove the a=group:BUNDLE from the SDP when signaling.
+  // Remove the a=group:BUNDLE from the SDP when signaling.
   const bundle = SDPUtils.matchPrefix(sections[0], 'a=group:BUNDLE')[0];
   sections[0] = sections[0].replace(bundle + '\r\n', '');
 
@@ -68,6 +68,18 @@ promise_test(async t => {
   const answerVideo = await calleeVideo.createAnswer();
   const audioSections = SDPUtils.splitSections(answerAudio.sdp);
   const videoSections = SDPUtils.splitSections(answerVideo.sdp);
+
+  // Remove the fingerprint from the session part of the SDP if present
+  // and move it to the media section.
+  SDPUtils.matchPrefix(audioSections[0], 'a=fingerprint:').forEach(line => {
+    audioSections[0] = audioSections[0].replace(line + '\r\n', '');
+    audioSections[1] += line + '\r\n';
+  });
+  SDPUtils.matchPrefix(videoSections[0], 'a=fingerprint:').forEach(line => {
+    videoSections[0] = videoSections[0].replace(line + '\r\n', '');
+    videoSections[1] += line + '\r\n';
+  });
+
   const sdp = audioSections[0] + audioSections[1] + videoSections[1];
   await caller.setRemoteDescription({type: 'answer', sdp});
   await calleeAudio.setLocalDescription(answerAudio);
diff --git a/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py b/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
index e0db9feeab0..36ef17488ce 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
@@ -35,7 +35,7 @@ def get_response(raw_headers, filter_value, filter_name):
 
 def main(request, response):
     headers = []
-    if "cors" in request.GET:
+    if b"cors" in request.GET:
         headers.append((b"Access-Control-Allow-Origin", b"*"))
         headers.append((b"Access-Control-Allow-Credentials", b"true"))
         headers.append((b"Access-Control-Allow-Methods", b"GET, POST, PUT, FOO"))
diff --git a/tests/wpt/web-platform-tests/xhr/resources/redirect.py b/tests/wpt/web-platform-tests/xhr/resources/redirect.py
index 9d9bb332a70..3839b635e02 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/redirect.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/redirect.py
@@ -13,4 +13,4 @@ def main(request, response):
     if b"followed" in request.GET:
         return [(b"Content:Type", b"text/plain")], b"MAGIC HAPPENED"
     else:
-        return (code, u"WEBSRT MARKETING"), [(b"Location", location)], b"TEST"
+        return (code, b"WEBSRT MARKETING"), [(b"Location", location)], b"TEST"