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
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index cb2edcb5dcd..6425f4beda1 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -5,6 +5,9 @@
   [[data-expected-height\] 7]
     expected: FAIL
 
-  [[data-expected-height\] 4]
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
     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 f8e7e539aae..4a1e8110f6f 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,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
new file mode 100644
index 00000000000..70a00a101f6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
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/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    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/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index a4da91918ef..44cf6a58616 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,30 +309,18 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     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 ec1fd06e1f5..7277f622b20 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,6 @@
   [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%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [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_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    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_2.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_2.html.ini
index 51f8272a6de..75d75b4cda2 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_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.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/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_4.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-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index 51f8272a6de..385376c7321 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/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 42ebcc9d57e..88f4ddd0e9a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 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-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 0c89d5253df..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    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 7a36937927c..f4f994c5d6f 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,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    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
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-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/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 711903d4069..827a0624611 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
@@ -305,3 +305,9 @@
   [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\]\t4.1257213237009784e-37\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 SNR (-288.33873065926707 dB) is not greater than or equal to 65.737. Got -288.33873065926707.]
+    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\]\t3.8782949092491264e+16\t9.3139332532882690e-1\t3.8782949092491264e+16\t4.1639711213089280e+16\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 3.8782949092491264e+16 at index of 28696.\n\tMax RelError of 4.1639711213089280e+16 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
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
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
index c2c57aec558..dd49aa8e457 100644
--- a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
@@ -1,4 +1,5 @@
 [003.html]
+  expected: ERROR
   [shared]
     expected: FAIL
 
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 2891e4a5a7c..1639eb1195d 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -174433,7 +174433,7 @@
        ]
       ],
       "abspos-004.html": [
-       "b7685f1db3836e6785aad5a70dbcff217655ac48",
+       "c16c8c78b02038b3db85f1535c72e8d799ca559a",
        [
         null,
         [
@@ -174575,6 +174575,19 @@
         {}
        ]
       ],
+      "abspos-015.html": [
+       "efd9759a862c631cef8846ba8eb12b8f37376083",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "auto-margins-001.html": [
        "9e89ab6ca7f5220ea030aa537bcb3b64f156043d",
        [
@@ -241657,7 +241670,7 @@
      ]
     ],
     "forced-colors-mode-18.html": [
-     "435b9e4326f9a012e3f9a0eacc4cb9761477f3f3",
+     "6b415f765873e1201d65d54e455e946d9e0acd98",
      [
       null,
       [
@@ -336839,7 +336852,7 @@
      []
     ],
     "forced-colors-mode-18-ref.html": [
-     "a1701e3fdac842ea26c8f291b23f1febdb305d11",
+     "dd069c1874d9af71b44720785968105631546358",
      []
     ],
     "forced-colors-mode-19-ref.html": [
@@ -352154,7 +352167,7 @@
     },
     "utils": {
      "peerconnection.js": [
-      "817095e981f7724ba4d8a9f1cec26d2b4b7e3b4d",
+      "1b9670d34631dced4e03e334292aed00786237fb",
       []
      ],
      "sources.js": [
@@ -454286,13 +454299,6 @@
       {}
      ]
     ],
-    "forced-colors-mode-04.html": [
-     "42b4efdba71bd959b5db159c1c448a27231b977e",
-     [
-      null,
-      {}
-     ]
-    ],
     "forced-colors-mode-09.html": [
      "16ca8a46104d06153b3e9bbd920d3187b0a7fa00",
      [
@@ -454335,22 +454341,15 @@
       {}
      ]
     ],
-    "forced-colors-mode-32.html": [
-     "bd3595bf3bf33d5c65210c2f155a2431ef976e44",
-     [
-      null,
-      {}
-     ]
-    ],
     "forced-colors-mode-40.html": [
-     "71ac4c9ea820c5853ed762fcd8000ffa1a86f36a",
+     "07316bda24610f87d0735a4835f865d176396d0d",
      [
       null,
       {}
      ]
     ],
     "forced-colors-mode-41.html": [
-     "64bc6cc8cd59b7f98509ac1e5f54b9cf26046e82",
+     "ddb747d08186ede841356867657d8e3941b008a8",
      [
       null,
       {}
@@ -499198,13 +499197,6 @@
       {}
      ]
     ],
-    "MediaRecorder-no-sink.https.html": [
-     "7f5ff934fad7ccb47b742bd4cb8546e3a745b483",
-     [
-      null,
-      {}
-     ]
-    ],
     "MediaRecorder-pause-resume.html": [
      "39f98cc85a17d14c65b274f3925497b8c85d92cc",
      [
@@ -499212,8 +499204,17 @@
       {}
      ]
     ],
+    "MediaRecorder-peerconnection-no-sink.https.html": [
+     "3d96df5e4f05f1ed5b85f2f8b945d70f22725f3a",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "MediaRecorder-peerconnection.https.html": [
-     "88e9da78a7a55af1e99a2a483e962ac19fe0ff76",
+     "b47fbe2debaf5a93ec803aaff9e8ddcb801f6987",
      [
       null,
       {
@@ -499248,7 +499249,7 @@
     ],
     "passthrough": {
      "MediaRecorder-passthrough.https.html": [
-      "655b7a1192378d8ee7766c801c1818c3f9d595a9",
+      "b75797583949514f4b5eb9ffed2d362ed0406b49",
       [
        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
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 94a3570d26b..076c791cd3d 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,6 +8,9 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 4]
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
     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 f8e7e539aae..4a1e8110f6f 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,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
new file mode 100644
index 00000000000..70a00a101f6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
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/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    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/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 13324623c95..aafddf7bdbc 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,27 +312,15 @@
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     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 ec1fd06e1f5..7277f622b20 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,6 @@
   [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%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
new file mode 100644
index 00000000000..75d75b4cda2
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_2.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/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 fc37df7e3fa..2a166bb97b7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 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-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 4bc0524f105..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    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 dc856a3d5a3..e440b1e38c6 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,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    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
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
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/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 6fa4179549b..96ec4733619 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
@@ -533,3 +533,9 @@
   [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\]\t4.1257213237009784e-37\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 SNR (-288.33873065926707 dB) is not greater than or equal to 65.737. Got -288.33873065926707.]
+    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\]\t3.8782949092491264e+16\t9.3139332532882690e-1\t3.8782949092491264e+16\t4.1639711213089280e+16\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 3.8782949092491264e+16 at index of 28696.\n\tMax RelError of 4.1639711213089280e+16 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/017.html.ini
rename to tests/wpt/metadata/webmessaging/without-ports/017.html.ini
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index d6e39444229..49f489d2a1c 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,5 +1,6 @@
 [003.html]
   type: testharness
+  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html
index b7685f1db38..c16c8c78b02 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html
@@ -2,14 +2,14 @@
 <title>CSS aspect-ratio: abspos div inline size</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="help" href="https://drafts.csswg.org/css-position/#abspos-auto-size">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
 
-<!-- It is not entirely clear if this is testing the right behavior. See:
-     https://github.com/w3c/csswg-drafts/issues/5151
-  -->
-
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="width: 500px; height: 100px; position: relative;">
-  <div style="background: green; aspect-ratio: 1/1; position: absolute; left: 0; top: 0; bottom: 0;"></div>
+<div style="width: 300px; height: 50px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; top: 0; bottom: 0;"></div>
+</div>
+<div style="width: 100px; height: 300px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; right: 0; top: 0; writing-mode: vertical-lr;"></div>
 </div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-015.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-015.html
new file mode 100644
index 00000000000..efd9759a862
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-015.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: abspos div block size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-position/#abspos-auto-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="width: 300px; height: 50px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; top: 0; bottom: 0; writing-mode: vertical-lr"></div>
+</div>
+<div style="width: 100px; height: 300px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; right: 0; top: 0;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html
deleted file mode 100644
index 42b4efdba71..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - webkit-tap-highlight-color.</title>
-<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  a {
-    -webkit-tap-highlight-color: rgb(0, 0, 255);
-  }
-</style>
-<body>
-  <p>
-    <a href="https://www.wikipedia.org" id="link">
-      This link color should be overridden when forced colors mode is enabled.
-    </a>
-  </p>
-</body>
-
-<script>
-  test(function(){
-    assert_equals(getComputedStyle(link).webkitTapHighlightColor, "rgba(0, 0, 0, 0.18)");
-  }, "Checks hyperlinks are overridden in forced colors mode.");
-</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
index a1701e3fdac..dd069c1874d 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
@@ -17,20 +17,12 @@
     </text>
     <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
     <foreignObject x="20" y="100" width="160" height="160">
-      <div xmlns="http://www.w3.org/1999/xhtml" style="color: orange;">
-        This text should be orange in forced colors mode due to inheritance.
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: CanvasText;">
+        This text should be CanvasText in forced colors mode.
       </div>
       <svg height="20" width="20">
         <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
       </svg>
     </foreignObject>
   </svg>
-
-  <svg height="600" width="600">
-    <foreignObject x="20" y="100" width="160" height="160" style="color: CanvasText;">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be CanvasText in forced colors mode.
-      </div>
-    </foreignObject>
-  </svg>
 </body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
index 435b9e4326f..6b415f76587 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
@@ -15,19 +15,11 @@
     <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
     <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
       <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be orange in forced colors mode due to inheritance.
+        This text should be CanvasText in forced colors mode.
       </div>
       <svg height="20" width="20">
         <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
       </svg>
     </foreignObject>
   </svg>
-
-  <svg height="600" width="600">
-    <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be CanvasText in forced colors mode.
-      </div>
-    </foreignObject>
-  </svg>
 </body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html
deleted file mode 100644
index bd3595bf3bf..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - webkit-tap-highlight-color with sys color.</title>
-<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  a {
-    -webkit-tap-highlight-color: GrayText;
-  }
-</style>
-<a href="https://www.wikipedia.org" id="link">
-  This link color should not be overridden when forced colors mode is enabled.
-</a>
-<a href="" id="ref" style="forced-color-adjust:none"></a>
-
-<script>
-  var gray_text = getComputedStyle(ref).webkitTapHighlightColor;
-  test(function(){
-    assert_equals(getComputedStyle(link).webkitTapHighlightColor, gray_text);
-  }, "Checks hyperlinks are not overridden if a sys color is used.");
-</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html
index 71ac4c9ea82..07316bda246 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html
@@ -10,9 +10,14 @@
   div {
     background-color: green;
     border-color: green;
+    color: green;
+    column-rule-color: green;
     fill: green;
     outline-color: green;
     stroke: green;
+    text-decoration-color: green;
+    -webkit-tap-highlight-color: green;
+    -webkit-text-emphasis-color: green;
   }
 </style>
 <div id="div">
@@ -26,9 +31,14 @@
     "border-left-color",
     "border-right-color",
     "border-top-color",
+    "color",
+    "column-rule-color",
     "fill",
     "outline-color",
-    "stroke"
+    "stroke",
+    "text-decoration-color",
+    "-webkit-tap-highlight-color",
+    "-webkit-text-emphasis-color"
   ];
   for (let property of properties_to_test) {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html
index 64bc6cc8cd5..ddb747d0818 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html
@@ -12,6 +12,7 @@
   div {
     background-color: green;
     border-color: green;
+    color: green;
     outline-color: green;
   }
 </style>
@@ -24,6 +25,7 @@
     "border-left-color",
     "border-right-color",
     "border-top-color",
+    "color",
     "outline-color"
   ];
   for (let property of properties_to_test) {
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-no-sink.https.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-no-sink.https.html
deleted file mode 100644
index 7f5ff934fad..00000000000
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-no-sink.https.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-<html>
-
-<head>
-  <title>MediaRecorder peer connection</title>
-  <link rel="help"
-        href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="utils/peerconnection.js"></script>
-</head>
-
-<body>
-  <script>
-
-[{name: "audio",        kind: {audio: true, video: false}},
- {name: "video",        kind: {audio: false, video: true}},
- {name: "audio/video",  kind: {audio: true, video: true}}].forEach(args => {
-  promise_test(async t => {
-    const [localPc, remotePc, stream] = await startConnection(
-        t, args.kind.audio, args.kind.video);
-    const recorder = new MediaRecorder(stream);
-    // Set an arbitrary timeslice interval so the ondataavailable event
-    // handler gets invoked repeatedly. Without it, the test would
-    // deadlock as it's currently written.
-    recorder.start(100);
-    let combinedSize = 0;
-    const dataPromise = new Promise(r => recorder.ondataavailable = e => {
-      // Wait for an arbitrary amount of data to appear before we resolve.
-      combinedSize += e.data.size;
-      if (combinedSize > 4711) r();
-    });
-    await dataPromise;
-    recorder.stop();
-  }, "PeerConnection MediaRecorder records " + args.name +
-     " from PeerConnection without sinks");
- });
-
-  </script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html
new file mode 100644
index 00000000000..3d96df5e4f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+<meta name="timeout" content="long">
+
+<head>
+  <title>MediaRecorder peer connection</title>
+  <link rel="help"
+        href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="utils/peerconnection.js"></script>
+</head>
+
+<body>
+  <script>
+
+promise_setup(async () => {
+  const t = {add_cleanup: add_completion_callback};
+  const [, pc, stream] = await startConnection(t, true, true);
+  const [audio] = stream.getAudioTracks();
+  const [video] = stream.getVideoTracks();
+
+  for (const kinds of [{ audio }, { video }, { audio, video }]) {
+    const tag = `${JSON.stringify(kinds)}`;
+    const stream = new MediaStream([kinds.audio, kinds.video].filter(n => n));
+
+    promise_test(async t => {
+      const recorder = new MediaRecorder(stream);
+      recorder.start(200);
+      let combinedSize = 0;
+      // Wait for a small amount of data to appear. Kept small for mobile tests
+      while (combinedSize < 2000) {
+        const {data} = await new Promise(r => recorder.ondataavailable = r);
+        combinedSize += data.size;
+      }
+      recorder.stop();
+    }, `MediaRecorder records from PeerConnection without sinks, ${tag}`);
+  }
+});
+
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html
index 88e9da78a7a..b47fbe2deba 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html
@@ -15,57 +15,67 @@
   <video id="remote" autoplay width="240" />
   <script>
 
-[{ name: "video", kind: { video: true, audio: false }, mimeType: "" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "video/webm;codecs=vp8" },
- { name: "video", kind: { video: true, audio: false }, mimeType: "video/webm;codecs=vp8" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "video/webm;codecs=vp8" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "video/webm;codecs=vp9" },
- { name: "video", kind: { video: true, audio: false }, mimeType: "video/webm;codecs=vp9" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "video/webm;codecs=vp9" }]
-  .forEach(args => {
-    const formatString = JSON.stringify(args.kind) +
-        " with format " + (args.mimeType ? args.mimeType : "[passthrough]") + ".";
-    promise_test(async t => {
-      const [localPc, remotePc, stream] = await startConnection(
-          t, args.kind.audio, args.kind.video);
-      const recorder = new MediaRecorder(stream, { mimeType: args.mimeType });
-      let combinedSize = 0;
-      const dataPromise = new Promise(r => {
-        recorder.onstart = () => {
-          recorder.ondataavailable = e => {
-            // Wait for an arbitrary amount of data to appear before we resolve.
-            combinedSize += e.data.size;
-            if (combinedSize > 4711) r();
-          }
-        }
-      });
-      recorder.start(100);
-      await dataPromise;
-      recorder.stop();
-    }, "PeerConnection MediaRecorder receives data after onstart, " +
-          formatString);
+promise_setup(async () => {
+  const t = {add_cleanup: add_completion_callback};
+  const [, pc, stream] = await startConnection(t, true, true);
+  const [audio] = stream.getAudioTracks();
+  const [video] = stream.getVideoTracks();
+
+  // Needed for the tests to get exercised in Chrome (bug)
+  document.getElementById('remote').srcObject = stream;
+
+  for (const {kinds, mimeType} of [
+   { kinds: { video }, mimeType: "" },
+   { kinds: { audio }, mimeType: "" },
+   { kinds: { video, audio }, mimeType: "" },
+   { kinds: { audio }, mimeType: "audio/webm;codecs=opus" },
+   { kinds: { video }, mimeType: "video/webm;codecs=vp8" },
+   { kinds: { video, audio }, mimeType: "video/webm;codecs=vp8,opus" },
+   { kinds: { video }, mimeType: "video/webm;codecs=vp9" },
+   { kinds: { video, audio }, mimeType: "video/webm;codecs=vp9,opus" }
+  ]) {
+    const tag = `${JSON.stringify(kinds)} mimeType "${mimeType}"`;
+    const stream = new MediaStream([kinds.audio, kinds.video].filter(n => n));
+
+    // Spec doesn't mandate codecs, so if not supported, test failure instead.
+    if (mimeType && !MediaRecorder.isTypeSupported(mimeType)) {
+      promise_test(async t => {
+        assert_throws_dom('NotSupportedError',
+                          () => new MediaRecorder(stream, { mimeType }));
+      }, `MediaRecorder constructor throws on no support, ${tag}`);
+      continue;
+    }
 
     promise_test(async t => {
-      const [localPc, remotePc, stream] = await startConnection(
-          t, args.kind.audio, args.kind.video);
-      const recorder = new MediaRecorder(stream, { mimeType: args.mimeType });
-      const stopPromise = new Promise(r => recorder.onstop = r);
-      const dataPromise = new Promise(r => recorder.ondataavailable = r);
+      const recorder = new MediaRecorder(stream, { mimeType });
+      recorder.start(200);
+      await new Promise(r => recorder.onstart = r);
+      let combinedSize = 0;
+      // Wait for a small amount of data to appear. Kept small for mobile tests
+      while (combinedSize < 2000) {
+        const {data} = await new Promise(r => recorder.ondataavailable = r);
+        combinedSize += data.size;
+      }
+      recorder.stop();
+    }, `PeerConnection MediaRecorder receives data after onstart, ${tag}`);
+
+    promise_test(async t => {
+      const clone = stream.clone();
+      const recorder = new MediaRecorder(clone, { mimeType });
       recorder.start();
-      await waitForReceivedFrames(
-        t, remotePc, args.kind.audio, args.kind.video, 10);
-      for (transceiver of remotePc.getTransceivers())
-        transceiver.receiver.track.stop();
-      // As the tracks ended, we'd like to see data from the recorder.
-      // For details:
-      // https://www.w3.org/TR/mediastream-recording/#mediarecorder-methods.
-      await dataPromise;
-      await stopPromise;
-    }, "PeerConnection MediaRecorder gets ondata on stopping recorded " +
-            "tracks " + formatString);
-  });
+      await new Promise(r => recorder.onstart = r);
+      await waitForReceivedFramesOrPackets(t, pc, kinds.audio, kinds.video, 10);
+      for (const track of clone.getTracks()) {
+        track.stop();
+      }
+      // As the tracks ended, expect data from the recorder.
+      await Promise.all([
+        new Promise(r => recorder.onstop = r),
+        new Promise(r => recorder.ondataavailable = r)
+      ]);
+    }, `PeerConnection MediaRecorder gets ondata on stopping tracks, ${tag}`);
+  }
+});
 
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html b/tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html
index 655b7a11923..b7579758394 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html
@@ -22,6 +22,10 @@
     promise_test(async t => {
       const [localPc, remotePc, stream] = await startConnection(
           t, args.audio, /*video=*/true, args.codecPreference);
+
+      // Needed for the tests to get exercised in Chrome (bug)
+      document.getElementById('remote').srcObject = stream;
+
       const recorder = new MediaRecorder(stream);  // Passthrough.
       const onstartPromise = new Promise(resolve => {
         recorder.onstart = t.step_func(() => {
@@ -42,16 +46,22 @@
 promise_test(async t => {
   const [localPc, remotePc, stream, transceivers] = await startConnection(
       t, /*audio=*/false, /*video=*/true, /*videoCodecPreference=*/"VP8");
+
+  // Needed for the tests to get exercised in Chrome (bug)
+  document.getElementById('remote').srcObject = stream;
+
   const recorder = new MediaRecorder(stream);  // Possibly passthrough.
   recorder.start();
-  await waitForReceivedFrames(t, remotePc, false, true, 10);
+  await waitForReceivedFramesOrPackets(t, remotePc, false, true, 10);
 
   // Switch codec to VP9; we expect onerror to not be invoked.
   recorder.onerror = t.step_func(() => assert_unreached(
       "MediaRecorder should be prepared to handle codec switches"));
   setTransceiverCodecPreference(transceivers.video, "VP9");
-  exchangeOfferAnswer(localPc, remotePc);
-  await waitForReceivedCodec(t, remotePc, "VP9");
+  await Promise.all([
+    exchangeOfferAnswer(localPc, remotePc),
+    waitForReceivedCodec(t, remotePc, "VP9")
+  ]);
 }, "PeerConnection passthrough MediaRecorder should be prepared to handle " +
         "the codec switching from VP8 to VP9");
 
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js b/tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js
index 817095e981f..1b9670d3463 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js
+++ b/tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js
@@ -26,7 +26,7 @@ async function exchangeOfferAnswer(pc1, pc2) {
  * @param {string} codecPreference The codec preference.
  */
 function setTransceiverCodecPreference(transceiver, codecPreference) {
-  for (let codec of RTCRtpSender.getCapabilities('video').codecs) {
+  for (const codec of RTCRtpSender.getCapabilities('video').codecs) {
     if (codec.mimeType.includes(codecPreference)) {
       transceiver.setCodecPreferences([codec]);
       return;
@@ -38,55 +38,37 @@ function setTransceiverCodecPreference(transceiver, codecPreference) {
  * Starts a connection between two peer connections, using a audio and/or video
  * stream.
  * @param {*} t Test instance.
- * @param {boolean} useAudio True if audio should be used.
- * @param {boolean} useVideo True if video should be used.
+ * @param {boolean} audio True if audio should be used.
+ * @param {boolean} video True if video should be used.
  * @param {string} [videoCodecPreference] String containing the codec preference.
  * @returns an array with the two connected peer connections, the remote stream,
- * and the list of transceivers.
+ * and an object containing transceivers by kind.
  */
-async function startConnection(t, useAudio, useVideo, videoCodecPreference) {
-  const stream = await navigator.mediaDevices.getUserMedia({
-    audio: useAudio, video: useVideo
-  });
+async function startConnection(t, audio, video, videoCodecPreference) {
+  const stream = await navigator.mediaDevices.getUserMedia({audio, video});
   t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
   const pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
-  let transceivers = {};
-  stream.getTracks().forEach(track => {
-    const transceiver = pc1.addTransceiver(track);
+  const transceivers = {};
+  for (const track of stream.getTracks()) {
+    const transceiver = pc1.addTransceiver(track, {streams: [stream]});
     transceivers[track.kind] = transceiver;
     if (videoCodecPreference && track.kind == 'video') {
       setTransceiverCodecPreference(transceiver, videoCodecPreference);
     }
-  });
-  function doExchange(localPc, remotePc) {
-    localPc.addEventListener('icecandidate', event => {
-      const { candidate } = event;
-      if (candidate && remotePc.signalingState !== 'closed') {
-        remotePc.addIceCandidate(candidate);
-      }
+  }
+  for (const [local, remote] of [[pc1, pc2], [pc2, pc1]]) {
+    local.addEventListener('icecandidate', ({candidate}) => {
+      if (!candidate || remote.signalingState == 'closed') return;
+      remote.addIceCandidate(candidate);
     });
   }
-  doExchange(pc1, pc2);
-  doExchange(pc2, pc1);
-  exchangeOfferAnswer(pc1, pc2);
-  const remoteStream = await new Promise(resolve => {
-    let tracks = [];
-    pc2.ontrack = e => {
-      tracks.push(e.track)
-      if (tracks.length < useAudio + useVideo) return;
-      const stream = new MediaStream(tracks);
-      // The srcObject sink is needed for the tests to get exercised in Chrome.
-      const remoteVideo = document.getElementById('remote');
-      if (remoteVideo) {
-        remoteVideo.srcObject = stream;
-      }
-      resolve(stream)
-    }
-  });
-  return [pc1, pc2, remoteStream, transceivers]
+  const haveTrackEvent = new Promise(r => pc2.ontrack = r);
+  await exchangeOfferAnswer(pc1, pc2);
+  const {streams} = await haveTrackEvent;
+  return [pc1, pc2, streams[0], transceivers];
 }
 
 /**
@@ -99,17 +81,17 @@ async function startConnection(t, useAudio, useVideo, videoCodecPreference) {
  * @param {int} numFramesOrPackets Number of frames (video) and packets (audio)
  * to wait for.
  */
-async function waitForReceivedFrames(
+async function waitForReceivedFramesOrPackets(
     t, pc, lookForAudio, lookForVideo, numFramesOrPackets) {
   let initialAudioPackets = 0;
   let initialVideoFrames = 0;
   while (lookForAudio || lookForVideo) {
     const report = await pc.getStats();
-    report.forEach(stats => {
-      if (stats.type && stats.type == 'inbound-rtp') {
+    for (const stats of report.values()) {
+      if (stats.type == 'inbound-rtp') {
         if (lookForAudio && stats.kind == 'audio') {
           if (!initialAudioPackets) {
-            initialAudioPackets = stats.packetsReceived
+            initialAudioPackets = stats.packetsReceived;
           } else if (stats.packetsReceived > initialAudioPackets +
                      numFramesOrPackets) {
             lookForAudio = false;
@@ -124,8 +106,8 @@ async function waitForReceivedFrames(
           }
         }
       }
-    });
-    await new Promise(r => { t.step_timeout(r, 100); });
+    }
+    await new Promise(r => t.step_timeout(r, 100));
   }
 }
 
@@ -140,17 +122,16 @@ async function waitForReceivedCodec(t, pc, codecToLookFor) {
   let currentCodecId;
   for (;;) {
     const report = await pc.getStats();
-    report.forEach(stats => {
-      if (stats.id) {
-        if (stats.type == 'inbound-rtp' && stats.kind == 'video') {
-          currentCodecId = stats.codecId;
-        } else if (currentCodecId && stats.id == currentCodecId &&
-                   stats.mimeType.toLowerCase().includes(
-                      codecToLookFor.toLowerCase())) {
-          return;
+    for (const stats of report.values()) {
+      if (stats.type == 'inbound-rtp' && stats.kind == 'video') {
+        if (stats.codecId) {
+          if (report.get(stats.codecId).mimeType.toLowerCase()
+              .includes(codecToLookFor.toLowerCase())) {
+            return;
+          }
         }
       }
-    });
-    await new Promise(r => { t.step_timeout(r, 100); });
+    }
+    await new Promise(r => t.step_timeout(r, 100));
   }
 }