diff --git a/tests/wpt/metadata-layout-2020/cookies/value/value.html.ini b/tests/wpt/metadata-layout-2020/cookies/value/value.html.ini
new file mode 100644
index 00000000000..b122cd38a6f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/cookies/value/value.html.ini
@@ -0,0 +1,16 @@
+[value.html]
+  [Set nameless cookie to its value]
+    expected: FAIL
+
+  [Set cookie but ignore value after LF]
+    expected: FAIL
+
+  [Set nameless cookie followed by '=' to its value]
+    expected: FAIL
+
+  [Ignore cookie with large value ( > 4kb)]
+    expected: FAIL
+
+  [Set nameless cookie to its value with an escaped quote]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
similarity index 67%
rename from tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
index f29da48a2a0..4bfb0c2053a 100644
--- 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-004.html.ini
@@ -1,4 +1,4 @@
-[hit-test-floats-003.html]
+[hit-test-floats-004.html]
   [Miss float below something else]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-000.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-000.html.ini
new file mode 100644
index 00000000000..2cdd6bfe9ac
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-000.html.ini
@@ -0,0 +1,2 @@
+[box-shadow-radius-000.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-001.html.ini
new file mode 100644
index 00000000000..7a7d4e8975e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-radius-001.html.ini
@@ -0,0 +1,2 @@
+[box-shadow-radius-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/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/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index dcf6f402e63..9cbf72bdc6e 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
@@ -318,15 +318,21 @@
   [<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/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    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 e67f0406fc3..d2df9b78483 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,3 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index aa6eb8f6085..61682d248e2 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%20'NosniFF']
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 385376c7321..dc2e45516de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 9a85a905394..8e2b6af33d8 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,7 +1,8 @@
 [embedded-opener-remove-frame.html]
+  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
index e146e0d74d6..6b0d44fbb23 100644
--- a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
@@ -71,3 +71,21 @@
   [Test createImageData(width, height) from SRGB canvas ]
     expected: FAIL
 
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, e-SRGB U16 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, e-SRGB U16 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, e-SRGB F32 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, e-SRGB F32 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, SRGB U8 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, SRGB U8 ImageData]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
new file mode 100644
index 00000000000..bf524d57776
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
@@ -0,0 +1,4 @@
+[document-has-system-focus.html]
+  [Top-level document receives blur/focus events and loses system focus during opening/closing of a popup]
+    expected: FAIL
+
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 5c3ac06f42a..09ae27d7480 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,3 +171,6 @@
   [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_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-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 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 0407f0cc2b7..9eb581fcf1f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 0fbc49ea1c1..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,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
deleted file mode 100644
index ca460dc6867..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/opening-the-input-stream/ignore-opens-during-unload.window.js.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
index 57744023f73..58c9d7f8c0c 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
@@ -1,5 +1,5 @@
 [ignore-opens-during-unload.window.html]
-  expected: CRASH
+  expected: TIMEOUT
   [document.open should bail out when ignore-opens-during-unload is greater than 0 during visibilitychange event (open(parent) while unloading parent and child)]
     expected: TIMEOUT
 
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 dbec6f2c2ff..450c88bd32b 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,3 +3,6 @@
   [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/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
index 78cb866d2b3..ced92bd6a1a 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
@@ -2,3 +2,6 @@
   [Referrer Policy: iframes with javascript url reuse referrer policy 1]
     expected: FAIL
 
+  [Referrer Policy: iframes with javascript url reuse referrer policy 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/meta-tag-in-svg-image.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/meta-tag-in-svg-image.html.ini
new file mode 100644
index 00000000000..7ed6c97a5fe
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/meta-tag-in-svg-image.html.ini
@@ -0,0 +1,4 @@
+[meta-tag-in-svg-image.html]
+  [Meta tag in SVG image loaded via img should be ignored]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/global/type.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/global/type.tentative.any.js.ini
new file mode 100644
index 00000000000..900e4c99f3c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/global/type.tentative.any.js.ini
@@ -0,0 +1,81 @@
+[type.tentative.any.html]
+  [anyref, immutable]
+    expected: FAIL
+
+  [i64, immutable]
+    expected: FAIL
+
+  [f64, immutable]
+    expected: FAIL
+
+  [i64, mutable]
+    expected: FAIL
+
+  [funcref, mutable]
+    expected: FAIL
+
+  [i32, immutable]
+    expected: FAIL
+
+  [f32, mutable]
+    expected: FAIL
+
+  [f64, mutable]
+    expected: FAIL
+
+  [funcref, immutable]
+    expected: FAIL
+
+  [i32, mutable]
+    expected: FAIL
+
+  [anyref, mutable]
+    expected: FAIL
+
+  [f32, immutable]
+    expected: FAIL
+
+  [key ordering]
+    expected: FAIL
+
+
+[type.tentative.any.worker.html]
+  [anyref, immutable]
+    expected: FAIL
+
+  [i64, immutable]
+    expected: FAIL
+
+  [f64, immutable]
+    expected: FAIL
+
+  [i64, mutable]
+    expected: FAIL
+
+  [funcref, mutable]
+    expected: FAIL
+
+  [i32, immutable]
+    expected: FAIL
+
+  [f32, mutable]
+    expected: FAIL
+
+  [f64, mutable]
+    expected: FAIL
+
+  [funcref, immutable]
+    expected: FAIL
+
+  [i32, mutable]
+    expected: FAIL
+
+  [anyref, mutable]
+    expected: FAIL
+
+  [f32, immutable]
+    expected: FAIL
+
+  [key ordering]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/type.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/type.tentative.any.js.ini
new file mode 100644
index 00000000000..e243a969365
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/type.tentative.any.js.ini
@@ -0,0 +1,39 @@
+[type.tentative.any.worker.html]
+  [non-shared memory]
+    expected: FAIL
+
+  [None-zero maximum]
+    expected: FAIL
+
+  [shared memory]
+    expected: FAIL
+
+  [Zero maximum]
+    expected: FAIL
+
+  [Zero initial, no maximum]
+    expected: FAIL
+
+  [Non-zero initial, no maximum]
+    expected: FAIL
+
+
+[type.tentative.any.html]
+  [non-shared memory]
+    expected: FAIL
+
+  [None-zero maximum]
+    expected: FAIL
+
+  [shared memory]
+    expected: FAIL
+
+  [Zero maximum]
+    expected: FAIL
+
+  [Zero initial, no maximum]
+    expected: FAIL
+
+  [Non-zero initial, no maximum]
+    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 a56bad443a2..66bd350083b 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,5 +1,4 @@
 [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 cd8d278104e..48e728914e7 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
@@ -416,3 +416,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t6.3119296254606011e+23\t9.3139332532882690e-1\t6.3119296254606011e+23\t6.7768680038931826e+23\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 6.3119296254606011e+23 at index of 28696.\n\tMax RelError of 6.7768680038931826e+23 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.9435393349935682e-20\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini b/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
index c91f0fab159..8b4cbdc9f90 100644
--- a/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
@@ -89,9 +89,6 @@
   [XRHand interface: constant LITTLE_PHALANX_INTERMEDIATE on interface prototype object]
     expected: FAIL
 
-  [XRFrame interface: operation getJointPose(XRJointSpace, XRSpace)]
-    expected: FAIL
-
   [XRJointSpace interface: existence and properties of interface object]
     expected: FAIL
 
@@ -164,9 +161,6 @@
   [XRHand interface: constant LITTLE_METACARPAL on interface prototype object]
     expected: FAIL
 
-  [XRInputSource interface: attribute hand]
-    expected: FAIL
-
   [XRHand interface: constant RING_METACARPAL on interface object]
     expected: FAIL
 
@@ -227,3 +221,15 @@
   [XRHand interface: constant MIDDLE_METACARPAL on interface prototype object]
     expected: FAIL
 
+  [XRHand interface: iterable<XRHandJoint, XRJointSpace>]
+    expected: FAIL
+
+  [XRHand interface: operation get(XRHandJoint)]
+    expected: FAIL
+
+  [XRHand interface: attribute size]
+    expected: FAIL
+
+  [XRJointSpace interface: attribute jointName]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-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/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f6b271b8bf8..750237c6d87 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -127366,6 +127366,32 @@
        {}
       ]
      ],
+     "box-shadow-radius-000.html": [
+      "7ca2cffad0cd4e89c1e12bd928bd8aa4f3ae28e2",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/box-shadow-radius-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-shadow-radius-001.html": [
+      "9b823a0590fb5890a33ed605912879ce24ad81f5",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/box-shadow-radius-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "box-shadow-table-border-collapse-001.html": [
       "a4413ee97ffa0816294700a60f2f82e37d3762f0",
       [
@@ -127775,6 +127801,19 @@
      ]
     },
     "css-break": {
+     "abspos-in-offset-relpos.html": [
+      "b996c365866370715a39ebb8ae3ffbb4419e393a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "avoid-border-break.html": [
       "56f47e83c57f0914b87910870d67d5490d9e4eb3",
       [
@@ -167461,6 +167500,45 @@
        {}
       ]
      ],
+     "nested-at-outer-boundary-as-fieldset.html": [
+      "2c64b59a7787454e3c5dbe5a76a01c1d0206b5c6",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "nested-at-outer-boundary-as-float.html": [
+      "940d39408028a7fcc7b52c05b9802bdc1da71077",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "nested-at-outer-boundary-as-legend.html": [
+      "8bf04490f261abced014b6dd4f78ae95396da69d",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "nested-with-padding-and-spanner.html": [
       "bea27a95781c3dd4abf0d590fd15d64530fd9154",
       [
@@ -178935,6 +179013,19 @@
         {}
        ]
       ],
+      "block-aspect-ratio-030.html": [
+       "a911be11af5efee8e3e377e2018ddae3512408bb",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "block-aspect-ratio-with-margin-collapsing-001.html": [
        "78a0418fe285da58030cdd863460add0533e6af5",
        [
@@ -281515,7 +281606,7 @@
     "attributes": {
      "resources": {
       "secure-non-secure-child.html": [
-       "f6a4682f8aecc1fe2aaacc928836dfbba2b8af09",
+       "65996e0c4d18c9d7a95ba7b20e76c63f4a372303",
        []
       ]
      }
@@ -281789,270 +281880,6 @@
         "fea1e1a643b97d4a101d704bd1497376a4997b3c",
         []
        ],
-       "charset0001-expected": [
-        "8646afc636624f223fe79296a6d2b49747258d52",
-        []
-       ],
-       "charset0001-test": [
-        "e89a36dd89ec806738ef8615db4de0fae323cf7b",
-        []
-       ],
-       "charset0002-expected": [
-        "fc7d2561017e86fde51bc774ce0bc07d1184e0f6",
-        []
-       ],
-       "charset0002-test": [
-        "70ce472afa608b17e8830e6b76dd3e76f0af04d9",
-        []
-       ],
-       "charset0003-expected": [
-        "1969bc86b97615eaeaeaa05705f556fb730cd679",
-        []
-       ],
-       "charset0003-test": [
-        "446e2fd29f211471cd7b090fc9660b013f030d02",
-        []
-       ],
-       "charset0004-expected": [
-        "1d6d952989ef943a37f92b0403024bc2802e0842",
-        []
-       ],
-       "charset0004-test": [
-        "1564ba4fc921f2ec9f6686e90a91c2468f351ab0",
-        []
-       ],
-       "chromium0001-expected": [
-        "1022f64a2906dd854109026bbc6c3d286a5a5283",
-        []
-       ],
-       "chromium0001-test": [
-        "4635f0e7e378a507384407cbf93197933b1f7775",
-        []
-       ],
-       "chromium0002-expected": [
-        "64932dcffb4fe41532ab9d10ceedb4ce9ad26ad8",
-        []
-       ],
-       "chromium0002-test": [
-        "24ab0d2da56451e882799e04a629c29997e0d0d7",
-        []
-       ],
-       "chromium0003-expected": [
-        "64932dcffb4fe41532ab9d10ceedb4ce9ad26ad8",
-        []
-       ],
-       "chromium0003-test": [
-        "bac41f9928847c9d93bb08710572f5b4f0d967c8",
-        []
-       ],
-       "chromium0004-expected": [
-        "9be3e8f6435f85b7751dc6f49a3c68e18d234511",
-        []
-       ],
-       "chromium0004-test": [
-        "45cab2f409daada7d1a4b34b64741b98258284c8",
-        []
-       ],
-       "chromium0005-expected": [
-        "9be3e8f6435f85b7751dc6f49a3c68e18d234511",
-        []
-       ],
-       "chromium0005-test": [
-        "c2dfebd3c4431774f06cdaaf3292d7a5f6742471",
-        []
-       ],
-       "chromium0006-expected": [
-        "8121145c18bf7aafcb53af2a18e13f0176c871b7",
-        []
-       ],
-       "chromium0006-test": [
-        "a9da26811a4ed6a05f64b0625060076984e60670",
-        []
-       ],
-       "chromium0007-expected": [
-        "8121145c18bf7aafcb53af2a18e13f0176c871b7",
-        []
-       ],
-       "chromium0007-test": [
-        "dca20b8e7df62c2a5423c5860823a6714c6fa1ab",
-        []
-       ],
-       "chromium0008-expected": [
-        "602c0e017c4f477bc26f449f124c807d4461b7f0",
-        []
-       ],
-       "chromium0008-test": [
-        "ece6c66f0b1169a705a55556ff8c2799427cebb0",
-        []
-       ],
-       "chromium0009-expected": [
-        "d347326bc62405f5b043a5e75bc0696568ebbfae",
-        []
-       ],
-       "chromium0009-test": [
-        "eecdae60cc4cea7dd7213bb23b81a9f022bbd6eb",
-        []
-       ],
-       "chromium0010-expected": [
-        "21b4b84b9aa06d72f09f7e0d116a75b8af768be7",
-        []
-       ],
-       "chromium0010-test": [
-        "17a18ea9272814a1f036d9f927e2380d5218f51b",
-        []
-       ],
-       "chromium0011-expected": [
-        "2062e2315564cd319d99f1b103555a9c6018ea0d",
-        []
-       ],
-       "chromium0011-test": [
-        "4000f269a495455b2f4f00925eb927759e3c9b6a",
-        []
-       ],
-       "chromium0012-expected": [
-        "7bed67c98e3ffdab1222a650ff4be3c6817bcb74",
-        []
-       ],
-       "chromium0012-test": [
-        "b33a4e7427b99a689c4d1bade576df7c7246c2ab",
-        []
-       ],
-       "chromium0013-expected": [
-        "5d2d06092c4fec724b7a1c257ca026b953066ea1",
-        []
-       ],
-       "chromium0013-test": [
-        "f61a087bb8fd7ef9c84329f86be8b21fb3972f04",
-        []
-       ],
-       "chromium0014-expected": [
-        "21bfd134e54a3b488793fe8e0c159c0f27f1a687",
-        []
-       ],
-       "chromium0014-test": [
-        "edbb7931a38048004ed83d9682c737a98d64c752",
-        []
-       ],
-       "chromium0015-expected": [
-        "b968e7427a0711ddd3c85dee8480487ade9cf038",
-        []
-       ],
-       "chromium0015-test": [
-        "80d32366b5d9ed794b812ed2bfafabeba75c5b25",
-        []
-       ],
-       "chromium0016-expected": [
-        "11d8efaea2aca277e07a2030cb646cdbe09b6851",
-        []
-       ],
-       "chromium0016-test": [
-        "8abf12026c7ec2932f0a967501a4063968554d88",
-        []
-       ],
-       "chromium0017-expected": [
-        "6bb84483a05f5697a7d4aed4cbb7a68161114207",
-        []
-       ],
-       "chromium0017-test": [
-        "94cce02078bec0a3b37809e7e04e0a99e03549cf",
-        []
-       ],
-       "chromium0018-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "chromium0018-test": [
-        "145ad2c5defddcd9a19f7f44b07e302bce643635",
-        []
-       ],
-       "chromium0019-expected": [
-        "b6df50eef282f6e6bf501259b913f35284f0f323",
-        []
-       ],
-       "chromium0019-test": [
-        "e3bcc4a18c3da79b304ab738f445de1e1ef11732",
-        []
-       ],
-       "chromium0021-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "chromium0021-test": [
-        "145ad2c5defddcd9a19f7f44b07e302bce643635",
-        []
-       ],
-       "comma0001-expected": [
-        "ab55cea018a3ced1b77c914e7a1c8e7872a9ab0f",
-        []
-       ],
-       "comma0001-test": [
-        "5b3678de3966c455497af5034c66a68e95d6f83e",
-        []
-       ],
-       "comma0002-expected": [
-        "33590a084863fe7216fe1ea0f1ce7e98672de339",
-        []
-       ],
-       "comma0002-test": [
-        "164c0a93bfcdba58d3a84ec7c816b7ba2edc1806",
-        []
-       ],
-       "comma0003-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "comma0003-test": [
-        "213d3a5f2675e83f1a5256cd9a66e56efc7da959",
-        []
-       ],
-       "comma0004-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "comma0004-test": [
-        "e93f6f4062c9cacd56b40abbe88783783943a478",
-        []
-       ],
-       "comma0005-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "comma0005-test": [
-        "eeb040d0a31acfe14ee7db331968ba3d1d8df75f",
-        []
-       ],
-       "comma0006-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "comma0006-test": [
-        "94a71188114290a761eef397f42412e13e7909b7",
-        []
-       ],
-       "comma0007-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "comma0007-test": [
-        "6ca8efc711ba1e4d2a42679df8b53db580cc28a1",
-        []
-       ],
-       "disabled-chromium0020-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "disabled-chromium0020-test": [
-        "67cefa339efce135a669e4b69cd98e867ed5b47c",
-        []
-       ],
-       "disabled-chromium0022-expected": [
-        "8ac13216032b9cafd3efede3d47b9f9747047759",
-        []
-       ],
-       "disabled-chromium0022-test": [
-        "76a8ed4e9b8725200a3e282eeac1062ce3b9c570",
-        []
-       ],
        "disabled-path0029-expected": [
         "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
         []
@@ -283134,7 +282961,11 @@
       []
      ],
      "cookie-helper.sub.js": [
-      "3f0aac26efe00a04a04dab727ef8438f86e21757",
+      "50dcdfc5ecbb6dd023eef9ce64beab5e277db406",
+      []
+     ],
+     "cookie-test.js": [
+      "c0a03d78355ad219ae6303507c7398d63f3dee87",
       []
      ],
      "cookie.py": [
@@ -302331,6 +302162,14 @@
        ]
       }
      },
+     "box-shadow-radius-000-ref.html": [
+      "aa70cf257806c2640166aae7d5f9a85424c6dd33",
+      []
+     ],
+     "box-shadow-radius-001-ref.html": [
+      "96b80aed7b81769158a10829beef193fd4b0f888",
+      []
+     ],
      "child-move-reveals-parent-background-ref.html": [
       "10324966edb042c1c7298ce22dad76766c2a777b",
       []
@@ -346322,6 +346161,10 @@
      "focus": {
       "document-level-focus-apis": {
        "support": {
+        "popup.html": [
+         "3a4419105aaea3caac5f730d0db98d260e3590c6",
+         []
+        ],
         "test.html": [
          "90d63e51e931b147b23e8e1941324f8fb4237c94",
          []
@@ -352097,7 +351940,7 @@
      []
     ],
     "mediastream-recording.idl": [
-     "2878af4b66c276604d4e84e7b9796549f74e7415",
+     "8681a5ad428df9838e7f88779f42146e048fac7e",
      []
     ],
     "mst-content-hint.idl": [
@@ -352437,7 +352280,7 @@
      []
     ],
     "webxr-hand-input.idl": [
-     "4334d96793c211deaf8a8816b95b3c944186e2ee",
+     "e89210cd5695049f9455bee42f386999e15da5bc",
      []
     ],
     "webxr.idl": [
@@ -357814,6 +357657,10 @@
       []
      ],
      "resources": {
+      "img-with-referrer-policy.svg": [
+       "d54232d7bbd5903e009a2ea1645e8ba276590064",
+       []
+      ],
       "referrer.py": [
        "2d15dc09c4e86b5938d5d95cefa65417b16f82ae",
        []
@@ -401622,8 +401469,26 @@
    },
    "cookies": {
     "attributes": {
+     "expires.html": [
+      "9ebcc2b2acee6dfdc9fbbc551ef7ab9a1d17b685",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "invalid.html": [
-      "9e72394940f01bf23df863dae862519e432c685a",
+      "2edcfb9831758cad796c298ba6a7054f8edabd84",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "max-age.html": [
+      "2ee57964dfa2b309de034e40eb6b9030a784939b",
       [
        null,
        {
@@ -401632,7 +401497,7 @@
       ]
      ],
      "path.html": [
-      "ca8d04935f5cd8ee8cb746b4cb4e10f6e99d6c61",
+      "c201aa170b83049c116e2e4a1e259d8191124302",
       [
        null,
        {
@@ -401650,7 +401515,7 @@
       ]
      ],
      "secure.https.html": [
-      "5e73758c4a070a39812deab3e2b7c61e6f56733e",
+      "3df3673a8152a8e6146c6f9354803b19d36d215a",
       [
        null,
        {
@@ -401696,28 +401561,18 @@
       ]
      ]
     },
+    "encoding": {
+     "charset.html": [
+      "f94f88021d9eeec1dd9726f86f04a64b95ca6abd",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
     "http-state": {
-     "charset-tests.html": [
-      "5917da19ec4264eed7277858842cd533fcb4135e",
-      [
-       null,
-       {}
-      ]
-     ],
-     "chromium-tests.html": [
-      "018be01e8fb6eb994d514b67cd80a3a46a755158",
-      [
-       null,
-       {}
-      ]
-     ],
-     "comma-tests.html": [
-      "bfd50387c28af21faaeb307c183004bbe763c62d",
-      [
-       null,
-       {}
-      ]
-     ],
      "domain-tests.html": [
       "e4f763a935d52b0f9c9655d4073757d2f77451e8",
       [
@@ -401783,6 +401638,17 @@
       {}
      ]
     ],
+    "name": {
+     "name.html": [
+      "18fd87659442f95157d233a2e99b2704c8ea8f03",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
     "navigated-away.html": [
      "bd89142d32a397daa5242a0673e625425673fc57",
      [
@@ -402171,6 +402037,17 @@
        {}
       ]
      ]
+    },
+    "value": {
+     "value.html": [
+      "c473a6bf7bd256586d74f2a6515cd096b93974e1",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
     }
    },
    "cors": {
@@ -464848,7 +464725,7 @@
          ]
         ],
         "canvas-createPutGetImageData-colorManaged.html": [
-         "c2d0294f9fd2710f7f4628d860f0ffdf5cf8bd4f",
+         "2018acbbe775dbd1ab069a0e704ce356e867e023",
          [
           null,
           {}
@@ -464883,7 +464760,7 @@
          ]
         ],
         "imageData-colorManagedBehavior.html": [
-         "ff7c1437b502da323cba0c7dead62afb1df18d21",
+         "49078bab6723061e43007762e5a9de8169b95598",
          [
           null,
           {}
@@ -481585,6 +481462,13 @@
        ]
       ],
       "document-level-focus-apis": {
+       "document-has-system-focus.html": [
+        "26f0bbbd09feb7972946ed06a1153425e6fe319e",
+        [
+         null,
+         {}
+        ]
+       ],
        "document-level-apis.html": [
         "4a8a9a291a9fab7bfa67df1887c53bd5e34aadec",
         [
@@ -488478,6 +488362,15 @@
          {}
         ]
        ],
+       "checkable-active-onblur.html": [
+        "d4090172812ed8b02e8379a80ea0178298d67ef9",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
        "checkbox-click-events.html": [
         "5051fdd4e6f825526ab2de418ce426a81e6dddc2",
         [
@@ -500001,28 +499894,28 @@
      ]
     ],
     "content-visibility-auto-offscreen.html": [
-     "af60412a87f0ab5f532c6e4f0aae0e31d6f84bc5",
+     "6f7af1a8871c226c7456410024e81722b307c7b0",
      [
       null,
       {}
      ]
     ],
     "content-visibility-auto-onscreen.html": [
-     "4d9d06aa537ecbc4a0fa3fa465197b220a533c23",
+     "6a4308060088e1e5dbce74f8c2f7e84847b0fc69",
      [
       null,
       {}
      ]
     ],
     "content-visibility-auto-resize.html": [
-     "b8de7f52e325e5789a64ff306daf33481078fee7",
+     "d692625445737656c6cfc7a1f5b55670d321f162",
      [
       null,
       {}
      ]
     ],
     "content-visibility-hidden.html": [
-     "939b1a212233a5be7b0b9611fe07cf062a11ffe0",
+     "db087fe06735e672216ab7577fa75dcd9ad3a031",
      [
       null,
       {}
@@ -500116,6 +500009,20 @@
       {}
      ]
     ],
+    "opacity-zero-layout-and-visible.html": [
+     "af81ff2a625908a2686e6987e1a86409ff7eba07",
+     [
+      null,
+      {}
+     ]
+    ],
+    "opacity-zero.html": [
+     "e6ce1f0d0811f2491b64f8159cc2799160cc85e1",
+     [
+      null,
+      {}
+     ]
+    ],
     "outline.html": [
      "1fed8e92f5e4b60cd83646405b6bd77e673c076f",
      [
@@ -500269,6 +500176,13 @@
       {}
      ]
     ],
+    "visibility-hidden-layout-and-visible.html": [
+     "3fea6bb27a2aa522c77f6de383d3a71b2d3786c5",
+     [
+      null,
+      {}
+     ]
+    ],
     "visibility-hidden.html": [
      "ec1c3316380e4b3f836015c2ed69fcceff772c50",
      [
@@ -524901,7 +524815,7 @@
        ]
       ],
       "iframe-inheritance-javascript-child.html": [
-       "b7f8dabc0cd4b68a5b9c6b40c901f1cf3699c143",
+       "e6df2098d472dfa4b26b85bc5b1da0ef0faeefb8",
        [
         null,
         {}
@@ -524936,6 +524850,13 @@
        {}
       ]
      ],
+     "meta-tag-in-svg-image.html": [
+      "5bdc2c1abfa82777bac25b03a583898c51585ff6",
+      [
+       null,
+       {}
+      ]
+     ],
      "multiple-headers-and-values.html": [
       "e6b7b07d517ee9cc94ff06775fef3b70a48124b8",
       [
@@ -544961,6 +544882,55 @@
         }
        ]
       ],
+      "type.tentative.any.js": [
+       "318b1ac578cac6051ea23ecfbb6525fffb325501",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/type.tentative.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/type.tentative.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "value-get-set.any.js": [
        "f95b7ca9e3f0d54863db6dfd66ea76c9f392c132",
        [
@@ -545715,6 +545685,55 @@
          ]
         }
        ]
+      ],
+      "type.tentative.any.js": [
+       "efe9e2a37deb7bb6ef841e9809eee781c9effb9f",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/type.tentative.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/type.tentative.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ]
       ]
      },
      "module": {
@@ -550776,7 +550795,7 @@
        ]
       ],
       "panner-distance-clamping.html": [
-       "96b99a2373bccdab74ebdfd409f0f8adb4acc94d",
+       "78c1ec6dc2d439475371a3b77c25f5af761206ad",
        [
         null,
         {}
@@ -562610,7 +562629,7 @@
        ]
       ],
       "002.worker.js": [
-       "bbaf66d3383e0957c5ab12ca03688c507081d86d",
+       "065cc6e6f1705fc0157ee80ccd8daee4af4ac534",
        [
         "workers/semantics/interface-objects/002.worker.html",
         {}
@@ -562631,7 +562650,7 @@
        ]
       ],
       "004.any.js": [
-       "ea96197ce19aa47d2d351549f6d570afeffe7920",
+       "2cbb4b54256b4587a9bdc139e03f5e7b07756915",
        [
         "workers/semantics/interface-objects/004.any.sharedworker.html",
         {
diff --git a/tests/wpt/metadata/cookies/http-state/chromium-tests.html.ini b/tests/wpt/metadata/cookies/http-state/chromium-tests.html.ini
deleted file mode 100644
index c83ca7e1650..00000000000
--- a/tests/wpt/metadata/cookies/http-state/chromium-tests.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[chromium-tests.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/cookies/value/value.html.ini b/tests/wpt/metadata/cookies/value/value.html.ini
new file mode 100644
index 00000000000..b122cd38a6f
--- /dev/null
+++ b/tests/wpt/metadata/cookies/value/value.html.ini
@@ -0,0 +1,16 @@
+[value.html]
+  [Set nameless cookie to its value]
+    expected: FAIL
+
+  [Set cookie but ignore value after LF]
+    expected: FAIL
+
+  [Set nameless cookie followed by '=' to its value]
+    expected: FAIL
+
+  [Ignore cookie with large value ( > 4kb)]
+    expected: FAIL
+
+  [Set nameless cookie to its value with an escaped quote]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
similarity index 67%
rename from tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
rename to tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
index f29da48a2a0..4bfb0c2053a 100644
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -1,4 +1,4 @@
-[hit-test-floats-003.html]
+[hit-test-floats-004.html]
   [Miss float below something else]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-000.html.ini b/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-000.html.ini
new file mode 100644
index 00000000000..2cdd6bfe9ac
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-000.html.ini
@@ -0,0 +1,2 @@
+[box-shadow-radius-000.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-001.html.ini b/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-001.html.ini
new file mode 100644
index 00000000000..7a7d4e8975e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/box-shadow-radius-001.html.ini
@@ -0,0 +1,2 @@
+[box-shadow-radius-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/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/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 84c6ad5cca8..415dd76e426 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -318,15 +318,21 @@
   [<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/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    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 e67f0406fc3..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,3 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index aa6eb8f6085..61682d248e2 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%20'NosniFF']
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 385376c7321..dc2e45516de 100644
--- a/tests/wpt/metadata-layout-2020/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_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 442db3cb549..fd369192a02 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -6,5 +7,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
index e146e0d74d6..6b0d44fbb23 100644
--- a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
+++ b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
@@ -71,3 +71,21 @@
   [Test createImageData(width, height) from SRGB canvas ]
     expected: FAIL
 
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, e-SRGB U16 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, e-SRGB U16 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, e-SRGB F32 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, e-SRGB F32 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): e-SRGB canvas, SRGB U8 ImageData]
+    expected: FAIL
+
+  [Test createImageData(width, height, imageDataSettings): SRGB canvas, SRGB U8 ImageData]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini b/tests/wpt/metadata/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
new file mode 100644
index 00000000000..bf524d57776
--- /dev/null
+++ b/tests/wpt/metadata/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html.ini
@@ -0,0 +1,4 @@
+[document-has-system-focus.html]
+  [Top-level document receives blur/focus events and loses system focus during opening/closing of a popup]
+    expected: FAIL
+
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 1de3f8d68b2..98163335e40 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,3 +172,6 @@
   [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_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-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 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 d43f38b40cd..45d8be1c898 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 0fbc49ea1c1..f4f994c5d6f 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,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
deleted file mode 100644
index ca460dc6867..00000000000
--- a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/opening-the-input-stream/ignore-opens-during-unload.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
index 910c88d3e81..69bd952d756 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
@@ -1,5 +1,5 @@
 [ignore-opens-during-unload.window.html]
-  expected: CRASH
+  expected: TIMEOUT
   [ignore-opens-during-unload]
     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 0cef5158fae..01f7b72cbe7 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,3 +4,6 @@
   [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/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
index 78cb866d2b3..ced92bd6a1a 100644
--- a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
@@ -2,3 +2,6 @@
   [Referrer Policy: iframes with javascript url reuse referrer policy 1]
     expected: FAIL
 
+  [Referrer Policy: iframes with javascript url reuse referrer policy 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/meta-tag-in-svg-image.html.ini b/tests/wpt/metadata/referrer-policy/generic/meta-tag-in-svg-image.html.ini
new file mode 100644
index 00000000000..7ed6c97a5fe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/meta-tag-in-svg-image.html.ini
@@ -0,0 +1,4 @@
+[meta-tag-in-svg-image.html]
+  [Meta tag in SVG image loaded via img should be ignored]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/jsapi/global/type.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/global/type.tentative.any.js.ini
new file mode 100644
index 00000000000..900e4c99f3c
--- /dev/null
+++ b/tests/wpt/metadata/wasm/jsapi/global/type.tentative.any.js.ini
@@ -0,0 +1,81 @@
+[type.tentative.any.html]
+  [anyref, immutable]
+    expected: FAIL
+
+  [i64, immutable]
+    expected: FAIL
+
+  [f64, immutable]
+    expected: FAIL
+
+  [i64, mutable]
+    expected: FAIL
+
+  [funcref, mutable]
+    expected: FAIL
+
+  [i32, immutable]
+    expected: FAIL
+
+  [f32, mutable]
+    expected: FAIL
+
+  [f64, mutable]
+    expected: FAIL
+
+  [funcref, immutable]
+    expected: FAIL
+
+  [i32, mutable]
+    expected: FAIL
+
+  [anyref, mutable]
+    expected: FAIL
+
+  [f32, immutable]
+    expected: FAIL
+
+  [key ordering]
+    expected: FAIL
+
+
+[type.tentative.any.worker.html]
+  [anyref, immutable]
+    expected: FAIL
+
+  [i64, immutable]
+    expected: FAIL
+
+  [f64, immutable]
+    expected: FAIL
+
+  [i64, mutable]
+    expected: FAIL
+
+  [funcref, mutable]
+    expected: FAIL
+
+  [i32, immutable]
+    expected: FAIL
+
+  [f32, mutable]
+    expected: FAIL
+
+  [f64, mutable]
+    expected: FAIL
+
+  [funcref, immutable]
+    expected: FAIL
+
+  [i32, mutable]
+    expected: FAIL
+
+  [anyref, mutable]
+    expected: FAIL
+
+  [f32, immutable]
+    expected: FAIL
+
+  [key ordering]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/jsapi/memory/type.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/memory/type.tentative.any.js.ini
new file mode 100644
index 00000000000..e243a969365
--- /dev/null
+++ b/tests/wpt/metadata/wasm/jsapi/memory/type.tentative.any.js.ini
@@ -0,0 +1,39 @@
+[type.tentative.any.worker.html]
+  [non-shared memory]
+    expected: FAIL
+
+  [None-zero maximum]
+    expected: FAIL
+
+  [shared memory]
+    expected: FAIL
+
+  [Zero maximum]
+    expected: FAIL
+
+  [Zero initial, no maximum]
+    expected: FAIL
+
+  [Non-zero initial, no maximum]
+    expected: FAIL
+
+
+[type.tentative.any.html]
+  [non-shared memory]
+    expected: FAIL
+
+  [None-zero maximum]
+    expected: FAIL
+
+  [shared memory]
+    expected: FAIL
+
+  [Zero maximum]
+    expected: FAIL
+
+  [Zero initial, no maximum]
+    expected: FAIL
+
+  [Non-zero initial, no maximum]
+    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 a56bad443a2..66bd350083b 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,5 +1,4 @@
 [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 da7d8f99c57..1dd81414b27 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
@@ -644,3 +644,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t6.3119296254606011e+23\t9.3139332532882690e-1\t6.3119296254606011e+23\t6.7768680038931826e+23\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 6.3119296254606011e+23 at index of 28696.\n\tMax RelError of 6.7768680038931826e+23 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.9435393349935682e-20\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
index bc5b96f1d34..8b4cbdc9f90 100644
--- a/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
+++ b/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
@@ -221,3 +221,15 @@
   [XRHand interface: constant MIDDLE_METACARPAL on interface prototype object]
     expected: FAIL
 
+  [XRHand interface: iterable<XRHandJoint, XRJointSpace>]
+    expected: FAIL
+
+  [XRHand interface: operation get(XRHandJoint)]
+    expected: FAIL
+
+  [XRHand interface: attribute size]
+    expected: FAIL
+
+  [XRJointSpace interface: attribute jointName]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/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/cookies/attributes/expires.html b/tests/wpt/web-platform-tests/cookies/attributes/expires.html
new file mode 100644
index 00000000000..9ebcc2b2ace
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/attributes/expires.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test expires attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.1.1">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      // TODO: there is more to test here, these tests capture the old
+      // ported http-state tests. Feel free to delete this comment when more
+      // are added.
+      const expiresTests = [
+        {
+          cookie: "test=1; Expires=Fri, 01 Jan 2038 00:00:00 GMT",
+          expected: "test=1",
+          name: "Set cookie with expires value containing a comma",
+        },
+        {
+          cookie: "test=2; Expires=Fri 01 Jan 2038 00:00:00 GMT, baz=qux",
+          expected: "test=2",
+          name: "Set cookie with expires value followed by comma"
+        }
+      ];
+
+      for (const test of expiresTests) {
+        httpCookieTest(test.cookie, test.expected, test.name);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/invalid.html b/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
index 9e72394940f..2edcfb98317 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
+++ b/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
@@ -7,7 +7,7 @@
     <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
   </head>
   <body>
     <div id=log></div>
@@ -20,37 +20,44 @@
       {
         cookie: "test=1; lol; Path=/",
         expected: "test=1",
-        name: "Set cookie with invalid attribute"
+        name: "Set cookie with invalid attribute",
+        defaultPath: false
       },
       {
         cookie: "test=2; Path=/; lol",
         expected: "test=2",
-        name: "Set cookie ending with invalid attribute."
+        name: "Set cookie ending with invalid attribute.",
+        defaultPath: false
       },
       {
         cookie: "test=3; Path=/; 'lol'",
         expected: "test=3",
-        name: "Set cookie ending with quoted invalid attribute."
+        name: "Set cookie ending with quoted invalid attribute.",
+        defaultPath: false
       },
       {
         cookie: 'test=4; Path=/; "lol"',
         expected: "test=4",
-        name: "Set cookie ending with double-quoted invalid attribute."
+        name: "Set cookie ending with double-quoted invalid attribute.",
+        defaultPath: false
       },
       {
         cookie: "test=5; Path=/; lol=",
         expected: "test=5",
-        name: "Set cookie ending with invalid attribute equals."
+        name: "Set cookie ending with invalid attribute equals.",
+        defaultPath: false
       },
       {
         cookie: 'test=6; lol="aaa;bbb"; Path=/',
         expected: "test=6",
-        name: "Set cookie with two invalid attributes (lol=\"aaa and bbb)."
+        name: "Set cookie with two invalid attributes (lol=\"aaa and bbb).",
+        defaultPath: false
       },
       {
         cookie: 'test=7; Path=/; lol="aaa;bbb"',
         expected: "test=7",
-        name: "Set cookie ending with two invalid attributes (lol=\"aaa and bbb)."
+        name: "Set cookie ending with two invalid attributes (lol=\"aaa and bbb).",
+        defaultPath: false
       },
       {
         cookie: 'test=8; "Secure"',
@@ -58,7 +65,6 @@
         // This gets parsed as an unrecognized \"Secure\" attribute, not a valid
         // Secure attribute. That's why it gets set on an non-secure origin.
         name: "Set cookie for quoted Secure attribute",
-        defaultPath: true
       },
       {
         cookie: "test=9; Secure qux",
@@ -66,15 +72,32 @@
         // This should be parsed as an unrecognized "Secure qux" attribute
         // and ignored. That is, the cookie will not be Secure.
         name: "Set cookie for Secure qux",
-        defaultPath: true
       },
+      {
+        cookie: "test=10; b,az=qux",
+        expected: "test=10",
+        name: "Ignore invalid attribute name with comma",
+      },
+      {
+        cookie: "test=11; baz=q,ux",
+        expected: "test=11",
+        name: "Ignore invalid attribute value with comma",
+      },
+      {
+        cookie: "  test  = 12  ;foo;;;   bar",
+        expected: "test=12",
+        name: "Set cookie ignoring multiple invalid attributes, whitespace, and semicolons",
+      },
+      {
+        cookie: "  test=== 13  ;foo;;;   bar",
+        expected: "test=== 13",
+        name: "Set cookie with multiple '='s in its value, ignoring multiple invalid attributes, whitespace, and semicolons",
+      }
     ];
 
-      for (const test of invalidAttributeTests) {
-        promise_test(async testCase => {
-          await runCookieTest(test.cookie, test.expected, test.defaultPath);
-        }, test.name);
-      }
+    for (const test of invalidAttributeTests) {
+      httpCookieTest(test.cookie, test.expected, test.name, test.defaultPath);
+    }
     </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/max-age.html b/tests/wpt/web-platform-tests/cookies/attributes/max-age.html
new file mode 100644
index 00000000000..2ee57964dfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/attributes/max-age.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test max-age attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.3.2">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      // TODO: there is more to test here, these tests capture the old
+      // ported http-state tests. Feel free to delete this comment when more
+      // are added.
+      const maxAgeTests = [
+        {
+          cookie: "test=1; Max-Age=50,399",
+          expected: "test=1",
+          name: "Ignore max-age attribute with invalid non-zero-digit (containing a comma)",
+        },
+      ];
+
+      for (const test of maxAgeTests) {
+        httpCookieTest(test.cookie, test.expected, test.name);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/path.html b/tests/wpt/web-platform-tests/cookies/attributes/path.html
index ca8d04935f5..c201aa170b8 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/path.html
+++ b/tests/wpt/web-platform-tests/cookies/attributes/path.html
@@ -7,7 +7,7 @@
     <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
   </head>
   <body>
     <script>
@@ -16,38 +16,41 @@
           cookie: "test=1; Path",
           expected: "test=1",
           name: "Set cookie for bare Path",
-          defaultPath: true
         },
         {
           cookie: "test=2; Path=",
           expected: "test=2",
           name: "Set cookie for Path=",
-          defaultPath: true
         },
         {
           cookie: "test=3; Path=/",
           expected: "test=3",
-          name: "Set cookie for Path=/"
+          name: "Set cookie for Path=/",
+          defaultPath: false
         },
         {
           cookie: "test=4; Path=/qux",
           expected: "",
-          name: "No cookie returned for mismatched path"
+          name: "No cookie returned for mismatched path",
+          defaultPath: false
         },
         {
           cookie: "test=5; Path    =/qux",
           expected: "",
-          name: "No cookie returned for path space equals mismatched path"
+          name: "No cookie returned for path space equals mismatched path",
+          defaultPath: false
         },
         {
           cookie: "test=6; Path=    /qux",
           expected: "",
-          name: "No cookie returned for path equals space mismatched path"
+          name: "No cookie returned for path equals space mismatched path",
+          defaultPath: false
         },
         {
           cookie: "test=7; Path=/qux      ; taz",
           expected: "",
-          name: "No cookie returned for mismatched path and attribute"
+          name: "No cookie returned for mismatched path and attribute",
+          defaultPath: false
         },
         {
           cookie: "test=8; Path=/qux; Path=/",
@@ -57,19 +60,19 @@
         {
           cookie: "test=9; Path=/; Path=/qux",
           expected: "",
-          name: "No cookie returned for root and mismatched path"
+          name: "No cookie returned for root and mismatched path",
+          defaultPath: false
         },
         {
           cookie: "test=10; Path=/lol; Path=/qux",
           expected: "",
-          name: "No cookie returned for multiple mismatched paths"
+          name: "No cookie returned for multiple mismatched paths",
+          defaultPath: false
         },
       ];
 
       for (const test of pathTests) {
-        promise_test(async testCase => {
-          await runCookieTest(test.cookie, test.expected, test.defaultPath);
-        }, test.name);
+        httpCookieTest(test.cookie, test.expected, test.name, test.defaultPath);
       }
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html b/tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html
index f6a4682f8ae..65996e0c4d1 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html
+++ b/tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html
@@ -6,7 +6,7 @@
     <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.5">
     <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
-    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
   </head>
   <body>
     <script>
@@ -19,56 +19,46 @@
         cookie: "test=1; Secure",
         expected: "",
         name: "(non-secure) Ignore cookie for Secure attribute",
-        defaultPath: true
       },
       {
         cookie: "test=2; seCURe",
         expected: "",
         name: "(non-secure) Ignore cookie for seCURe attribute",
-        defaultPath: true
       },
       {
         cookie: "test=3; Secure=",
         expected: "",
         name: "(non-secure) Ignore cookie for for Secure= attribute",
-        defaultPath: true
       },
       {
         cookie: "test=4; Secure=aaaa",
         expected: "",
         name: "(non-secure) Ignore cookie for Secure=aaaa",
-        defaultPath: true
       },
       {
         cookie: "test=5; Secure =aaaaa",
         expected: "",
         name: "(non-secure) Ignore cookie for Secure space equals",
-        defaultPath: true
       },
       {
         cookie: "test=6; Secure= aaaaa",
         expected: "",
         name: "(non-secure) Ignore cookie for Secure equals space",
-        defaultPath: true
       },
       {
         cookie: "test=7;                Secure",
         expected: "",
         name: "(non-secure) Ignore cookie for spaced Secure",
-        defaultPath: true
       },
       {
         cookie: "test=8;       Secure     ;",
         expected: "",
         name: "(non-secure) Ignore cookie for space Secure with ;",
-        defaultPath: true
       }
     ];
 
     for (const test of secureNonSecureTests) {
-      promise_test(async testCase => {
-        await runCookieTest(test.cookie, test.expected, test.defaultPath);
-      }, test.name);
+      httpCookieTest(test.cookie, test.expected, test.name, test.defaultPath);
     }
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/secure.https.html b/tests/wpt/web-platform-tests/cookies/attributes/secure.https.html
index 5e73758c4a0..3df3673a815 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/secure.https.html
+++ b/tests/wpt/web-platform-tests/cookies/attributes/secure.https.html
@@ -7,7 +7,7 @@
     <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
   </head>
   <body>
     <div id=log></div>
@@ -17,56 +17,46 @@
           cookie: "test=1; Secure",
           expected: "test=1",
           name: "Set cookie for Secure attribute",
-          defaultPath: true
         },
         {
           cookie: "test=2; seCURe",
           expected: "test=2",
           name: "Set cookie for seCURe attribute",
-          defaultPath: true
         },
         {
           cookie: "test=3; Secure=",
           expected: "test=3",
           name: "Set cookie for for Secure= attribute",
-          defaultPath: true
         },
         {
           cookie: "test=4; Secure=aaaa",
           expected: "test=4",
           name: "Set cookie for Secure=aaaa",
-          defaultPath: true
         },
         {
           cookie: "test=5; Secure =aaaaa",
           expected: "test=5",
           name: "Set cookie for Secure space equals",
-          defaultPath: true
         },
         {
           cookie: "test=6; Secure= aaaaa",
           expected: "test=6",
           name: "Set cookie for Secure equals space",
-          defaultPath: true
         },
         {
           cookie: "test=7;                Secure",
           expected: "test=7",
           name: "Set cookie for spaced Secure",
-          defaultPath: true
         },
         {
           cookie: "test=8;       Secure     ;",
           expected: "test=8",
           name: "Set cookie for space Secure with ;",
-          defaultPath: true
         }
       ];
 
       for (const test of secureTests) {
-        promise_test(async testCase => {
-          await runCookieTest(test.cookie, test.expected, test.defaultPath);
-        }, test.name);
+        httpCookieTest(test.cookie, test.expected, test.name, test.defaultPath);
       }
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/cookies/encoding/charset.html b/tests/wpt/web-platform-tests/cookies/encoding/charset.html
new file mode 100644
index 00000000000..f94f88021d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/encoding/charset.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test utf-8 and ASCII cookie parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-4.1.1">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      const charsetTests = [
+        {
+          cookie: "test=1春节回家路·春运完全手册",
+          expected: "test=1春节回家路·春运完全手册",
+          name: "ASCII name and utf-8 value",
+        },
+        {
+          cookie: "тест=2",
+          expected: "тест=2",
+          name: "utf-8 name and ASCII value",
+        },
+        {
+          cookie: 'test="3春节回家路·春运完全手册"',
+          expected: 'test="3春节回家路·春运完全手册"',
+          name: "ASCII name and quoted utf-8 value",
+        },
+        {
+          cookie: "春节回=4家路·春运完全手册",
+          expected: "春节回=4家路·春运完全手册",
+          name: "utf-8 name and value",
+        },
+        {
+          cookie: '"春节回=5家路·春运完全手册"',
+          expected: '"春节回=5家路·春运完全手册"',
+          name: "quoted utf-8 name and value",
+        },
+        {
+          cookie: "春节回=6家路·春运; 完全手册",
+          expected: "春节回=6家路·春运",
+          name: "utf-8 name and value, with (invalid) utf-8 attribute",
+        },
+      ];
+
+      for (const test of charsetTests) {
+        httpCookieTest(test.cookie, test.expected, test.name);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/charset-tests.html b/tests/wpt/web-platform-tests/cookies/http-state/charset-tests.html
deleted file mode 100644
index 5917da19ec4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/charset-tests.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Tests cookie charset functionality</title>
-    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
-
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/cookie-http-state-template.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <div id="iframes"></div>
-    <script>
-      setup({ explicit_timeout: true });
-
-      const TEST_CASES = [
-        {file: "charset0001", name: "charset0001"},
-        {file: "charset0002", name: "charset0002"},
-        {file: "charset0003", name: "charset0003"},
-        {file: "charset0004", name: "charset0004"},
-      ];
-
-      for (const i in TEST_CASES) {
-        const t = TEST_CASES[i];
-        promise_test(createCookieTest(t.file),
-                     t.file + " - " + t.name);
-      }
-
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/chromium-tests.html b/tests/wpt/web-platform-tests/cookies/http-state/chromium-tests.html
deleted file mode 100644
index 018be01e8fb..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/chromium-tests.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Tests chromium cookie functionality</title>
-    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
-
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/cookie-http-state-template.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <div id="iframes"></div>
-    <script>
-      setup({ explicit_timeout: true });
-
-      const TEST_CASES = [
-        {file: "chromium0001", name: "chromium0001"},
-        {file: "chromium0002", name: "chromium0002"},
-        {file: "chromium0003", name: "chromium0003"},
-        {file: "chromium0004", name: "chromium0004"},
-        {file: "chromium0005", name: "chromium0005"},
-        {file: "chromium0006", name: "chromium0006"},
-        {file: "chromium0007", name: "chromium0007"},
-        {file: "chromium0008", name: "chromium0008"},
-        {file: "chromium0009", name: "chromium0009"},
-        {file: "chromium0010", name: "chromium0010"},
-        {file: "chromium0011", name: "chromium0011"},
-        {file: "chromium0012", name: "chromium0012"},
-        {file: "chromium0013", name: "chromium0013"},
-        {file: "chromium0014", name: "chromium0014"},
-        {file: "chromium0015", name: "chromium0015"},
-        {file: "chromium0016", name: "chromium0016"},
-        {file: "chromium0017", name: "chromium0017"},
-        {file: "chromium0018", name: "chromium0018"},
-        {file: "chromium0019", name: "chromium0019"},
-        {file: "disabled-chromium0020", name: "disabled-chromium0020"},
-        {file: "chromium0021", name: "chromium0021"},
-        {file: "disabled-chromium0022", name: "disabled-chromium0022"},
-      ];
-
-      for (const i in TEST_CASES) {
-        const t = TEST_CASES[i];
-        promise_test(createCookieTest(t.file),
-                     t.file + " - " + t.name);
-      }
-
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/comma-tests.html b/tests/wpt/web-platform-tests/cookies/http-state/comma-tests.html
deleted file mode 100644
index bfd50387c28..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/comma-tests.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Tests cookie setting comma functionality</title>
-    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
-
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/cookie-http-state-template.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <div id="iframes"></div>
-    <script>
-      setup({ explicit_timeout: true });
-
-      const TEST_CASES = [
-        {file: "comma0001", name: "comma0001"},
-        {file: "comma0002", name: "comma0002"},
-        {file: "comma0003", name: "comma0003"},
-        {file: "comma0004", name: "comma0004"},
-        {file: "comma0005", name: "comma0005"},
-        {file: "comma0006", name: "comma0006"},
-        {file: "comma0007", name: "comma0007"},
-      ];
-
-      for (const i in TEST_CASES) {
-        const t = TEST_CASES[i];
-        promise_test(createCookieTest(t.file),
-                     t.file + " - " + t.name);
-      }
-
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-expected
deleted file mode 100644
index 8646afc6366..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=春节回家路·春运完全手册
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-test
deleted file mode 100644
index e89a36dd89e..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0001-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=春节回家路·春运完全手册
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-expected
deleted file mode 100644
index fc7d2561017..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: 春节回=家路·春运完全手册
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-test
deleted file mode 100644
index 70ce472afa6..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0002-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: 春节回=家路·春运完全手册
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-expected
deleted file mode 100644
index 1969bc86b97..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: 春节回=家路·春运
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-test
deleted file mode 100644
index 446e2fd29f2..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0003-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: 春节回=家路·春运; 完全手册
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-expected
deleted file mode 100644
index 1d6d952989e..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo="春节回家路·春运完全手册"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-test
deleted file mode 100644
index 1564ba4fc92..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/charset0004-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo="春节回家路·春运完全手册"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-expected
deleted file mode 100644
index 1022f64a290..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-test
deleted file mode 100644
index 4635f0e7e37..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0001-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-expected
deleted file mode 100644
index 64932dcffb4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zzz "
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-test
deleted file mode 100644
index 24ab0d2da56..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0002-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zzz "   ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-expected
deleted file mode 100644
index 64932dcffb4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zzz "
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-test
deleted file mode 100644
index bac41f99288..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0003-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zzz " ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-expected
deleted file mode 100644
index 9be3e8f6435..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zz
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-test
deleted file mode 100644
index 45cab2f409d..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0004-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zz;pp" ; ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-expected
deleted file mode 100644
index 9be3e8f6435..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zz
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-test
deleted file mode 100644
index c2dfebd3c44..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0005-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zz ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-expected
deleted file mode 100644
index 8121145c18b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zzz "   "ppp"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-test
deleted file mode 100644
index a9da26811a4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0006-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zzz "   "ppp"  ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-expected
deleted file mode 100644
index 8121145c18b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc="zzz "   "ppp"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-test
deleted file mode 100644
index dca20b8e7df..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0007-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc="zzz "   "ppp" ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-expected
deleted file mode 100644
index 602c0e017c4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: aBc=A"B
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-test
deleted file mode 100644
index ece6c66f0b1..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0008-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aBc=A"B ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-expected
deleted file mode 100644
index d347326bc62..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: BLAHHH
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-test
deleted file mode 100644
index eecdae60cc4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0009-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: BLAHHH; path=/;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-expected
deleted file mode 100644
index 21b4b84b9aa..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: "BLA\"HHH"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-test
deleted file mode 100644
index 17a18ea9272..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0010-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: "BLA\"HHH"; path=/;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-expected
deleted file mode 100644
index 2062e231556..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: a="B
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-test
deleted file mode 100644
index 4000f269a49..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0011-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: a="B
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-expected
deleted file mode 100644
index 7bed67c98e3..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: ABC
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-test
deleted file mode 100644
index b33a4e7427b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0012-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: =ABC
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-expected
deleted file mode 100644
index 5d2d06092c4..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: ABC=
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-test
deleted file mode 100644
index f61a087bb8f..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0013-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: ABC=;  path = /
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-expected
deleted file mode 100644
index 21bfd134e54..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: A=BC
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-test
deleted file mode 100644
index edbb7931a38..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0014-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie:   A  = BC  ;foo;;;   bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-expected
deleted file mode 100644
index b968e7427a0..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: A=== BC
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-test
deleted file mode 100644
index 80d32366b5d..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0015-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie:   A=== BC  ;foo;;;   bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-expected
deleted file mode 100644
index 11d8efaea2a..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo="zohNumRKgI0oxyhSsV3Z7D"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-test
deleted file mode 100644
index 8abf12026c7..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0016-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo="zohNumRKgI0oxyhSsV3Z7D"  ; expires=Sun, 18-Apr-2027 21:06:29 GMT ; path=/  ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-expected
deleted file mode 100644
index 6bb84483a05..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=zohNumRKgI0oxyhSsV3Z7D
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-test
deleted file mode 100644
index 94cce02078b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0017-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=zohNumRKgI0oxyhSsV3Z7D  ; expires=Sun, 18-Apr-2027 21:06:29 GMT ; path=/  ;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0018-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0018-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0018-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0018-test
deleted file mode 100644
index 145ad2c5def..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0018-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-expected
deleted file mode 100644
index b6df50eef28..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-test
deleted file mode 100644
index e3bcc4a18c3..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0019-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0021-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0021-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0021-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0021-test
deleted file mode 100644
index 145ad2c5def..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/chromium0021-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-expected
deleted file mode 100644
index ab55cea018a..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar, baz=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-test
deleted file mode 100644
index 5b3678de396..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0001-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar, baz=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-expected
deleted file mode 100644
index 33590a08486..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo="bar, baz=qux"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-test
deleted file mode 100644
index 164c0a93bfc..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0002-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo="bar, baz=qux"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-test
deleted file mode 100644
index 213d3a5f267..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0003-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; b,az=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-test
deleted file mode 100644
index e93f6f4062c..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0004-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; baz=q,ux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-test
deleted file mode 100644
index eeb040d0a31..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0005-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Max-Age=50,399
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-test
deleted file mode 100644
index 94a71188114..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0006-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Expires=Fri, 01 Jan 2038 00:00:00 GMT
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-test
deleted file mode 100644
index 6ca8efc711b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/comma0007-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Expires=Fri 01 Jan 2038 00:00:00 GMT, baz=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0020-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0020-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0020-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0020-test
deleted file mode 100644
index 67cefa339ef..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0020-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-expected
deleted file mode 100644
index 8ac13216032..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: AAA=BB
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-test
deleted file mode 100644
index 76a8ed4e9b8..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/disabled-chromium0022-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: AAA=BB
ZYX
diff --git a/tests/wpt/web-platform-tests/cookies/name/name.html b/tests/wpt/web-platform-tests/cookies/name/name.html
new file mode 100644
index 00000000000..18fd8765944
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/name/name.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie name parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      // TODO: there is more to test here, these tests capture the old
+      // ported http-state tests. Feel free to delete this comment when more
+      // are added.
+      const nameTests = [
+        {
+          cookie: "test1=;  path = /",
+          expected: "test1=",
+          name: "Set valueless cookie to its name with empty value",
+          defaultValue: false,
+        },
+        {
+          cookie: "",
+          expected: "",
+          name: "Ignore cookie with no name or value",
+        },
+
+      ];
+
+      for (const test of nameTests) {
+        httpCookieTest(test.cookie, test.expected, test.name);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
index 3f0aac26efe..50dcdfc5ecb 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
@@ -309,52 +309,3 @@ function erase_cookie_from_js(name, params) {
   var re = new RegExp("(?:^|; )" + name);
   assert_equals(re.test(document.cookie), false, "Sanity check: " + name + " has been deleted.");
 }
-
-// getDefaultPathCookies is a helper method to get and delete cookies on the
-// "default path" (which for these tests will be at `/cookies/resources`),
-// determined by the path portion of the request-uri.
-async function getDefaultPathCookies(path = '/cookies/resources') {
-  return new Promise((resolve, reject) => {
-    try {
-      const iframe = document.createElement('iframe');
-      iframe.style = 'display: none';
-      iframe.src = `${path}/echo-cookie.html`;
-
-      iframe.addEventListener('load', (e) => {
-        const win = e.target.contentWindow;
-        const iframeCookies = win.getCookies();
-        win.expireCookie('test', path);
-        resolve(iframeCookies);
-      }, {once: true});
-
-      document.documentElement.appendChild(iframe);
-    } catch (e) {
-      reject(e);
-    }
-  });
-}
-
-// runCookieTest sets a |cookie|, then asserts it was or was not set
-// via |expectedValue|. Then cleans it up.
-async function runCookieTest(cookie, expectedValue, defaultPath) {
-  return fetch(`/cookies/resources/cookie.py?set=${encodeURIComponent(cookie)}`)
-      .then(async _ => {
-        let cookies = document.cookie;
-        // for the tests where a Path is set from the request-uri path, we need
-        // to go look for cookies in an iframe at that default path.
-        if (defaultPath) {
-          cookies = await getDefaultPathCookies();
-        }
-
-        if (Boolean(expectedValue)) {
-          assert_equals(
-              cookies, expectedValue, 'The cookie was set as expected.');
-        } else {
-          assert_equals(cookies, expectedValue, 'The cookie was rejected.');
-        }
-      })
-      .then(_ => {
-        return fetch(
-            `/cookies/resources/cookie.py?drop=${encodeURIComponent(cookie)}`);
-      });
-}
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
new file mode 100644
index 00000000000..c0a03d78355
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
@@ -0,0 +1,55 @@
+// getDefaultPathCookies is a helper method to get and delete cookies on the
+// "default path" (which for these tests will be at `/cookies/resources`),
+// determined by the path portion of the request-uri.
+async function getDefaultPathCookies(path = '/cookies/resources') {
+  return new Promise((resolve, reject) => {
+    try {
+      const iframe = document.createElement('iframe');
+      iframe.style = 'display: none';
+      iframe.src = `${path}/echo-cookie.html`;
+
+      iframe.addEventListener('load', (e) => {
+        const win = e.target.contentWindow;
+        const iframeCookies = win.getCookies();
+        win.expireCookie('test', path);
+        resolve(iframeCookies);
+      }, {once: true});
+
+      document.documentElement.appendChild(iframe);
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+// httpCookieTest sets a |cookie| (via HTTP), then asserts it was or was not set
+// via |expectedValue| (via the DOM). Then cleans it up (via HTTP). Most tests
+// do not set a Path attribute, so |defaultPath| defaults to true.
+function httpCookieTest(cookie, expectedValue, name, defaultPath = true) {
+  let encodedCookie = encodeURIComponent(cookie);
+  return promise_test(
+      async t => {
+          return fetch(`/cookies/resources/cookie.py?set=${encodedCookie}`)
+              .then(async () => {
+                let cookies = document.cookie;
+                if (defaultPath) {
+                  // for the tests where a Path is set from the request-uri
+                  // path, we need to go look for cookies in an iframe at that
+                  // default path.
+                  cookies = await getDefaultPathCookies();
+                }
+                if (Boolean(expectedValue)) {
+                  assert_equals(
+                      cookies, expectedValue,
+                      'The cookie was set as expected.');
+                } else {
+                  assert_equals(
+                      cookies, expectedValue, 'The cookie was rejected.');
+                }
+              })
+              .then(() => {
+                return fetch(
+                    `/cookies/resources/cookie.py?drop=${encodedCookie}`);
+              })},
+      name);
+}
diff --git a/tests/wpt/web-platform-tests/cookies/value/value.html b/tests/wpt/web-platform-tests/cookies/value/value.html
new file mode 100644
index 00000000000..c473a6bf7bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/value/value.html
@@ -0,0 +1,101 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie value parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      // TODO: there is more to test here, these tests capture the old
+      // ported http-state tests. Feel free to delete this comment when more
+      // are added, or these are split up into logical groups.
+      const valueTests = [
+        {
+          cookie: "test=1, baz=qux",
+          expected: "test=1, baz=qux",
+          name: "Set value containing a comma",
+        },
+        {
+          cookie: 'test="2, baz=qux"',
+          expected: 'test="2, baz=qux"',
+          name: "Set quoted value containing a comma",
+        },
+        {
+          cookie: 'test="3zz;pp" ; ;',
+          expected: 'test="3zz',
+          name: "Ignore values after semicolon",
+        },
+        {
+          cookie: 'test="4zz ;',
+          expected: 'test="4zz',
+          name: "Ingore whitespace at the end of value",
+        },
+        {
+          cookie: 'test="5zzz "   "ppp"  ;',
+          expected: 'test="5zzz "   "ppp"',
+          name: "Set value including quotes and whitespace up until semicolon",
+        },
+        {
+          cookie: 'test=6A"B ;',
+          expected: 'test=6A"B',
+          name: "Set value with a single quote excluding whitespace"
+        },
+        {
+          cookie: "test7",
+          expected: "test7",
+          name: "Set nameless cookie to its value",
+        },
+        {
+          cookie: '"test8\"HHH"',
+          expected: '"test8\"HHH"',
+          name: "Set nameless cookie to its value with an escaped quote",
+        },
+        {
+          cookie: 'test="9',
+          expected: 'test="9',
+          name: "Set value with unbalanced leading quote",
+        },
+        {
+          cookie: "=test10",
+          expected: "test10",
+          name: "Set nameless cookie followed by '=' to its value",
+        },
+        {
+          // 7 + 4089 = 4096
+          cookie: `test=11${"a".repeat(4089)}`,
+          expected: `test=11${"a".repeat(4089)}`,
+          name: "Set cookie with large value ( = 4kb)",
+        },
+        {
+          // 7 + 4091 = 4098
+          // Note: Chrome includes = in its length, Firefox does not
+          // For now, make this 4098 until the spec clarifies:
+          // https://github.com/httpwg/http-extensions/issues/1340
+          cookie: `test=12${"a".repeat(4091)}`,
+          expected: "",
+          name: "Ignore cookie with large value ( > 4kb)",
+        },
+        {
+          cookie: `test=13\nZYX`,
+          expected: "test=13",
+          name: "Set cookie but ignore value after LF",
+        },
+        {
+          cookie: 'test="14 "   ;',
+          expected: 'test="14 "',
+          name: "Set cookie ignoring whitespace after value endquote",
+        },
+      ];
+
+      for (const test of valueTests) {
+        httpCookieTest(test.cookie, test.expected, test.name, test.defaultPath);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000-ref.html
new file mode 100644
index 00000000000..aa70cf25780
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000-ref.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<title>Box Shadow Border Radius (Outset)</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<!-- This test is complicated, so leaving the reference code identical to the test, minus colors. Please keep them in sync. -->
+
+<style>
+  body > div {
+    /* Isolate tests from each other */
+    position: relative;
+    width: 100px;
+    height: 100px;
+    float: left;
+  }
+  div > div {
+    position: absolute;
+    box-sizing: border-box;
+    /* opacity: 0.7; /* uncomment this line for debugging */
+  }
+
+  .floor > .test {
+    color: silver;
+  }
+  .trap > .test {
+    color: transparent;
+  }
+
+  .floor > .ref {
+    border: solid transparent;
+    width: 58px;
+    height: 58px;
+    top: 21px;
+    left: 21px;
+  }
+  .trap > .ref {
+    border: solid silver;
+    width: 62px;
+    height: 62px;
+    top: 19px;
+    left: 19px;
+  }
+
+  /* Keep tests centered by (top|left)*2 + (width|height) = 100.
+     Keep tests consistent spread + (width|height) = 60
+     Floor = spread - 2px
+     Trap = spread + 2px */
+
+  .once > .test {
+    border-radius: 10px;
+    box-shadow: 0 0 0 10px;
+    /* shadow radius = 20px */
+    top: 30px; left: 30px;
+    width: 40px; height: 40px;
+  }
+  .once > .ref {
+    border-radius: 20px;
+  }
+  .once.floor > .ref {
+    border-width: 8px;
+  }
+  .once.trap > .ref {
+    border-width: 12px;
+  }
+
+  .twice > .test {
+    border-radius: 10px;
+    box-shadow: 0 0 0 5px;
+    /* shadow radius = 15px */
+    top: 25px; left: 25px;
+    width: 50px; height: 50px;
+  }
+  .twice > .ref {
+    border-radius: 15px;
+  }
+  .twice.floor > .ref {
+    border-width: 3px;
+  }
+  .twice.trap > .ref {
+    border-width: 7px;
+  }
+
+  .half > .test {
+    border-radius: 8px;
+    box-shadow: 0 0 0 16px;
+    /* shadow radius = 21px */
+    top: 36px; left: 36px;
+    width: 28px; height: 28px;
+  }
+  .half > .ref {
+    border-radius: 21px;
+  }
+  .half.floor > .ref {
+    border-width: 14px;
+  }
+  .half.trap > .ref {
+    border-width: 18px;
+  }
+
+  .fourth > .test {
+    border-radius: 5px;
+    box-shadow: 0 0 0 20px;
+    /* shadow radius = 14.45px */
+    top: 40px; left: 40px;
+    width: 20px; height: 20px;
+  }
+  .fourth > .ref {
+    border-radius: 15px;
+  }
+  .fourth.floor > .ref {
+    border-width: 18px;
+  }
+  .fourth.trap > .ref {
+    border-width: 22px;
+  }
+
+  .eighth > .test {
+    border-radius: 2px;
+    box-shadow: 0 0 0 16px;
+    /* shadow radius = 5.28 */
+    top: 36px; left: 36px;
+    width: 28px; height: 28px;
+  }
+  .eighth > .ref {
+    border-radius: 5.28px;
+  }
+  .eighth.floor > .ref {
+    border-width: 14px;
+  }
+  .eighth.trap > .ref {
+    border-width: 18px;
+  }
+
+
+</style>
+
+<p>Test passes if there is no red.
+
+<div class="once floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="once trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="twice floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="twice trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="half floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="half trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="fourth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="fourth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="eighth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="eighth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html
new file mode 100644
index 00000000000..7ca2cffad0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<title>Box Shadow Border Radius (Outset)</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#shadow-shape">
+<link rel="match" href="box-shadow-radius-001-ref.html">
+
+<style>
+  body > div {
+    /* Isolate tests from each other */
+    position: relative;
+    width: 100px;
+    height: 100px;
+    float: left;
+  }
+  div > div {
+    position: absolute;
+    box-sizing: border-box;
+    /* opacity: 0.7; /* uncomment this line for debugging */
+  }
+
+  .floor > .test {
+    color: silver;
+  }
+  .trap > .test {
+    color: red;
+  }
+
+  .floor > .ref {
+    border: solid red;
+    width: 58px;
+    height: 58px;
+    top: 21px;
+    left: 21px;
+  }
+  .trap > .ref {
+    border: solid silver;
+    width: 62px;
+    height: 62px;
+    top: 19px;
+    left: 19px;
+  }
+
+  /* Keep tests centered by (top|left)*2 + (width|height) = 100.
+     Keep tests consistent spread + (width|height) = 60
+     Floor = spread - 2px
+     Trap = spread + 2px */
+
+  .once > .test {
+    border-radius: 10px;
+    box-shadow: 0 0 0 10px;
+    /* shadow radius = 20px */
+    top: 30px; left: 30px;
+    width: 40px; height: 40px;
+  }
+  .once > .ref {
+    border-radius: 20px;
+  }
+  .once.floor > .ref {
+    border-width: 8px;
+  }
+  .once.trap > .ref {
+    border-width: 12px;
+  }
+
+  .twice > .test {
+    border-radius: 10px;
+    box-shadow: 0 0 0 5px;
+    /* shadow radius = 15px */
+    top: 25px; left: 25px;
+    width: 50px; height: 50px;
+  }
+  .twice > .ref {
+    border-radius: 15px;
+  }
+  .twice.floor > .ref {
+    border-width: 3px;
+  }
+  .twice.trap > .ref {
+    border-width: 7px;
+  }
+
+  .half > .test {
+    border-radius: 8px;
+    box-shadow: 0 0 0 16px;
+    /* shadow radius = 21px */
+    top: 36px; left: 36px;
+    width: 28px; height: 28px;
+  }
+  .half > .ref {
+    border-radius: 21px;
+  }
+  .half.floor > .ref {
+    border-width: 14px;
+  }
+  .half.trap > .ref {
+    border-width: 18px;
+  }
+
+  .fourth > .test {
+    border-radius: 5px;
+    box-shadow: 0 0 0 20px;
+    /* shadow radius = 14.45px */
+    top: 40px; left: 40px;
+    width: 20px; height: 20px;
+  }
+  .fourth > .ref {
+    border-radius: 15px;
+  }
+  .fourth.floor > .ref {
+    border-width: 18px;
+  }
+  .fourth.trap > .ref {
+    border-width: 22px;
+  }
+
+  .eighth > .test {
+    border-radius: 2px;
+    box-shadow: 0 0 0 16px;
+    /* shadow radius = 5.28 */
+    top: 36px; left: 36px;
+    width: 28px; height: 28px;
+  }
+  .eighth > .ref {
+    border-radius: 5.28px;
+  }
+  .eighth.floor > .ref {
+    border-width: 14px;
+  }
+  .eighth.trap > .ref {
+    border-width: 18px;
+  }
+
+
+</style>
+
+<p>Test passes if there is no red.
+
+<div class="once floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="once trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="twice floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="twice trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="half floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="half trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="fourth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="fourth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="eighth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="eighth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001-ref.html
new file mode 100644
index 00000000000..96b80aed7b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001-ref.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<title>Box Shadow Border Radius (Inset)</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<!-- This test is complicated, so leaving the reference code identical to the test, minus colors. Please keep them in sync. -->
+
+<style>
+  body > div {
+    /* Isolate tests from each other */
+    position: relative;
+    width: 100px;
+    height: 100px;
+    float: left;
+  }
+  div > div {
+    position: absolute;
+    box-sizing: border-box;
+    /* opacity: 0.7; /* uncomment this line for debugging */
+  }
+
+  .floor > .test {
+    color: silver;
+  }
+  .trap > .test {
+    color: transparent;
+  }
+  .test {
+    width: 60px;
+    height: 60px;
+    top: 20px;
+    left: 20px;
+  }
+
+  .floor > .ref {
+    border: 8px transparent;
+    border-style: solid none none solid;
+    top: 21px;
+    left: 21px;
+    width: 59px;
+    height: 59px;
+  }
+  .trap > .ref {
+    border: 31px silver;
+    border-style: solid none none solid;
+    width: 81px;
+    height: 81px;
+  }
+
+  /* Keep tests consistent by offset - spread = 10
+     Trap radius = 32px + shadow radius (round up)
+     Floor radius = 8px + shadow radius (round down) */
+
+  .once > .test {
+    border-top-left-radius: 10px;
+    box-shadow: 20px 20px 0 -10px inset;
+    /* shadow radius = 20px */
+  }
+  .once.floor > .ref {
+    border-top-left-radius: 28px;
+  }
+  .once.trap > .ref {
+    border-top-left-radius: 52px;
+  }
+
+  .twice > .test {
+    border-top-left-radius: 10px;
+    box-shadow: 15px 15px 0 -5px inset;
+    /* shadow radius = 15 */
+  }
+  .twice.floor > .ref {
+    border-top-left-radius: 23px;
+  }
+  .twice.trap > .ref {
+    border-top-left-radius: 47px;
+  }
+
+  .half > .test {
+    border-top-left-radius: 8px;
+    box-shadow: 26px 26px 0 -16px inset;
+    /* shadow radius = 21px */
+  }
+  .half.floor > .ref {
+    border-top-left-radius: 29px;
+  }
+  .half.trap > .ref {
+    border-top-left-radius: 53px;
+  }
+
+  .fourth > .test {
+    border-top-left-radius: 5px;
+    box-shadow: 30px 30px 0 -20px inset;
+    /* shadow radius = 14.45 */
+  }
+  .fourth.floor > .ref {
+    border-top-left-radius: 22px;
+  }
+  .fourth.trap > .ref {
+    border-top-left-radius: 47px;
+  }
+
+  .eighth > .test {
+    border-top-left-radius: 2px;
+    box-shadow: 26px 26px 0 -16px inset;
+    /* shadow radius = 5.28 */
+  }
+  .eighth.floor > .ref {
+    border-top-left-radius: 12px;
+  }
+  .eighth.trap > .ref {
+    border-top-left-radius: 38px;
+  }
+
+</style>
+
+<p>Test passes if there is no red.
+
+<div class="once floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="once trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="twice floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="twice trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="half floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="half trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="fourth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="fourth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="eighth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="eighth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001.html
new file mode 100644
index 00000000000..9b823a0590f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<title>Box Shadow Border Radius (Inset)</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#shadow-shape">
+<link rel="match" href="box-shadow-radius-001-ref.html">
+
+<style>
+  body > div {
+    /* Isolate tests from each other */
+    position: relative;
+    width: 100px;
+    height: 100px;
+    float: left;
+  }
+  div > div {
+    position: absolute;
+    box-sizing: border-box;
+    /* opacity: 0.7; /* uncomment this line for debugging */
+  }
+
+  .floor > .test {
+    color: silver;
+  }
+  .trap > .test {
+    color: red;
+  }
+  .test {
+    width: 60px;
+    height: 60px;
+    top: 20px;
+    left: 20px;
+  }
+
+  .floor > .ref {
+    border: 8px red;
+    border-style: solid none none solid;
+    top: 21px;
+    left: 21px;
+    width: 59px;
+    height: 59px;
+  }
+  .trap > .ref {
+    border: 31px silver;
+    border-style: solid none none solid;
+    width: 81px;
+    height: 81px;
+  }
+
+  /* Keep tests consistent by offset - spread = 10
+     Trap radius = 32px + shadow radius (round up)
+     Floor radius = 8px + shadow radius (round down) */
+
+  .once > .test {
+    border-top-left-radius: 10px;
+    box-shadow: 20px 20px 0 -10px inset;
+    /* shadow radius = 20px */
+  }
+  .once.floor > .ref {
+    border-top-left-radius: 28px;
+  }
+  .once.trap > .ref {
+    border-top-left-radius: 52px;
+  }
+
+  .twice > .test {
+    border-top-left-radius: 10px;
+    box-shadow: 15px 15px 0 -5px inset;
+    /* shadow radius = 15 */
+  }
+  .twice.floor > .ref {
+    border-top-left-radius: 23px;
+  }
+  .twice.trap > .ref {
+    border-top-left-radius: 47px;
+  }
+
+  .half > .test {
+    border-top-left-radius: 8px;
+    box-shadow: 26px 26px 0 -16px inset;
+    /* shadow radius = 21px */
+  }
+  .half.floor > .ref {
+    border-top-left-radius: 29px;
+  }
+  .half.trap > .ref {
+    border-top-left-radius: 53px;
+  }
+
+  .fourth > .test {
+    border-top-left-radius: 5px;
+    box-shadow: 30px 30px 0 -20px inset;
+    /* shadow radius = 14.45 */
+  }
+  .fourth.floor > .ref {
+    border-top-left-radius: 22px;
+  }
+  .fourth.trap > .ref {
+    border-top-left-radius: 47px;
+  }
+
+  .eighth > .test {
+    border-top-left-radius: 2px;
+    box-shadow: 26px 26px 0 -16px inset;
+    /* shadow radius = 5.28 */
+  }
+  .eighth.floor > .ref {
+    border-top-left-radius: 12px;
+  }
+  .eighth.trap > .ref {
+    border-top-left-radius: 38px;
+  }
+
+</style>
+
+<p>Test passes if there is no red.
+
+<div class="once floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="once trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="twice floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="twice trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="half floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="half trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="fourth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="fourth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
+
+<div class="eighth floor">
+  <div class="ref"></div>
+  <div class="test"></div>
+</div>
+<div class="eighth trap">
+  <div class="test"></div>
+  <div class="ref"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-offset-relpos.html b/tests/wpt/web-platform-tests/css/css-break/abspos-in-offset-relpos.html
new file mode 100644
index 00000000000..b996c365866
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/abspos-in-offset-relpos.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<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="columns:2; column-gap:0; column-fill:auto; width:100px; height:100px; background:red;">
+  <div style="height:0;">
+    <div style="height:100px;"></div>
+    <!-- Fill the second column, in a parallel flow (overflow): -->
+    <div style="height:100px; background:green;"></div>
+  </div>
+  <div style="position:relative; top:25px; height:75px; background:red;">
+    <!-- Fill the first column: -->
+    <div style="position:absolute; top:-25px; width:100%; height:100px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html
new file mode 100644
index 00000000000..2c64b59a778
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
+<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="margin-left:-100px; columns:2; height:100px; width:200px; column-gap:0; column-fill:auto; background:red;">
+  <div style="height:100px; background:white;"></div>
+  <fieldset style="columns:2; column-gap:0; border:none; margin:0; padding:0; background:red;">
+    <div style="height:200px; background:green;"></div>
+  </fieldset>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-float.html b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-float.html
new file mode 100644
index 00000000000..940d3940802
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-float.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
+<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="margin-left:-100px; columns:2; height:200px; width:200px; column-gap:0; column-fill:auto;">
+  <div style="height:200px;"></div>
+  <div style="float:left; columns:2; width:100%; column-gap:0; background:red;">
+    <div style="height:200px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-legend.html b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-legend.html
new file mode 100644
index 00000000000..8bf04490f26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-legend.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
+<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="margin-left:-100px; columns:2; height:100px; width:200px; column-gap:0; column-fill:auto; background:red;">
+  <div style="height:100px; background:white;"></div>
+  <fieldset style="border:none; margin:0; padding:0; background:red;">
+    <legend style="columns:2; column-gap:0; margin:0; padding:0; width:100%;">
+      <div style="height:200px; background:green;"></div>
+    </legend>
+  </fieldset>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html
new file mode 100644
index 00000000000..a911be11af5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: div inline size with indefinite percentage</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="width: 100px;">
+  <div style="background: green; height: 100%; aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
index c2d0294f9fd..2018acbbe77 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
@@ -7,7 +7,7 @@
 var xWidth = xHeight = 10;
 
 function checkImageData(expectedColorSettings, imageData) {
-  var imageDataColorSettings = imageData.getColorSettings();
+  var imageDataColorSettings = imageData.getSettings();
   assert_equals(expectedColorSettings.colorSpace, imageDataColorSettings.colorSpace);
   assert_equals(expectedColorSettings.storageFormat, imageDataColorSettings.storageFormat);
   assert_equals(imageData.data.length, 4 * xWidth * xHeight);
@@ -24,7 +24,7 @@ function runTestCreateImageData(canvasColorSettings, imageSetting) {
   checkImageData(imageSetting, imageData);
 
   imageData = ctx.createImageData(helperImageData);
-  checkImageData(imageData.getColorSettings(), imageData);
+  checkImageData(imageData.getSettings(), imageData);
 }
 
 var testScenariosCreateImageData = [
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
index ff7c1437b50..49078bab672 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
@@ -39,12 +39,12 @@ function testPixels(actualData, expectedPixels, tolerance)
   }
 }
 
-function checkImageDataColorSettings(expectColorSetting, imageData) {
-  var imageDataColorSettings = imageData.getColorSettings();
+function checkImageDataSettings(expectColorSetting, imageData) {
+  var imageDataSettings = imageData.getSettings();
   assert_equals(expectColorSetting.colorSpace,
-                imageDataColorSettings.colorSpace);
+                imageDataSettings.colorSpace);
   assert_equals(expectColorSetting.storageFormat,
-                imageDataColorSettings.storageFormat);
+                imageDataSettings.storageFormat);
 }
 
 function checkImageDataColorValues(canvasColorSettings, imageData, isBlank = '',
@@ -113,7 +113,7 @@ function PreparePredefinedImageDataObjects() {
 }
 
 PreparePredefinedImageDataObjects();
-var imageDataColorSettingsSet = [
+var imageDataSettingsSet = [
   {name: "SRGB U8", colorSettings: {colorSpace: "srgb", storageFormat: "uint8"},
       imageData: srgbImageDataU8},
   {name: "e-SRGB U16", colorSettings: {colorSpace: "srgb",
@@ -131,7 +131,7 @@ function runTestCreateImageDataWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   var imageData = ctx.createImageData(xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(imageSetting, imageData);
+  checkImageDataSettings(imageSetting, imageData);
 }
 
 var testScenariosCreateImageDataWH = [];
@@ -162,7 +162,7 @@ function runTestGetImageDataXYWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   var imageData = ctx.getImageData(0, 0, xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(imageSetting, imageData);
+  checkImageDataSettings(imageSetting, imageData);
   checkImageDataColorValues(canvasColorSettings, imageData);
 }
 
@@ -199,20 +199,20 @@ function runTestPutImageDataDxDy(canvasColorSettings, imageData, imageSetting) {
        pixelFormat: canvasColorSettings.pixelFormat});
   ctx.putImageData(imageData, xWidth/2, xHeight/2);
   var ctxImageData = ctx.getImageData(xWidth/2, xHeight/2, xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(imageSetting, ctxImageData);
+  checkImageDataSettings(imageSetting, ctxImageData);
   checkImageDataColorValues(canvasColorSettings, ctxImageData, 'noBlank',
                             xWidth, xHeight, 'isWCG_U8toSRGB_U8');
 }
 
 var testScenariosPutImageDataDxDy = [];
 for (var i = 0; i < canvasColorSettingsSet.length; i++) {
-  for (var j = 0; j < imageDataColorSettingsSet.length; j++) {
+  for (var j = 0; j < imageDataSettingsSet.length; j++) {
     var message = "Test putImageData(imagedata, dx, dy): " +
                 canvasColorSettingsSet[i].name + " canvas, " +
-                imageDataColorSettingsSet[j].name + " ImageData";
+                imageDataSettingsSet[j].name + " ImageData";
     testScenariosPutImageDataDxDy.
         push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].imageData,
+              imageDataSettingsSet[j].imageData,
               canvasColorSettingsSet[i].imageSetting]);
   }
 }
@@ -242,19 +242,19 @@ function runTestCreateImageDataFromImageData(canvasColorSettings, imageData) {
       {colorSpace: canvasColorSettings.colorSpace,
        pixelFormat: canvasColorSettings.pixelFormat});
   var ctxImageData = ctx.createImageData(imageData);
-  checkImageDataColorSettings(imageData.getColorSettings(), ctxImageData);
+  checkImageDataSettings(imageData.getSettings(), ctxImageData);
   checkImageDataColorValues(canvasColorSettings, ctxImageData, 'isBlank');
 }
 
 var testScenariosCreateImageDataFromImageData = [];
 for (var i = 0; i < canvasColorSettingsSet.length; i++) {
-  for (var j = 0; j < imageDataColorSettingsSet.length; j++) {
+  for (var j = 0; j < imageDataSettingsSet.length; j++) {
     var message = "Test createImageData(imagedata): " +
                 canvasColorSettingsSet[i].name + " canvas, " +
-                imageDataColorSettingsSet[j].name + " ImageData";
+                imageDataSettingsSet[j].name + " ImageData";
     testScenariosCreateImageDataFromImageData.
         push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].imageData,
+              imageDataSettingsSet[j].imageData,
               canvasColorSettingsSet[i].imageSetting]);
   }
 }
@@ -272,21 +272,21 @@ runTestCreateImageDataFromImageDataTests();
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// *ImageData ctx.createImageData(width, height, imageDataColorSettings);
+// *ImageData ctx.createImageData(width, height, imageDataSettings);
 // No color conversion to the color settings of the canvas. Blank ImageData
-// should be created based on imageDataColorSettings.
+// should be created based on imageDataSettings.
 
-function runTestCreateImageDataWHC(canvasColorSettings, imageDataColorSettings) {
+function runTestCreateImageDataWHC(canvasColorSettings, imageDataSettings) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   width = height = 3;
-  var imageData = ctx.createImageData(width, height, imageDataColorSettings);
-  var colorSettings = imageData.getColorSettings();
+  var imageData = ctx.createImageData(width, height, imageDataSettings);
+  var colorSettings = imageData.getSettings();
   assert_equals(colorSettings.colorSpace,
-                imageDataColorSettings.colorSpace,
+                imageDataSettings.colorSpace,
                 "colorSpace should match");
   assert_equals(colorSettings.storageFormat,
-                imageDataColorSettings.storageFormat,
+                imageDataSettings.storageFormat,
                 "storageFormat should match");
   var blankData = new Array(4 * width * height).fill(0);
   assert_array_equals(imageData.data, blankData,
@@ -295,13 +295,13 @@ function runTestCreateImageDataWHC(canvasColorSettings, imageDataColorSettings)
 
 var testScenariosCreateImageDataWHC = [];
 for (var i = 0; i < canvasColorSettingsSet.length; i++) {
-  for (var j = 0; j < imageDataColorSettingsSet.length; j++) {
-    message = "Test createImageData(width, height, imageDataColorSettings): " +
+  for (var j = 0; j < imageDataSettingsSet.length; j++) {
+    message = "Test createImageData(width, height, imageDataSettings): " +
               canvasColorSettingsSet[i].name + " canvas, " +
-              imageDataColorSettingsSet[j].name + " ImageData";
+              imageDataSettingsSet[j].name + " ImageData";
     testScenariosCreateImageDataWHC.
         push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].colorSettings]);
+              imageDataSettingsSet[j].colorSettings]);
   }
 }
 
@@ -318,21 +318,21 @@ runTestCreateImageDataWHCTests();
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// *ImageData ctx.createImageData(data, width, height, imageDataColorSettings);
+// *ImageData ctx.createImageData(data, width, height, imageDataSettings);
 // No color conversion to the color settings of the canvas. ImageData is created
 // from param "data" with proper storage format and is tagged with the
-// CanvasColorSpace which is given in imageDataColorSettings.
+// CanvasColorSpace which is given in imageDataSettings.
 
 function runTestCreateImageDataDWHC(canvasColorSettings, imageData) {
   var data = imageData.data;
   width = xWidth;
   height = xHeight;
-  var colorSettings = imageData.getColorSettings();
+  var colorSettings = imageData.getSettings();
 
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   var newImageData = ctx.createImageData(data, width, height, colorSettings);
-  var newColorSettings = newImageData.getColorSettings();
+  var newColorSettings = newImageData.getSettings();
   assert_equals(newColorSettings.colorSpace,
                 colorSettings.colorSpace,
                 "colorSpace should match");
diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html b/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html
new file mode 100644
index 00000000000..26f0bbbd09f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Test: focus - document has system focus</title>
+<link rel="help" href="https://html.spec.whatwg.org/#has-focus-steps">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<input id="input">
+<script>
+
+promise_test(async t => {
+  await new Promise(r => window.onload = r);
+  // This test requires the document to have focus as a starting condition.
+  // Whether a newly loaded page receives focus or not, seems to be somewhat
+  // browser-dependent and situation-dependent. For instance, Firefox appears to
+  // focus the page immediately if the page was loaded with the refresh button,
+  // but not if it was loaded from pressing ENTER in the URL bar. To ensure a
+  // reliable starting condition for this test, we give an extra push for focus.
+  if (!document.hasFocus()) {
+    const input = document.getElementById("input");
+    input.focus();
+    await new Promise(r => input.onfocus = r);
+  }
+  assert_true(document.hasFocus(), "Document has focus as starting condition.");
+
+  let gotBlur = false;
+  window.onblur = () => gotBlur = true;
+  const popup = window.open("support/popup.html", "otherwindow", "resizable");
+  assert_not_equals(popup, null, "Test requires popup be opened");
+  t.add_cleanup(() => popup.close());
+  const msg = await new Promise(r => window.onmessage = ({data}) => r(data));
+  assert_equals(msg, "focus = true",
+                "Test requires popups be focused (may require harness flags)");
+  assert_true(gotBlur, "Document received blur event when popup opened");
+  assert_false(document.hasFocus(), "Document lost focus when popup opened");
+
+  const p = new Promise(r => window.onfocus = r);
+  popup.close();
+  await p;
+  assert_true(true, "Document received focus event when popup closed");
+  assert_true(document.hasFocus(), "Document regained focus when popup closed");
+}, "Top-level document receives blur/focus events and loses system focus " +
+   "during opening/closing of a popup");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/popup.html b/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/popup.html
new file mode 100644
index 00000000000..3a4419105aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/popup.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+Popup <input id="input">
+<script>
+window.onload = async () => {
+  try {
+    if (!document.hasFocus()) {
+      const input = document.getElementById("input");
+      input.focus();
+      await new Promise(r => input.onfocus = r);
+    }
+    opener.postMessage(`focus = ${document.hasFocus()}`, "*");
+  } catch(e) {
+    opener.postMessage(`${e.name}: $(e.message)`, "*");
+  }
+};
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur.html
new file mode 100644
index 00000000000..d4090172812
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+<link rel="help" href="http://crbug.com/1157510">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<!-- This behavior is not explicitly specified. -->
+
+<input type=checkbox id=checkbox checked>
+<input type=radio id=radio checked>
+
+<script>
+promise_test(async () => {
+  checkbox.focus();
+
+  // Hold spacebar down
+  await (new test_driver.Actions()).keyDown('\uE00D').send();
+  assert_equals(document.querySelector(':active'), checkbox,
+    'Checkboxes should be :active while the spacebar is pressed down.');
+
+  // Press tab
+  await (new test_driver.Actions()).keyDown('\uE004').keyUp('\uE004').send();
+  assert_equals(document.querySelector(':active'), null,
+    'Checkboxes should not be :active after tab is used to change focus.');
+
+  // Release spacebar
+  await (new test_driver.Actions()).keyUp('\uE00D').send();
+}, 'Checkboxes should clear :active when the user tabs away from them while holding spacebar.');
+
+promise_test(async () => {
+  radio.focus();
+
+  // Hold spacebar down
+  await (new test_driver.Actions()).keyDown('\uE00D').send();
+  assert_equals(document.querySelector(':active'), radio,
+    'Radios should be :active while the spacebar is pressed down.');
+
+  // Press tab
+  await (new test_driver.Actions()).keyDown('\uE004').keyUp('\uE004').send();
+  assert_equals(document.querySelector(':active'), null,
+    'Radios should not be :active after tab is used to change focus.');
+
+  // Release spacebar
+  await (new test_driver.Actions()).keyUp('\uE00D').send();
+}, 'Radios should clear :active when the user tabs away from them while holding spacebar.');
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl b/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
index 2878af4b66c..8681a5ad428 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
@@ -33,12 +33,12 @@ dictionary MediaRecorderOptions {
   unsigned long audioBitsPerSecond;
   unsigned long videoBitsPerSecond;
   unsigned long bitsPerSecond;
-  BitrateMode audioBitrateMode = "vbr";
+  BitrateMode audioBitrateMode = "variable";
 };
 
 enum BitrateMode {
-  "cbr",
-  "vbr"
+  "constant",
+  "variable"
 };
 
 enum RecordingState {
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl b/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
index 4334d96793c..e89210cd569 100644
--- a/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
@@ -7,46 +7,51 @@ partial interface XRInputSource {
    readonly attribute XRHand? hand;
 };
 
-[Exposed=Window]
-interface XRHand {
-    iterable<XRJointSpace>;
-    readonly attribute unsigned long length;
-    getter XRJointSpace joint(unsigned long jointIndex);
+enum XRHandJoint {
+  "wrist",
 
-    const unsigned long WRIST = 0;
+  "thumb-metacarpal",
+  "thumb-phalanx-proximal",
+  "thumb-phalanx-distal",
+  "thumb-tip",
 
-    const unsigned long THUMB_METACARPAL = 1;
-    const unsigned long THUMB_PHALANX_PROXIMAL = 2;
-    const unsigned long THUMB_PHALANX_DISTAL = 3;
-    const unsigned long THUMB_PHALANX_TIP = 4;
+  "index-finger-metacarpal",
+  "index-finger-phalanx-proximal",
+  "index-finger-phalanx-intermediate",
+  "index-finger-phalanx-distal",
+  "index-finger-tip",
 
-    const unsigned long INDEX_METACARPAL = 5;
-    const unsigned long INDEX_PHALANX_PROXIMAL = 6;
-    const unsigned long INDEX_PHALANX_INTERMEDIATE = 7;
-    const unsigned long INDEX_PHALANX_DISTAL = 8;
-    const unsigned long INDEX_PHALANX_TIP = 9;
+  "middle-finger-metacarpal",
+  "middle-finger-phalanx-proximal",
+  "middle-finger-phalanx-intermediate",
+  "middle-finger-phalanx-distal",
+  "middle-finger-tip",
 
-    const unsigned long MIDDLE_METACARPAL = 10;
-    const unsigned long MIDDLE_PHALANX_PROXIMAL = 11;
-    const unsigned long MIDDLE_PHALANX_INTERMEDIATE = 12;
-    const unsigned long MIDDLE_PHALANX_DISTAL = 13;
-    const unsigned long MIDDLE_PHALANX_TIP = 14;
+  "ring-finger-metacarpal",
+  "ring-finger-phalanx-proximal",
+  "ring-finger-phalanx-intermediate",
+  "ring-finger-phalanx-distal",
+  "ring-finger-tip",
 
-    const unsigned long RING_METACARPAL = 15;
-    const unsigned long RING_PHALANX_PROXIMAL = 16;
-    const unsigned long RING_PHALANX_INTERMEDIATE = 17;
-    const unsigned long RING_PHALANX_DISTAL = 18;
-    const unsigned long RING_PHALANX_TIP = 19;
-
-    const unsigned long LITTLE_METACARPAL = 20;
-    const unsigned long LITTLE_PHALANX_PROXIMAL = 21;
-    const unsigned long LITTLE_PHALANX_INTERMEDIATE = 22;
-    const unsigned long LITTLE_PHALANX_DISTAL = 23;
-    const unsigned long LITTLE_PHALANX_TIP = 24;
+  "pinky-finger-metacarpal",
+  "pinky-finger-phalanx-proximal",
+  "pinky-finger-phalanx-intermediate",
+  "pinky-finger-phalanx-distal",
+  "pinky-finger-tip"
 };
 
 [Exposed=Window]
-interface XRJointSpace: XRSpace {};
+interface XRHand {
+    iterable<XRHandJoint, XRJointSpace>;
+
+    readonly attribute unsigned long size;
+    XRJointSpace get(XRHandJoint key);
+};
+
+[Exposed=Window]
+interface XRJointSpace: XRSpace {
+  readonly attribute XRHandJoint jointName;
+};
 
 partial interface XRFrame {
     XRJointPose? getJointPose(XRJointSpace joint, XRSpace baseSpace);
diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html
index af60412a87f..6f7af1a8871 100644
--- a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html
+++ b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html
@@ -1,23 +1,12 @@
 <!DOCTYPE html>
 <title>Layout Instability: off-screen content-visibility:auto content</title>
 <link rel="help" href="https://wicg.github.io/layout-instability/" />
-<style>
-  #auto {
-    content-visibility: auto;
-    contain-intrinsic-size: 1px;
-    width: 100px;
-  }
-</style>
-<div class=auto>
-  <div style="width: 100px; height: 100px"></div>
-</div>
-<div class=auto style="position: relative; top: 100000px">
-  <div style="width: 100px; height: 100px"></div>
-</div>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/util.js"></script>
 <script>
+// These scripts need to be before the contents because we need to ensure no
+// layout shifts during page load.
 promise_test(async () => {
   const watcher = new ScoreWatcher;
 
@@ -29,10 +18,30 @@ promise_test(async () => {
 
   assert_equals(watcher.score, 0);
 
+  // This should report a layout shift as target is now visible.
+  target.style.top = '100100px';
+
+  await watcher.promise;
+  const expectedScore = computeExpectedScore(100 * 100, 100);
+  assert_equals(watcher.score, expectedScore);
+
+  // No new layout shift should be reported when target is scrolled out of screeen.
   window.scrollTo(0, 0);
   await waitForAnimationFrames(2);
 
-  assert_equals(watcher.score, 0);
+  assert_equals(watcher.score, expectedScore);
 }, 'off-screen content-visibility:auto');
-
 </script>
+<style>
+  .auto {
+    content-visibility: auto;
+    contain-intrinsic-size: 1px;
+    width: 100px;
+  }
+</style>
+<div class=auto>
+  <div style="width: 100px; height: 100px"></div>
+</div>
+<div id="target" class=auto style="position: relative; top: 100000px">
+  <div style="width: 100px; height: 100px"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html
index 4d9d06aa537..6a430806008 100644
--- a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html
+++ b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html
@@ -1,6 +1,20 @@
 <!DOCTYPE html>
 <title>Layout Instability: on-screen content-visibility:auto content</title>
 <link rel="help" href="https://wicg.github.io/layout-instability/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+// These scripts need to be before the contents because we need to ensure no
+// layout shifts during page load.
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+}, 'on-screen content-visibility:auto');
+</script>
 <style>
   #target {
     content-visibility: auto;
@@ -11,16 +25,3 @@
 <div id=target>
   <div style="width: 100px; height: 100px"></div>
 </div>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/util.js"></script>
-<script>
-promise_test(async () => {
-  const watcher = new ScoreWatcher;
-
-  // Wait for the initial render to complete.
-  await waitForAnimationFrames(2);
-  assert_equals(watcher.score, 0);
-}, 'on-screen content-visibility:auto');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html
index b8de7f52e32..d6926254457 100644
--- a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html
+++ b/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html
@@ -1,22 +1,12 @@
 <!DOCTYPE html>
 <title>Layout Instability: resizing content-visibility:auto content</title>
 <link rel="help" href="https://wicg.github.io/layout-instability/" />
-<style>
-      .auto {
-        content-visibility: auto;
-        contain-intrinsic-size: 10px 3000px;
-        width: 100px;
-      }
-      .contained {
-        height: 100px;
-      }
-    </style>
-    <div class=a><div class=contained></div></div>
-    <div class=a ><div class=contained></div></div>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/util.js"></script>
 <script>
+// These scripts need to be before the contents because we need to ensure no
+// layout shifts during page load.
 promise_test(async () => {
   const watcher = new ScoreWatcher;
 
@@ -25,5 +15,16 @@ promise_test(async () => {
 
   assert_equals(watcher.score, 0);
 }, 'off-screen content-visibility:auto');
-
 </script>
+<style>
+  .auto {
+    content-visibility: auto;
+    contain-intrinsic-size: 10px 3000px;
+    width: 100px;
+  }
+  .contained {
+    height: 100px;
+  }
+</style>
+<div class=auto><div class=contained></div></div>
+<div class=auto><div class=contained></div></div>
diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html b/tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html
index 939b1a21223..db087fe0673 100644
--- a/tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html
+++ b/tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html
@@ -1,6 +1,20 @@
 <!DOCTYPE html>
 <title>Layout Instability: content-visibility:hidden content</title>
 <link rel="help" href="https://wicg.github.io/layout-instability/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+// These scripts need to be before the contents because we need to ensure no
+// layout shifts during page load.
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+}, 'on-screen content-visibility:auto');
+</script>
 <style>
   #target {
     content-visibility: hidden;
@@ -11,16 +25,3 @@
 <div id=target>
   <div style="width: 100px; height: 100px"></div>
 </div>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/util.js"></script>
-<script>
-promise_test(async () => {
-  const watcher = new ScoreWatcher;
-
-  // Wait for the initial render to complete.
-  await waitForAnimationFrames(2);
-  assert_equals(watcher.score, 0);
-}, 'on-screen content-visibility:auto');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/opacity-zero-layout-and-visible.html b/tests/wpt/web-platform-tests/layout-instability/opacity-zero-layout-and-visible.html
new file mode 100644
index 00000000000..af81ff2a625
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/opacity-zero-layout-and-visible.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Layout Instability: opacity:0</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<div id="target" style="position: absolute; top: 0; width: 200px; height: 200px; opacity: 0"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  // Shift target, for which no shift should be reported because it's not visible.
+  target.style.top = '200px';
+  target.style.opacity = 0.9;
+
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+
+  // Shift again, for which shift should be reported.
+  target.style.top = '300px';
+
+  await watcher.promise;
+  const expectedScore = computeExpectedScore(200 * (200 + 100), 100);
+  assert_equals(watcher.score, expectedScore);
+}, 'opacity:0');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/opacity-zero.html b/tests/wpt/web-platform-tests/layout-instability/opacity-zero.html
new file mode 100644
index 00000000000..e6ce1f0d081
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/opacity-zero.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Layout Instability: opacity:0</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<div id="target" style="position: absolute; top: 0; width: 400px; height: 400px; opacity: 0">
+  <div id="child" style="position: relative; top: 0; width: 200px; height: 200px; opacity: 0.5"></div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  // Shift target, for which no shift should be reported because it's not visible.
+  target.style.top = '200px';
+
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+
+  // Shift child, for which no shift should be reported, either.
+  child.style.top = '100px';
+
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+}, 'opacity:0');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/visibility-hidden-layout-and-visible.html b/tests/wpt/web-platform-tests/layout-instability/visibility-hidden-layout-and-visible.html
new file mode 100644
index 00000000000..3fea6bb27a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/visibility-hidden-layout-and-visible.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>Layout Instability: visibility:hidden change with layout</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<div id="target" style="position: absolute; top: 0; width: 200px; height: 200px; visibility: hidden"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  // Shift target, for which no shift should be reported because it's hidden.
+  target.style.top = '200px';
+  target.style.visibility = 'visible';
+
+  await waitForAnimationFrames(2);
+  // No shift should be reported.
+  assert_equals(watcher.score, 0);
+
+  // Shift again, for which shift should be reported.
+  target.style.top = '300px';
+
+  await watcher.promise;
+  const expectedScore = computeExpectedScore(200 * (200 + 100), 100);
+  assert_equals(watcher.score, expectedScore);
+
+}, 'visibility:hidden change with layout');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
index b7f8dabc0cd..e6df2098d47 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
@@ -45,8 +45,11 @@
 [
   {
     srcDocPolicy: ``,
-    expected: undefined  // Because the URL of <iframe src="javascript:..."> is about:blank,
-                         // the referrer should be no referrer.
+    expected: location.href  // Executing javascript does not commit a new document
+                             // and does not change the document url.
+                             // Since the algorithm for computing the referrer in a srcdoc
+                             // iframe defers recursively to the parent, the expected
+                             // referrer should be the full url of the main document.
   },
   {
     srcDocPolicy: `<meta name="referrer" content="no-referrer">`,
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/meta-tag-in-svg-image.html b/tests/wpt/web-platform-tests/referrer-policy/generic/meta-tag-in-svg-image.html
new file mode 100644
index 00000000000..5bdc2c1abfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/meta-tag-in-svg-image.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Referrer Policy: Meta tag in svg image loaded via img should not change referrer policy</title>
+    <meta name="referrer" content="origin"/>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- Common global functions for referrer-policy tests. -->
+    <script src="/common/security-features/resources/common.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      async_test(function(t) {
+        var img = document.createElement("img");
+        img.onload = function() {
+          var urlPath = '/common/security-features/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+          return requestViaImage(urlPath, null, 'always')
+            .then(t.step_func(function(message) {
+              assert_equals(message.referrer, self.origin + '/');
+            }))
+            .finally(function() { t.done(); });
+        };
+        img.onerror = t.step_func_done(function() {
+          assert_unreached("img should load");
+        });
+        img.src = "./resources/img-with-referrer-policy.svg";
+        document.body.appendChild(img);
+      }, "Meta tag in SVG image loaded via img should be ignored");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/resources/img-with-referrer-policy.svg b/tests/wpt/web-platform-tests/referrer-policy/generic/resources/img-with-referrer-policy.svg
new file mode 100644
index 00000000000..d54232d7bbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/resources/img-with-referrer-policy.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100%" height="100%" version="1.1"
+xmlns="http://www.w3.org/2000/svg">
+  <meta xmlns="http://www.w3.org/1999/xhtml" name="referrer" content="unsafe-url"/>
+  <circle cx="10" cy="10" r="10" stroke="black" stroke-width="1" fill="red" />
+</svg>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/type.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/global/type.tentative.any.js
new file mode 100644
index 00000000000..318b1ac578c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/global/type.tentative.any.js
@@ -0,0 +1,64 @@
+// META: global=window,dedicatedworker,jsshell
+// META: script=/wasm/jsapi/assertions.js
+
+function assert_type(argument) {
+    const myglobal = new WebAssembly.Global(argument);
+
+    assert_equals(myglobal.type.value, argument.value);
+    assert_equals(myglobal.type.mutable, argument.mutable);
+}
+
+test(() => {
+    assert_type({ "value": "i32", "mutable": true});
+}, "i32, mutable");
+
+test(() => {
+    assert_type({ "value": "i32", "mutable": false});
+}, "i32, immutable");
+
+test(() => {
+    assert_type({ "value": "i64", "mutable": true});
+}, "i64, mutable");
+
+test(() => {
+    assert_type({ "value": "i64", "mutable": false});
+}, "i64, immutable");
+
+test(() => {
+    assert_type({ "value": "f32", "mutable": true});
+}, "f32, mutable");
+
+test(() => {
+    assert_type({ "value": "f32", "mutable": false});
+}, "f32, immutable");
+
+test(() => {
+    assert_type({ "value": "f64", "mutable": true});
+}, "f64, mutable");
+
+test(() => {
+    assert_type({ "value": "f64", "mutable": false});
+}, "f64, immutable");
+
+test(() => {
+    assert_type({"value": "externref", "mutable": true})
+}, "anyref, mutable")
+
+test(() => {
+    assert_type({"value": "externref", "mutable": false})
+}, "anyref, immutable")
+
+test(() => {
+    assert_type({"value": "funcref", "mutable": true})
+}, "funcref, mutable")
+
+test(() => {
+    assert_type({"value": "funcref", "mutable": false})
+}, "funcref, immutable")
+
+test(() => {
+    const myglobal = new WebAssembly.Global({"value": "i32", "mutable": true});
+    const propertyNames = Object.getOwnPropertyNames(myglobal.type);
+    assert_equals(propertyNames[0], "mutable");
+    assert_equals(propertyNames[1], "value");
+}, "key ordering");
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/type.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/memory/type.tentative.any.js
new file mode 100644
index 00000000000..efe9e2a37de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/memory/type.tentative.any.js
@@ -0,0 +1,36 @@
+// META: global=window,dedicatedworker,jsshell
+// META: script=/wasm/jsapi/assertions.js
+
+function assert_type(argument) {
+    const memory = new WebAssembly.Memory(argument);
+
+    assert_equals(memory.type.minimum, argument.minimum);
+    assert_equals(memory.type.maximum, argument.maximum);
+    if (argument.shared !== undefined) {
+        assert_equals(memory.type.shared, argument.shared);
+    }
+}
+
+test(() => {
+    assert_type({ "minimum": 0 });
+}, "Zero initial, no maximum");
+
+test(() => {
+    assert_type({ "minimum": 5 });
+}, "Non-zero initial, no maximum");
+
+test(() => {
+    assert_type({ "minimum": 0, "maximum": 0 });
+}, "Zero maximum");
+
+test(() => {
+    assert_type({ "minimum": 0, "maximum": 5 });
+}, "None-zero maximum");
+
+test(() => {
+    assert_type({ "minimum": 0, "maximum": 10,  "shared": false});
+}, "non-shared memory");
+
+test(() => {
+    assert_type({ "minimum": 0, "maximum": 10, "shared": true});
+}, "shared memory");
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html
index 96b99a2373b..78c1ec6dc2d 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html
@@ -84,86 +84,80 @@
         }, prefix + leastPositiveDoubleFloat).notThrow();
       }
 
-      audit.define('min-distance', (task, should) => {
+      audit.define('min-distance', async (task, should) => {
         // Test clamping of panner distance to refDistance for all of the
         // distance models.  The actual distance is arbitrary as long as it's
         // less than refDistance.  We test default and non-default values for
         // the panner's refDistance and maxDistance.
         // correctly.
-        Promise
-            .all([
-              runTest(should, {
-                distance: 0.01,
-                distanceModel: 'linear',
-              }),
-              runTest(should, {
-                distance: 0.01,
-                distanceModel: 'exponential',
-              }),
-              runTest(should, {
-                distance: 0.01,
-                distanceModel: 'inverse',
-              }),
-              runTest(should, {
-                distance: 2,
-                distanceModel: 'linear',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-              runTest(should, {
-                distance: 2,
-                distanceModel: 'exponential',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-              runTest(should, {
-                distance: 2,
-                distanceModel: 'inverse',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-            ])
-            .then(() => task.done());
+        await runTest(should, {
+          distance: 0.01,
+          distanceModel: 'linear',
+        });
+        await runTest(should, {
+          distance: 0.01,
+          distanceModel: 'exponential',
+        });
+        await runTest(should, {
+          distance: 0.01,
+          distanceModel: 'inverse',
+        });
+        await runTest(should, {
+          distance: 2,
+          distanceModel: 'linear',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        await runTest(should, {
+          distance: 2,
+          distanceModel: 'exponential',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        await runTest(should, {
+          distance: 2,
+          distanceModel: 'inverse',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        task.done();
       });
 
-      audit.define('max-distance', (task, should) => {
+      audit.define('max-distance', async (task, should) => {
         // Like the "min-distance" task, but for clamping to the max
         // distance. The actual distance is again arbitrary as long as it is
         // greater than maxDistance.
-        Promise
-            .all([
-              runTest(should, {
-                distance: 20000,
-                distanceModel: 'linear',
-              }),
-              runTest(should, {
-                distance: 21000,
-                distanceModel: 'exponential',
-              }),
-              runTest(should, {
-                distance: 23000,
-                distanceModel: 'inverse',
-              }),
-              runTest(should, {
-                distance: 5000,
-                distanceModel: 'linear',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-              runTest(should, {
-                distance: 5000,
-                distanceModel: 'exponential',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-              runTest(should, {
-                distance: 5000,
-                distanceModel: 'inverse',
-                maxDistance: 1000,
-                refDistance: 10,
-              }),
-            ])
-            .then(() => task.done());
+        await runTest(should, {
+          distance: 20000,
+          distanceModel: 'linear',
+        });
+        await runTest(should, {
+          distance: 21000,
+          distanceModel: 'exponential',
+        });
+        await runTest(should, {
+          distance: 23000,
+          distanceModel: 'inverse',
+        });
+        await runTest(should, {
+          distance: 5000,
+          distanceModel: 'linear',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        await runTest(should, {
+          distance: 5000,
+          distanceModel: 'exponential',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        await runTest(should, {
+          distance: 5000,
+          distanceModel: 'inverse',
+          maxDistance: 1000,
+          refDistance: 10,
+        });
+        task.done();
       });
 
       function runTest(should, options) {
diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js b/tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js
index bbaf66d3383..065cc6e6f17 100644
--- a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js
+++ b/tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js
@@ -22,7 +22,6 @@ var unexpected = [
   // https://streams.spec.whatwg.org/
   "ReadableStreamDefaultReader",
   "ReadableStreamBYOBReader",
-  "ReadableStreamDefaultController",
   "ReadableByteStreamController",
   "WritableStreamDefaultWriter",
   "WritableStreamDefaultController",
diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js b/tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js
index ea96197ce19..2cbb4b54256 100644
--- a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js
+++ b/tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js
@@ -20,7 +20,6 @@ var unexpected = [
   // https://streams.spec.whatwg.org/
   "ReadableStreamDefaultReader",
   "ReadableStreamBYOBReader",
-  "ReadableStreamDefaultController",
   "ReadableByteStreamController",
   "WritableStreamDefaultWriter",
   "WritableStreamDefaultController",
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 48356327d0e..9a0698ac4f5 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -260,3 +260,9 @@
   [WebGL test #44: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,0]
     expected: FAIL
 
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,0,255]
+    expected: FAIL
+
+  [WebGL test #43: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,255,0]
+    expected: FAIL
+