diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index 7248ba77bd5..00000000000
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     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/css-color/a98rgb-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-001.html.ini
new file mode 100644
index 00000000000..c0412287e8f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-001.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-002.html.ini
new file mode 100644
index 00000000000..3cb975053cc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-002.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-003.html.ini
new file mode 100644
index 00000000000..efaef3ffbca
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-003.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-004.html.ini
new file mode 100644
index 00000000000..ed53efef804
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/a98rgb-004.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/lab-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/lab-008.html.ini
new file mode 100644
index 00000000000..94a9d48106f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/lab-008.html.ini
@@ -0,0 +1,2 @@
+[lab-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/lch-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/lch-008.html.ini
new file mode 100644
index 00000000000..f5f3792d845
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/lch-008.html.ini
@@ -0,0 +1,2 @@
+[lch-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-001.html.ini
new file mode 100644
index 00000000000..82ccdc78354
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-001.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-002.html.ini
new file mode 100644
index 00000000000..d802525d8d2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-002.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-003.html.ini
new file mode 100644
index 00000000000..a0cc754b85b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-003.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-004.html.ini
new file mode 100644
index 00000000000..df7b8102e59
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-004.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-005.html.ini
new file mode 100644
index 00000000000..425c447810e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/prophoto-rgb-005.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rec2020-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-001.html.ini
new file mode 100644
index 00000000000..e77d02899ca
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-001.html.ini
@@ -0,0 +1,2 @@
+[rec2020-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rec2020-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-002.html.ini
new file mode 100644
index 00000000000..12fbdca64f5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-002.html.ini
@@ -0,0 +1,2 @@
+[rec2020-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rec2020-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-003.html.ini
new file mode 100644
index 00000000000..c2b6f1f00f1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-003.html.ini
@@ -0,0 +1,2 @@
+[rec2020-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rec2020-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-004.html.ini
new file mode 100644
index 00000000000..4b634f80462
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-004.html.ini
@@ -0,0 +1,2 @@
+[rec2020-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/rec2020-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-005.html.ini
new file mode 100644
index 00000000000..10efd625a30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/rec2020-005.html.ini
@@ -0,0 +1,2 @@
+[rec2020-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 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/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index abf874274b6..067f9e010e0 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,21 +312,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 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/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_3.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_3.html.ini
index 385376c7321..51f8272a6de 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_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d81ae5a4949..3538891dae8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,14 +4,14 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    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_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 0407f0cc2b7..9eb581fcf1f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..7a36937927c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index ecc7be8f573..6ce3405d806 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,30 +2,18 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -38,12 +26,6 @@
   [textarea: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -53,18 +35,51 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index 7248ba77bd5..00000000000
--- a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index a31f608dd42..9670ef33e50 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -14740,6 +14740,162 @@
      ]
     }
    },
+   "file-system-access": {
+    "local_FileSystemBaseHandle-IndexedDB-manual.https.html": [
+     "211b190aad36db7cf98acf6a5bb25856f67c9d5e",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-isSameEntry-manual.https.html": [
+     "d2ddc2dbdccca95dcb0f1cf2820714c14961f4c3",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html": [
+     "f395b0b4c17e18ac36e835c0c39576f3fe30525c",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-Error-manual.https.html": [
+     "67206e350966c9b75432bb095bf091b8d260bfbd",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html": [
+     "35f23d8387d8b771e7e1e93729b59107e773f2f0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html": [
+     "922cbf556a13465898589fddfab05bda345d1dd0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html": [
+     "22ef3ba37d36a435f2aae874054e156e8bb67520",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-frames-manual.https.html": [
+     "8eb9082708242947e29404df422da2a2b6753c98",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-windows-manual.https.html": [
+     "2137ea368c94411278c78d6d993f0e305e3b6131",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemBaseHandle-postMessage-workers-manual.https.html": [
+     "619a37cc972166cc691feccb24109073fa979f1c",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html": [
+     "63a88538e8b915e80d334949ca2b2b619d3e9654",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemDirectoryHandle-getFileHandle-manual.https.html": [
+     "d16771bf450df6237bbd55b440b4789da2acf6e7",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemDirectoryHandle-iteration-manual.https.html": [
+     "495ea5e0a095a4e3dab424e250d45797c6b5e955",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemDirectoryHandle-removeEntry-manual.https.html": [
+     "765492e1e861779567df9f255628eb0f5ffb83df",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemDirectoryHandle-resolve-manual.https.html": [
+     "0d539abb54e08f8bfbb06bcc5010cda3a53b83da",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemFileHandle-getFile-manual.https.html": [
+     "9d8dede88949053c43bc3b15f28b335d9bb93198",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemWritableFileStream-manual.https.html": [
+     "2db242c708d029893cea4294af15f5b751716fe1",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemWritableFileStream-piped-manual.https.html": [
+     "296f75412e1c8e631e49e3b7a8320c60c718bc05",
+     [
+      null,
+      {}
+     ]
+    ],
+    "local_FileSystemWritableFileStream-write-manual.https.html": [
+     "eb9708740b584b83065f07b5a68b6c676915bd1d",
+     [
+      null,
+      {}
+     ]
+    ],
+    "showDirectoryPicker-manual.https.html": [
+     "d1abf93eafa47158cce34429eee0d288cc62e9ce",
+     [
+      null,
+      {}
+     ]
+    ],
+    "showOpenFilePicker-manual.https.html": [
+     "fd72b040c0c92d560b5bdcfda169b0c36b2ea098",
+     [
+      null,
+      {}
+     ]
+    ],
+    "showSaveFilePicker-manual.https.html": [
+     "332a1a42730dfa53403f8b7227338261e5162b42",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "fullscreen": {
     "api": {
      "document-exit-fullscreen-manual.html": [
@@ -17429,162 +17585,6 @@
      ]
     ]
    },
-   "native-file-system": {
-    "native_FileSystemBaseHandle-IndexedDB-manual.https.html": [
-     "c68df06de9ac53034f13fc39cbdfb876db29d60e",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-isSameEntry-manual.https.html": [
-     "1d13d8bab6685dee9a6579707bf3e51a2ffe8939",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html": [
-     "07f8d9620d8e9466e63e1faa1f3dce27b2ba7d37",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-Error-manual.https.html": [
-     "19fcb3ea71604d16011b33d49b8fac6db91e4625",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html": [
-     "81e545c5190b5f09e02ddd5034587d2bf5c796a0",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html": [
-     "1b583d0c395d6475565be6516e3d12199362a5dd",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html": [
-     "22d0bf5a72319f24b4b4541054a937e918aa3d8e",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-frames-manual.https.html": [
-     "6d5c5ab78ab8ef8f4fd68d3c6a540b17a4a4ca29",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-windows-manual.https.html": [
-     "ad1e8e7bcf31b200b84f7c2415cea1b308f75052",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemBaseHandle-postMessage-workers-manual.https.html": [
-     "bc1fc5087a61f2df630e23c0e7efaa69ee4c4fab",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html": [
-     "03672321e2d8d7464dbe9a688a69bf78e4dc8f2b",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemDirectoryHandle-getFileHandle-manual.https.html": [
-     "94b31226f8d600ef60c2412203b9b941d60d0930",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemDirectoryHandle-iteration-manual.https.html": [
-     "10d891098dee36fffe58cbc472200add4fb58490",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemDirectoryHandle-removeEntry-manual.https.html": [
-     "cedb87587cee3b68f4edf76060679407f61b3c59",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemDirectoryHandle-resolve-manual.https.html": [
-     "9c001b366b9d24e5d55e88409650b4454f2ddac7",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemFileHandle-getFile-manual.https.html": [
-     "5a0b1d97b05a48c178cf86e6c766565fa87a7ef0",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemWritableFileStream-manual.https.html": [
-     "56ff51cd05a7e7088520ab0fbf77ff378a530b4f",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemWritableFileStream-piped-manual.https.html": [
-     "f6c6e6009aadf2b4c37b7926dfcd06962701fefa",
-     [
-      null,
-      {}
-     ]
-    ],
-    "native_FileSystemWritableFileStream-write-manual.https.html": [
-     "280edc27e5ad6f7a18e5f4c476a189efd6418e43",
-     [
-      null,
-      {}
-     ]
-    ],
-    "showDirectoryPicker-manual.https.html": [
-     "5dadbe1a9d5c605378415f4b5be3f430c634aa5b",
-     [
-      null,
-      {}
-     ]
-    ],
-    "showOpenFilePicker-manual.https.html": [
-     "e6405a9c8c6c0fdea68edf74bd41dfc6572dbd42",
-     [
-      null,
-      {}
-     ]
-    ],
-    "showSaveFilePicker-manual.https.html": [
-     "3a20f1428d903ac518bfbaa668cbc754166eb0ce",
-     [
-      null,
-      {}
-     ]
-    ]
-   },
    "notifications": {
     "body-basic-manual.html": [
      "a479917aeef9f3b777d152148a3b75cb8df7f494",
@@ -129364,6 +129364,58 @@
      ]
     },
     "css-color": {
+     "a98rgb-001.html": [
+      "727a0aef7d83069ebf420fe551cde09fd2033dea",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "a98rgb-002.html": [
+      "930c7692525430119ee5f9897006a3921c2edfa2",
+      [
+       null,
+       [
+        [
+         "/css/css-color/blacksquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "a98rgb-003.html": [
+      "f4ad2b7bd9bd04df12299b39abfc8e51184ee9c4",
+      [
+       null,
+       [
+        [
+         "/css/css-color/a98rgb-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "a98rgb-004.html": [
+      "24c476b7c75c042b9a92c72a57184fdf833e64df",
+      [
+       null,
+       [
+        [
+         "/css/css-color/a98rgb-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-bottom-color.xht": [
       "994bb4e904ccc28fb54865031ffe55c7ec50bac2",
       [
@@ -129845,6 +129897,19 @@
        {}
       ]
      ],
+     "lab-008.html": [
+      "b0510a620ea1ab1afb27af11f7697a1a18af9747",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-display-p3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "lch-001.html": [
       "904e2e5bd7c75dade264e22aa3a145ad56625d67",
       [
@@ -129936,6 +130001,19 @@
        {}
       ]
      ],
+     "lch-008.html": [
+      "feedb9853b93bb03702f24c509a65e9a073cf988",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-display-p3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "named-001.html": [
       "61a98dcb7bb02fab3db18ed337eee5ddb07724fc",
       [
@@ -129988,32 +130066,6 @@
        {}
       ]
      ],
-     "predefined-003.html": [
-      "cb05147f996563d2d35d22fa5ad70b8cab2da1ad",
-      [
-       null,
-       [
-        [
-         "/css/css-color/greensquare-090-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "predefined-004.html": [
-      "6c4399dcf72d8c1ba5b8f47f29f7bc89f411e032",
-      [
-       null,
-       [
-        [
-         "/css/css-color/greensquare-090-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "predefined-005.html": [
       "99b611c063eb878aadaa1adfa788fc506a52a46c",
       [
@@ -130093,7 +130145,7 @@
       ]
      ],
      "predefined-011.html": [
-      "e79a7e46de861143efdefa859c8d5c96d119b7bb",
+      "78065d990f4340ff018d8432a7ba553f9dcb7f87",
       [
        null,
        [
@@ -130106,7 +130158,7 @@
       ]
      ],
      "predefined-012.html": [
-      "76a23ef292178bacb1cf6b757948a480091a479e",
+      "70b92df6bcdd136339641ee089ac4394c469c952",
       [
        null,
        [
@@ -130170,13 +130222,130 @@
        {}
       ]
      ],
-     "predefined-017.html": [
-      "766fdfe0899b883c054b8f6100b6f222eae47fd2",
+     "prophoto-rgb-001.html": [
+      "ca4c866c98fab7fabc7d0a20ac042a409496d77f",
       [
        null,
        [
         [
-         "/css/css-color/greensquare-090-ref.html",
+         "/css/css-color/greensquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "prophoto-rgb-002.html": [
+      "46e5445d04c7454ff3c3931a75b3a7a64e916627",
+      [
+       null,
+       [
+        [
+         "/css/css-color/blacksquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "prophoto-rgb-003.html": [
+      "3a9ede14588c504c34b7ab6c590eecb8311aa753",
+      [
+       null,
+       [
+        [
+         "/css/css-color/prophoto-rgb-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "prophoto-rgb-004.html": [
+      "7912ff6dfb50a811fcf104356029b0a5cba5504d",
+      [
+       null,
+       [
+        [
+         "/css/css-color/prophoto-rgb-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "prophoto-rgb-005.html": [
+      "73e5cc80866d22bf6e0702a41b35800bfd33b0d3",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-display-p3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rec2020-001.html": [
+      "b51a458c11ab8acd4cc3822682cb0399b8c53e69",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rec2020-002.html": [
+      "bca9f50436ed1e77405d715ad58b115e60736d59",
+      [
+       null,
+       [
+        [
+         "/css/css-color/blacksquare-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rec2020-003.html": [
+      "6c6fc9d738b4eccd609ced0c52a1dd91be7e4998",
+      [
+       null,
+       [
+        [
+         "/css/css-color/rec2020-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rec2020-004.html": [
+      "4719ba764ce0017bce56ae5c8ac6cb5b69391859",
+      [
+       null,
+       [
+        [
+         "/css/css-color/rec2020-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rec2020-005.html": [
+      "74e2305e338ad0f4e395748c1cdf2de8e630c1f5",
+      [
+       null,
+       [
+        [
+         "/css/css-color/greensquare-display-p3-ref.html",
          "=="
         ]
        ],
@@ -174345,13 +174514,39 @@
        {}
       ]
      ],
-     "highlight-painting-order.html": [
-      "5a1004e0a074bb62c614c0b9230f9771853d70f2",
+     "highlight-painting-001.html": [
+      "2994527d8d821653b4e106408a0984b7c5031790",
       [
        null,
        [
         [
-         "/css/css-pseudo/highlight-painting-order-ref.html",
+         "/css/css-pseudo/highlight-painting-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "highlight-painting-002.html": [
+      "213e943c000444be934191d7d63b9a356ecf2521",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/highlight-painting-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "highlight-painting-003.html": [
+      "2ac688925439e376cf012e3b50c2d0b38982dce9",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/highlight-painting-003-ref.html",
          "=="
         ]
        ],
@@ -303549,6 +303744,14 @@
       "a0e70aa6539e88373bc8615c3f4e1453010e85d5",
       []
      ],
+     "a98rgb-003-ref.html": [
+      "9db28b6de5aaabe81cc4477f7e4bd048a5d43cab",
+      []
+     ],
+     "a98rgb-004-ref.html": [
+      "3b8771a704a5f79e7062f790c04f0bbd24efb05b",
+      []
+     ],
      "blacksquare-ref.html": [
       "14bc74b33fa848b6f3056adf24fa9645483e7e2e",
       []
@@ -303569,6 +303772,10 @@
       "18bdcf55c47a0710011c58ff1613daba080ed129",
       []
      ],
+     "greensquare-display-p3-ref.html": [
+      "2134c9681f08afa8ef3b657cf2f66c7cd9de6dc7",
+      []
+     ],
      "greensquare-ref.html": [
       "35a31f8f56468e5c273e2a9efd3ab614c6adc977",
       []
@@ -303621,10 +303828,26 @@
       "bab1f80f685f9e52ea74b8b98f5153dcd9516624",
       []
      ],
+     "prophoto-rgb-003-ref.html": [
+      "e938de60345bf348d9092d03af79c16bccec9929",
+      []
+     ],
+     "prophoto-rgb-004-ref.html": [
+      "8c5f24bcf7e47c07e6cd1dc268b8ecbc3dce8cd7",
+      []
+     ],
      "rebeccapurple-ref.html": [
       "8c15364f38e53cc1651f2f6c115c7b2fca3f4ba9",
       []
      ],
+     "rec2020-003-ref.html": [
+      "da95008fcf417e4ad5841c32b2b58a7359b310c3",
+      []
+     ],
+     "rec2020-004-ref.html": [
+      "68068041f9f81ac54c8b90ffd6e8cc4a787992b1",
+      []
+     ],
      "t31-color-currentColor-b-ref.html": [
       "3013c7050c3c6f057e295923d43c87da6c09751f",
       []
@@ -318637,8 +318860,16 @@
       "ecdb308f2f426af4f2763fabb30f7244f42fcf62",
       []
      ],
-     "highlight-painting-order-ref.html": [
-      "827ee9433bec0246425abf9c249135355b3b2490",
+     "highlight-painting-001-ref.html": [
+      "7ca31dbcf99e3538b83954af1b3b8cebd507d68b",
+      []
+     ],
+     "highlight-painting-002-ref.html": [
+      "81bf812d95e76715349b621ad797c1f9abbe707e",
+      []
+     ],
+     "highlight-painting-003-ref.html": [
+      "2be2d97a3da2f62f083c3d38bff8a2b9bb79a64e",
       []
      ],
      "highlight-z-index-001-ref.html": [
@@ -338129,6 +338360,150 @@
      ]
     }
    },
+   "file-system-access": {
+    "META.yml": [
+     "b4eaf1a49c5d1d841b116a4ec272b7b2b60dc87a",
+     []
+    ],
+    "README.md": [
+     "b007264cea5db3c1ad6f2825ae44b149445dcaec",
+     []
+    ],
+    "resources": {
+     "data": {
+      "testfile.txt": [
+       "980a0d5f19a64b4b30a87d4206aade58726b60e3",
+       []
+      ]
+     },
+     "local-fs-test-helpers.js": [
+      "1f944b0ad6a856c2d0881df5a322f5ab7ee4e387",
+      []
+     ],
+     "message-target-dedicated-worker.js": [
+      "26ff23ef8ac65009c3c5efd4bdeda3970ae93910",
+      []
+     ],
+     "message-target-service-worker.js": [
+      "4a6174ae3b5539300954f6f36782a96a066b4889",
+      []
+     ],
+     "message-target-shared-worker.js": [
+      "6829c61d4cf9f32f4834ae09ffba1d614b0430a0",
+      []
+     ],
+     "message-target.html": [
+      "32c7f0c56c61d4d2f6e432dd3c38f8afe91f9762",
+      []
+     ],
+     "message-target.js": [
+      "1e9ef636a33a2203dab7560f077c528578a0eeaf",
+      []
+     ],
+     "messaging-blob-helpers.js": [
+      "852f2e2d3213075ce738fbc2bb5ac4a1f4008ad6",
+      []
+     ],
+     "messaging-helpers.js": [
+      "55fc04ab817aeac2ccf13e716030264666b79d97",
+      []
+     ],
+     "messaging-serialize-helpers.js": [
+      "ada68f43db50683ec3350e243ebe8da6966e8196",
+      []
+     ],
+     "opaque-origin-sandbox.html": [
+      "63ada267d8cee589989bc7758b0b5378e6af91b9",
+      []
+     ],
+     "sandboxed-fs-test-helpers.js": [
+      "f6cfd4b0aab82d20d4ee422107837240f2e3ae3d",
+      []
+     ],
+     "test-helpers.js": [
+      "27469349cdeaa8eb02fd3b8e19ed9a4cff2a6081",
+      []
+     ]
+    },
+    "script-tests": {
+     "FileSystemBaseHandle-IndexedDB.js": [
+      "855e52f04ddf2f4f8641524010216c6e8c7cdda7",
+      []
+     ],
+     "FileSystemBaseHandle-isSameEntry.js": [
+      "8c0b3521c3faed445e95f4fded160d5ac497e578",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-BroadcastChannel.js": [
+      "6c3ae7d49bc7c9a2cb49c6b214b3ec022a8790d4",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-Error.js": [
+      "0b9dc6b033f379b227aac84d8e9ed63520d50514",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-MessagePort-frames.js": [
+      "89343f3948de3bdfa52ecd9463489dffc6cada32",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-MessagePort-windows.js": [
+      "78b3176bf813d037ed71fad75281ca8cf3e3e191",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-MessagePort-workers.js": [
+      "8e46edc88a9e030b1e963598659eb3148a552b18",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-frames.js": [
+      "009a030a4f01fc4d1c2ba3d9b616cc32c0d27398",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-windows.js": [
+      "83bf8c64297c2962e4cf2f597d16bb26f31f167f",
+      []
+     ],
+     "FileSystemBaseHandle-postMessage-workers.js": [
+      "f7abf65554b783e6a1ab6ee0d3f3b2142d22c991",
+      []
+     ],
+     "FileSystemDirectoryHandle-getDirectoryHandle.js": [
+      "48a4ce4ce69e8f6823db6fdd0c83a2a0c3378f32",
+      []
+     ],
+     "FileSystemDirectoryHandle-getFileHandle.js": [
+      "dddd67a705808c65f759741956c3b2e16114f43d",
+      []
+     ],
+     "FileSystemDirectoryHandle-iteration.js": [
+      "3e721a0f017f0b393dba05a4f3b8dc098f6c0698",
+      []
+     ],
+     "FileSystemDirectoryHandle-removeEntry.js": [
+      "5b25ed6874fe95d4b076af974d5d2d27e471378d",
+      []
+     ],
+     "FileSystemDirectoryHandle-resolve.js": [
+      "a8900f97e54523f29bdc9afcd021d32c9dbb0e08",
+      []
+     ],
+     "FileSystemFileHandle-getFile.js": [
+      "80593418bb1622b76e440a1c55cd745c59b8a582",
+      []
+     ],
+     "FileSystemWritableFileStream-piped.js": [
+      "64637c9febf4027d3368d0f589b542c321ed424b",
+      []
+     ],
+     "FileSystemWritableFileStream-write.js": [
+      "141a9771d2a93201b0484a2f4104795c5364b315",
+      []
+     ],
+     "FileSystemWritableFileStream.js": [
+      "1cebb993556f0da7785e9f9df8b3d47f4d4229cd",
+      []
+     ]
+    }
+   },
    "focus": {
     "support": {
      "activeelement-after-focusing-different-site-iframe-inner-contentwindow.html": [
@@ -342535,6 +342910,10 @@
       "universal-worker.js": [
        "5d46edcde24c1854c19069d967038c493d7e24f0",
        []
+      ],
+      "worker-owner-frame.html": [
+       "092fed9604eac35e1ffd31b7c98bcbde5735d088",
+       []
       ]
      },
      "sandbox.https.html.headers": [
@@ -352706,6 +353085,10 @@
      "a9304e90ef886bd9db5356258e84f700418d4393",
      []
     ],
+    "file-system-access.idl": [
+     "3eda19c9d84af81a8eecc5ef3f0ea06753290301",
+     []
+    ],
     "filter-effects.idl": [
      "b17ebf67890981804f7a0fc657fb77a9f0fee748",
      []
@@ -352854,10 +353237,6 @@
      "a41abb55eaeef0abc0695384477f1cd63ddf78ad",
      []
     ],
-    "native-file-system.idl": [
-     "3eda19c9d84af81a8eecc5ef3f0ea06753290301",
-     []
-    ],
     "navigation-timing.idl": [
      "9b0f784231731ce583e2f18290a93303bfa56be2",
      []
@@ -355187,150 +355566,6 @@
      []
     ]
    },
-   "native-file-system": {
-    "META.yml": [
-     "b4eaf1a49c5d1d841b116a4ec272b7b2b60dc87a",
-     []
-    ],
-    "README.md": [
-     "6905a68e7901ce26bc1a363062304e1536604400",
-     []
-    ],
-    "resources": {
-     "data": {
-      "testfile.txt": [
-       "980a0d5f19a64b4b30a87d4206aade58726b60e3",
-       []
-      ]
-     },
-     "message-target-dedicated-worker.js": [
-      "26ff23ef8ac65009c3c5efd4bdeda3970ae93910",
-      []
-     ],
-     "message-target-service-worker.js": [
-      "4a6174ae3b5539300954f6f36782a96a066b4889",
-      []
-     ],
-     "message-target-shared-worker.js": [
-      "6829c61d4cf9f32f4834ae09ffba1d614b0430a0",
-      []
-     ],
-     "message-target.html": [
-      "32c7f0c56c61d4d2f6e432dd3c38f8afe91f9762",
-      []
-     ],
-     "message-target.js": [
-      "98c726eea06610f84ea84f02b8706dc873094575",
-      []
-     ],
-     "messaging-blob-helpers.js": [
-      "852f2e2d3213075ce738fbc2bb5ac4a1f4008ad6",
-      []
-     ],
-     "messaging-helpers.js": [
-      "279c5d1d12f73db773b3806575eac79362a178e4",
-      []
-     ],
-     "messaging-serialize-helpers.js": [
-      "3df2d48e086fcea8deb52183dcea59cc09eafdd1",
-      []
-     ],
-     "native-fs-test-helpers.js": [
-      "1f944b0ad6a856c2d0881df5a322f5ab7ee4e387",
-      []
-     ],
-     "opaque-origin-sandbox.html": [
-      "63ada267d8cee589989bc7758b0b5378e6af91b9",
-      []
-     ],
-     "sandboxed-fs-test-helpers.js": [
-      "a7506b6b2f3d10c2709d161d9e886c748b63f3f0",
-      []
-     ],
-     "test-helpers.js": [
-      "27469349cdeaa8eb02fd3b8e19ed9a4cff2a6081",
-      []
-     ]
-    },
-    "script-tests": {
-     "FileSystemBaseHandle-IndexedDB.js": [
-      "855e52f04ddf2f4f8641524010216c6e8c7cdda7",
-      []
-     ],
-     "FileSystemBaseHandle-isSameEntry.js": [
-      "8c0b3521c3faed445e95f4fded160d5ac497e578",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-BroadcastChannel.js": [
-      "7daf65e39b6f7776c46eb90d671c192b0ba4aca0",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-Error.js": [
-      "c4ae8363cc5041ad940a4365f4c81c33c755eaf2",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-MessagePort-frames.js": [
-      "29258cf65d27ed77700b2fbaadcc52de0282b939",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-MessagePort-windows.js": [
-      "cf70efaf2e7494a184769b39b4fab797aee9e3e8",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-MessagePort-workers.js": [
-      "756660a82a7e561052055453a826bfc74305048f",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-frames.js": [
-      "e34b17fb4140fb5ad5a070989160f5c65041f7e7",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-windows.js": [
-      "877795bbd2333d987bf43153e4a30e251c02ffbd",
-      []
-     ],
-     "FileSystemBaseHandle-postMessage-workers.js": [
-      "db8e55491f230c1d3767bf2c57625ffc08bb7d09",
-      []
-     ],
-     "FileSystemDirectoryHandle-getDirectoryHandle.js": [
-      "48a4ce4ce69e8f6823db6fdd0c83a2a0c3378f32",
-      []
-     ],
-     "FileSystemDirectoryHandle-getFileHandle.js": [
-      "dddd67a705808c65f759741956c3b2e16114f43d",
-      []
-     ],
-     "FileSystemDirectoryHandle-iteration.js": [
-      "3e721a0f017f0b393dba05a4f3b8dc098f6c0698",
-      []
-     ],
-     "FileSystemDirectoryHandle-removeEntry.js": [
-      "5b25ed6874fe95d4b076af974d5d2d27e471378d",
-      []
-     ],
-     "FileSystemDirectoryHandle-resolve.js": [
-      "a8900f97e54523f29bdc9afcd021d32c9dbb0e08",
-      []
-     ],
-     "FileSystemFileHandle-getFile.js": [
-      "80593418bb1622b76e440a1c55cd745c59b8a582",
-      []
-     ],
-     "FileSystemWritableFileStream-piped.js": [
-      "64637c9febf4027d3368d0f589b542c321ed424b",
-      []
-     ],
-     "FileSystemWritableFileStream-write.js": [
-      "141a9771d2a93201b0484a2f4104795c5364b315",
-      []
-     ],
-     "FileSystemWritableFileStream.js": [
-      "1cebb993556f0da7785e9f9df8b3d47f4d4229cd",
-      []
-     ]
-    }
-   },
    "native-io": {
     "META.yml": [
      "22a45c20c9b847433b0f7d9b793d8c1a96f17336",
@@ -418202,21 +418437,21 @@
      },
      "aspect-ratio": {
       "parsing": {
-       "contain-intrinsic-size-computed.html": [
+       "aspect-ratio-computed.html": [
         "d98f6d1dcee3d7f06e11ba024c3f881d011b4495",
         [
          null,
          {}
         ]
        ],
-       "contain-intrinsic-size-invalid.html": [
+       "aspect-ratio-invalid.html": [
         "d85df5a844850d354621e835134a5c81d8b77ea7",
         [
          null,
          {}
         ]
        ],
-       "contain-intrinsic-size-valid.html": [
+       "aspect-ratio-valid.html": [
         "e825b7cdb451f0d71efc0c78ae78ed3bad2d142d",
         [
          null,
@@ -458992,6 +459227,883 @@
      ]
     }
    },
+   "file-system-access": {
+    "idlharness.https.any.js": [
+     "ab182537356a8234e2d826ad64c5e1bd9954eabd",
+     [
+      "file-system-access/idlharness.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "file-system-access/idlharness.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "opaque-origin.https.window.js": [
+     "8f431a24062c11d9d4d90984e9b1580369dff001",
+     [
+      "file-system-access/opaque-origin.https.window.html",
+      {}
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js": [
+     "7f0fc4a7212db3c4bc19f59d0ce265ccf5536bae",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "/IndexedDB/support-promises.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-IndexedDB.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "/IndexedDB/support-promises.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-IndexedDB.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js": [
+     "67d36dfae8ae05a4013af598ec72cda89f964628",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-isSameEntry.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-isSameEntry.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js": [
+     "ca25b548cbbb4920bda1175c7af160b95b4de0f7",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/service-workers/service-worker/resources/test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js": [
+     "16a7002a2add7950393756074cc8a94e4b21c5a8",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "/service-workers/service-worker/resources/test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-Error.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js": [
+     "612c823295b6a338d48160e662dae424904b9b2c",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js": [
+     "28cec810ee34906bf7566900b3993c8ea57f2ab9",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js": [
+     "1599ba969d87b54ee870ad2732466fa272658813",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/service-workers/service-worker/resources/test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js": [
+     "a0e41c51b181e0d787876811ae4e5949afcc7117",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-frames.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js": [
+     "1e3de1ea399cf4b75531f3cf3a6c10242ca6c4f9",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-windows.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js": [
+     "e690682b6ff7c388cfd8875665997f6b2e6f6283",
+     [
+      "file-system-access/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/service-workers/service-worker/resources/test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-blob-helpers.js"
+        ],
+        [
+         "script",
+         "resources/messaging-serialize-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemBaseHandle-postMessage-workers.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ]
+    ],
+    "sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js": [
+     "69ca2bf3677f25e2fac3dcc130894d783bc62231",
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js": [
+     "afe362e757cf9ac98e840c31003a8a85d20100e5",
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-getFileHandle.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-getFileHandle.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemDirectoryHandle-iteration.https.any.js": [
+     "3961ea3ea86cd209d69485e8301850db193f5c8d",
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-iteration.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-iteration.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js": [
+     "a4be8bd267e743ee617c29c1cce1188e6b9d377a",
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-removeEntry.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-removeEntry.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemDirectoryHandle-resolve.https.any.js": [
+     "6ee32709307cb930c8d56374841792fd70235915",
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-resolve.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemDirectoryHandle-resolve.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemFileHandle-getFile.https.any.js": [
+     "fb93858fe7934b27244fa0ff828eac75c34b6629",
+     [
+      "file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemFileHandle-getFile.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemFileHandle-getFile.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemWritableFileStream-piped.https.any.js": [
+     "eed6a561dc40e658b6b6c8d51766cdacc42a024c",
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "../streams/resources/recording-streams.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream-piped.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "../streams/resources/recording-streams.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream-piped.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemWritableFileStream-write.https.any.js": [
+     "7ef0ea0ef82626eae74f152b94f898859aca6832",
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream-write.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream-write.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sandboxed_FileSystemWritableFileStream.https.any.js": [
+     "16dbbe6a808a603c9b81482f733dcf09e84670ff",
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "file-system-access/sandboxed_FileSystemWritableFileStream.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ],
+        [
+         "script",
+         "resources/sandboxed-fs-test-helpers.js"
+        ],
+        [
+         "script",
+         "script-tests/FileSystemWritableFileStream.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "showPicker-errors.https.window.js": [
+     "2310c323d9f37d317a65e2bb6cdcc001ebfa3568",
+     [
+      "file-system-access/showPicker-errors.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "resources/test-helpers.js"
+        ]
+       ]
+      }
+     ]
+    ]
+   },
    "focus": {
     "activeelement-after-focusing-different-site-iframe-contentwindow.html": [
      "b16280acbd7a85abb183d6c23c7508f6ce2fe17f",
@@ -480933,6 +482045,15 @@
        }
       ]
      ],
+     "reporting-to-owner.https.html": [
+      "03f7b3197dab5c4b97c0bfd91836ec3018c92443",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "require-corp-about-blank.https.html": [
       "945333b83d54cf2148070f1a842e11155a14434c",
       [
@@ -507496,883 +508617,6 @@
      ]
     ]
    },
-   "native-file-system": {
-    "idlharness.https.any.js": [
-     "9e7b52261ced9aef9a517b8db02788ce2e11ef6b",
-     [
-      "native-file-system/idlharness.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "native-file-system/idlharness.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "opaque-origin.https.window.js": [
-     "8f431a24062c11d9d4d90984e9b1580369dff001",
-     [
-      "native-file-system/opaque-origin.https.window.html",
-      {}
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js": [
-     "7f0fc4a7212db3c4bc19f59d0ce265ccf5536bae",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "/IndexedDB/support-promises.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-IndexedDB.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "/IndexedDB/support-promises.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-IndexedDB.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js": [
-     "67d36dfae8ae05a4013af598ec72cda89f964628",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-isSameEntry.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-isSameEntry.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js": [
-     "ca25b548cbbb4920bda1175c7af160b95b4de0f7",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/service-workers/service-worker/resources/test-helpers.sub.js"
-        ],
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js": [
-     "16a7002a2add7950393756074cc8a94e4b21c5a8",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/common/get-host-info.sub.js"
-        ],
-        [
-         "script",
-         "/service-workers/service-worker/resources/test-helpers.sub.js"
-        ],
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-Error.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js": [
-     "612c823295b6a338d48160e662dae424904b9b2c",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js": [
-     "28cec810ee34906bf7566900b3993c8ea57f2ab9",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js": [
-     "1599ba969d87b54ee870ad2732466fa272658813",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/service-workers/service-worker/resources/test-helpers.sub.js"
-        ],
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js": [
-     "a0e41c51b181e0d787876811ae4e5949afcc7117",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-frames.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js": [
-     "1e3de1ea399cf4b75531f3cf3a6c10242ca6c4f9",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-windows.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js": [
-     "e690682b6ff7c388cfd8875665997f6b2e6f6283",
-     [
-      "native-file-system/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/service-workers/service-worker/resources/test-helpers.sub.js"
-        ],
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-blob-helpers.js"
-        ],
-        [
-         "script",
-         "resources/messaging-serialize-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemBaseHandle-postMessage-workers.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js": [
-     "69ca2bf3677f25e2fac3dcc130894d783bc62231",
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js": [
-     "afe362e757cf9ac98e840c31003a8a85d20100e5",
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-getFileHandle.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-getFileHandle.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemDirectoryHandle-iteration.https.any.js": [
-     "3961ea3ea86cd209d69485e8301850db193f5c8d",
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-iteration.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-iteration.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js": [
-     "a4be8bd267e743ee617c29c1cce1188e6b9d377a",
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-removeEntry.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-removeEntry.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemDirectoryHandle-resolve.https.any.js": [
-     "6ee32709307cb930c8d56374841792fd70235915",
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-resolve.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemDirectoryHandle-resolve.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemFileHandle-getFile.https.any.js": [
-     "fb93858fe7934b27244fa0ff828eac75c34b6629",
-     [
-      "native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemFileHandle-getFile.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemFileHandle-getFile.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemWritableFileStream-piped.https.any.js": [
-     "eed6a561dc40e658b6b6c8d51766cdacc42a024c",
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "../streams/resources/recording-streams.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream-piped.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "../streams/resources/recording-streams.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream-piped.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemWritableFileStream-write.https.any.js": [
-     "7ef0ea0ef82626eae74f152b94f898859aca6832",
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream-write.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream-write.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "sandboxed_FileSystemWritableFileStream.https.any.js": [
-     "16dbbe6a808a603c9b81482f733dcf09e84670ff",
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "native-file-system/sandboxed_FileSystemWritableFileStream.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ],
-        [
-         "script",
-         "resources/sandboxed-fs-test-helpers.js"
-        ],
-        [
-         "script",
-         "script-tests/FileSystemWritableFileStream.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "showPicker-errors.https.window.js": [
-     "2310c323d9f37d317a65e2bb6cdcc001ebfa3568",
-     [
-      "native-file-system/showPicker-errors.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/test-helpers.js"
-        ]
-       ]
-      }
-     ]
-    ]
-   },
    "native-io": {
     "close_async.tentative.https.any.js": [
      "1a7c680084cebea00be6910306dc276378ac2050",
@@ -513930,7 +514174,7 @@
      ]
     ],
     "pointerevent_mouse_capture_change_hover.html": [
-     "10b19f8474a95126302f824390302007a4f63fea",
+     "ef824dafd963bc97f59283d833d0e0cb4fe97fc8",
      [
       null,
       {
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/css-color/a98rgb-001.html.ini b/tests/wpt/metadata/css/css-color/a98rgb-001.html.ini
new file mode 100644
index 00000000000..c0412287e8f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/a98rgb-001.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/a98rgb-002.html.ini b/tests/wpt/metadata/css/css-color/a98rgb-002.html.ini
new file mode 100644
index 00000000000..3cb975053cc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/a98rgb-002.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/a98rgb-003.html.ini b/tests/wpt/metadata/css/css-color/a98rgb-003.html.ini
new file mode 100644
index 00000000000..efaef3ffbca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/a98rgb-003.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/a98rgb-004.html.ini b/tests/wpt/metadata/css/css-color/a98rgb-004.html.ini
new file mode 100644
index 00000000000..ed53efef804
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/a98rgb-004.html.ini
@@ -0,0 +1,2 @@
+[a98rgb-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/lab-008.html.ini b/tests/wpt/metadata/css/css-color/lab-008.html.ini
new file mode 100644
index 00000000000..94a9d48106f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/lab-008.html.ini
@@ -0,0 +1,2 @@
+[lab-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/lch-008.html.ini b/tests/wpt/metadata/css/css-color/lch-008.html.ini
new file mode 100644
index 00000000000..f5f3792d845
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/lch-008.html.ini
@@ -0,0 +1,2 @@
+[lch-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/predefined-003.html.ini b/tests/wpt/metadata/css/css-color/predefined-003.html.ini
deleted file mode 100644
index 7d91835dd2a..00000000000
--- a/tests/wpt/metadata/css/css-color/predefined-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[predefined-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/predefined-004.html.ini b/tests/wpt/metadata/css/css-color/predefined-004.html.ini
deleted file mode 100644
index 40761198c93..00000000000
--- a/tests/wpt/metadata/css/css-color/predefined-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[predefined-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/predefined-017.html.ini b/tests/wpt/metadata/css/css-color/predefined-017.html.ini
deleted file mode 100644
index 60a5bc6f1a3..00000000000
--- a/tests/wpt/metadata/css/css-color/predefined-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[predefined-017.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/prophoto-rgb-001.html.ini b/tests/wpt/metadata/css/css-color/prophoto-rgb-001.html.ini
new file mode 100644
index 00000000000..82ccdc78354
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/prophoto-rgb-001.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/prophoto-rgb-002.html.ini b/tests/wpt/metadata/css/css-color/prophoto-rgb-002.html.ini
new file mode 100644
index 00000000000..d802525d8d2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/prophoto-rgb-002.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/prophoto-rgb-003.html.ini b/tests/wpt/metadata/css/css-color/prophoto-rgb-003.html.ini
new file mode 100644
index 00000000000..a0cc754b85b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/prophoto-rgb-003.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/prophoto-rgb-004.html.ini b/tests/wpt/metadata/css/css-color/prophoto-rgb-004.html.ini
new file mode 100644
index 00000000000..df7b8102e59
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/prophoto-rgb-004.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/prophoto-rgb-005.html.ini b/tests/wpt/metadata/css/css-color/prophoto-rgb-005.html.ini
new file mode 100644
index 00000000000..425c447810e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/prophoto-rgb-005.html.ini
@@ -0,0 +1,2 @@
+[prophoto-rgb-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rec2020-001.html.ini b/tests/wpt/metadata/css/css-color/rec2020-001.html.ini
new file mode 100644
index 00000000000..e77d02899ca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rec2020-001.html.ini
@@ -0,0 +1,2 @@
+[rec2020-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rec2020-002.html.ini b/tests/wpt/metadata/css/css-color/rec2020-002.html.ini
new file mode 100644
index 00000000000..12fbdca64f5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rec2020-002.html.ini
@@ -0,0 +1,2 @@
+[rec2020-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rec2020-003.html.ini b/tests/wpt/metadata/css/css-color/rec2020-003.html.ini
new file mode 100644
index 00000000000..c2b6f1f00f1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rec2020-003.html.ini
@@ -0,0 +1,2 @@
+[rec2020-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rec2020-004.html.ini b/tests/wpt/metadata/css/css-color/rec2020-004.html.ini
new file mode 100644
index 00000000000..4b634f80462
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rec2020-004.html.ini
@@ -0,0 +1,2 @@
+[rec2020-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-color/rec2020-005.html.ini b/tests/wpt/metadata/css/css-color/rec2020-005.html.ini
new file mode 100644
index 00000000000..10efd625a30
--- /dev/null
+++ b/tests/wpt/metadata/css/css-color/rec2020-005.html.ini
@@ -0,0 +1,2 @@
+[rec2020-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 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/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 99896cf2aef..55924c09552 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,21 +312,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 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-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_3.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_3.html.ini
index 385376c7321..51f8272a6de 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_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index dab21cae5d8..d1ca01ebc5f 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    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_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 f4f994c5d6f..7a36937927c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index ecc7be8f573..6ce3405d806 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,30 +2,18 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -38,12 +26,6 @@
   [textarea: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -53,18 +35,51 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-001.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-001.html
new file mode 100644
index 00000000000..727a0aef7d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-001.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: a98-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-a98-rgb">
+<link rel="match" href="greensquare-ref.html">
+<meta name="assert" content="a98-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(a98-rgb 0.281363 0.498012 0.116746); } /* green (sRGB #008000) converted to a98-rgb */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-002.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-002.html
new file mode 100644
index 00000000000..930c7692525
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-002.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: a98-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-a98-rgb">
+<link rel="match" href="blacksquare-ref.html">
+<meta name="assert" content="a98-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(a98-rgb 0 0 0); } /* black (sRGB #000000) converted to a98-rgb */
+</style>
+<body>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-003-ref.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-003-ref.html
new file mode 100644
index 00000000000..9db28b6de5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-003-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: a98-rgb</title>
+<style>
+    body { background-color: grey; }
+    .test { background-color: rgb(99.993% 100% 100%); width: 12em; height: 12em; } /* color(a98-rgb 1 1 1) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-003.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-003.html
new file mode 100644
index 00000000000..f4ad2b7bd9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-003.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: a98-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-a98-rgb">
+<link rel="match" href="a98rgb-003-ref.html">
+<meta name="assert" content="a98-rgb with no alpha">
+<style>
+    body { background-color: grey; }
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(99.993% 100% 100%); width: 12em; height: 6em; margin-bottom: 0; } /* color(a98-rgb 1 1 1) converted to sRGB */
+    .test { background-color: color(a98-rgb 1 1 1); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-004-ref.html
new file mode 100644
index 00000000000..3b8771a704a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-004-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: a98-rgb</title>
+<style>
+    .test { background-color: lab(83.2141% -129.1072 87.1718); width: 12em; height: 12em; } /* color(a98-rgb 0 1 0) converted to Lab */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-004.html b/tests/wpt/web-platform-tests/css/css-color/a98rgb-004.html
new file mode 100644
index 00000000000..24c476b7c75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/a98rgb-004.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: a98-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-a98-rgb">
+<link rel="match" href="a98rgb-004-ref.html">
+<meta name="assert" content="a98-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: lab(83.2141% -129.1072 87.1718); width: 12em; height: 6em; margin-bottom: 0; } /* color(a98-rgb 0 1 0) converted to Lab */
+    .test { background-color: color(a98-rgb 0 1 0); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/greensquare-display-p3-ref.html b/tests/wpt/web-platform-tests/css/css-color/greensquare-display-p3-ref.html
new file mode 100644
index 00000000000..2134c9681f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/greensquare-display-p3-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Green square color(display-p3 0 1 0) reference</title>
+<style>
+    .test { background-color: color(display-p3 0 1 0); width: 12em; height: 12em; }
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-008.html b/tests/wpt/web-platform-tests/css/css-color/lab-008.html
new file mode 100644
index 00000000000..b0510a620ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-008.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
+<link rel="match" href="greensquare-display-p3-ref.html">
+<meta name="assert" content="lab() outside the sRGB gamut">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lab(86.6146% -106.5599 102.8717); } /* green color(display-p3 0 1 0) converted to Lab */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-008.html b/tests/wpt/web-platform-tests/css/css-color/lch-008.html
new file mode 100644
index 00000000000..feedb9853b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-008.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
+<link rel="match" href="greensquare-display-p3-ref.html">
+<meta name="assert" content="lch() outside the sRGB gamut">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: lch(86.6146% 148.1135 136.0089); } /* green color(display-p3 0 1 0) converted to LCH */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-003.html b/tests/wpt/web-platform-tests/css/css-color/predefined-003.html
deleted file mode 100644
index cb05147f996..00000000000
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-003.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Color 4: predefined colorspaces, default srgb, decimal values</title>
-<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
-<link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-090-ref.html">
-<meta name="assert" content="Color function with default srgb value as decimal matches sRGB #009900">
-<style>
-    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
-    .ref { background-color: #009900; width: 12em; height: 6em; margin-bottom: 0}
-    .test {background-color: color(0 0.6 0)}
-</style>
-<body>
-    <p>Test passes if you see a green square, and no red.</p>
-    <p class="ref"> </p>
-    <p class="test"> </p>
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-004.html b/tests/wpt/web-platform-tests/css/css-color/predefined-004.html
deleted file mode 100644
index 6c4399dcf72..00000000000
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-004.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Color 4: predefined colorspaces, default srgb, percent values</title>
-<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
-<link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-090-ref.html">
-<meta name="assert" content="Color function with default srgb value as percent matches sRGB #009900">
-<style>
-    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
-    .ref { background-color: #009900; width: 12em; height: 6em; margin-bottom: 0}
-    .test {background-color: color(0% 60% 0%)}
-</style>
-<body>
-    <p>Test passes if you see a green square, and no red.</p>
-    <p class="ref"> </p>
-    <p class="test"> </p>
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-011.html b/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
index e79a7e46de8..78065d990f4 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-011.html
@@ -8,7 +8,7 @@
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
     .ref { background-color: #009900; width: 12em; height: 6em; margin-bottom: 0}
-    .test {background-color: color(rec2020 0.33033 0.55976 0.14863)}
+    .test {background-color: color(rec2020 0.299218 0.533327 0.120785)}
 </style>
 <body>
     <p>Test passes if you see a green square, and no red.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-012.html b/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
index 76a23ef2921..70b92df6bcd 100644
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
+++ b/tests/wpt/web-platform-tests/css/css-color/predefined-012.html
@@ -8,7 +8,7 @@
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top:0}
     .ref { background-color: #009900; width: 12em; height: 6em; margin-bottom: 0}
-    .test {background-color: color(rec2020 33.033% 55.976% 14.863%)}
+    .test {background-color: color(rec2020 29.9218% 53.3327% 12.0785%)}
 </style>
 <body>
     <p>Test passes if you see a green square, and no red.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-017.html b/tests/wpt/web-platform-tests/css/css-color/predefined-017.html
deleted file mode 100644
index 766fdfe0899..00000000000
--- a/tests/wpt/web-platform-tests/css/css-color/predefined-017.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Color 4: predefined colorspaces, lab</title>
-<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
-<link rel="help" href="https://drafts.csswg.org/css-color-4/#predefined">
-<link rel="match" href="greensquare-090-ref.html">
-<meta name="assert" content="Color function with explicit XYZ percentage value matches sRGB #009900">
-<style>
-    .test { background-color: red; width: 12em; height: 6em; margin-top:0}
-    .ref { background-color: #009900; width: 12em; height: 6em; margin-bottom: 0}
-    .test {background-color: color(xyz 12.266% 22.836% 3.093%)}
-</style>
-<body>
-    <p>Test passes if you see a green square, and no red.</p>
-    <p class="ref"> </p>
-    <p class="test"> </p>
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-001.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-001.html
new file mode 100644
index 00000000000..ca4c866c98f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-001.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: prophoto-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-prophoto-rgb">
+<link rel="match" href="greensquare-ref.html">
+<meta name="assert" content="prophoto-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(prophoto-rgb 0.230479 0.395789 0.129968); } /* green (sRGB #008000) converted to prophoto-rgb */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-002.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-002.html
new file mode 100644
index 00000000000..46e5445d04c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-002.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: prophoto-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-prophoto-rgb">
+<link rel="match" href="blacksquare-ref.html">
+<meta name="assert" content="prophoto-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(prophoto-rgb 0 0 0); } /* black (sRGB #000000) converted to prophoto-rgb */
+</style>
+<body>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003-ref.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003-ref.html
new file mode 100644
index 00000000000..e938de60345
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: prophoto-rgb</title>
+<style>
+    body { background-color: grey; }
+    .test { background-color: lab(100% 0.0131 0.0085); width: 12em; height: 12em; } /* color(prophoto-rgb 1 1 1) converted to Lab */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003.html
new file mode 100644
index 00000000000..3a9ede14588
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: prophoto-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-prophoto-rgb">
+<link rel="match" href="prophoto-rgb-003-ref.html">
+<meta name="assert" content="prophoto-rgb with no alpha">
+<style>
+    body { background-color: grey; }
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: lab(100% 0.0131 0.0085); width: 12em; height: 6em; margin-bottom: 0; } /* color(prophoto-rgb 1 1 1) converted to Lab */
+    .test { background-color: color(prophoto-rgb 1 1 1); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004-ref.html
new file mode 100644
index 00000000000..8c5f24bcf7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: prophoto-rgb</title>
+<style>
+    .test { background-color: lab(87.5745% -186.6921 150.9905); width: 12em; height: 12em; } /* color(prophoto-rgb 0 1 0) converted to Lab */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004.html
new file mode 100644
index 00000000000..7912ff6dfb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: prophoto-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-prophoto-rgb">
+<link rel="match" href="prophoto-rgb-004-ref.html">
+<meta name="assert" content="prophoto-rgb with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: lab(87.5745% -186.6921 150.9905); width: 12em; height: 6em; margin-bottom: 0; } /* color(prophoto-rgb 0 1 0) converted to Lab */
+    .test { background-color: color(prophoto-rgb 0 1 0); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-005.html b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-005.html
new file mode 100644
index 00000000000..73e5cc80866
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-005.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: prophoto-rgb</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-prophoto-rgb">
+<link rel="match" href="greensquare-display-p3-ref.html">
+<meta name="assert" content="prophoto-rgb outside the sRGB gamut">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(prophoto-rgb 0.42444 0.934918 0.190922); } /* green color(display-p3 0 1 0) converted to prophoto-rgb */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-001.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-001.html
new file mode 100644
index 00000000000..b51a458c11a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-001.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: rec2020</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-rec2020">
+<link rel="match" href="greensquare-ref.html">
+<meta name="assert" content="rec2020 with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(rec2020 0.235202 0.431704 0.085432); } /* green (sRGB #008000) converted to rec2020 */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-002.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-002.html
new file mode 100644
index 00000000000..bca9f50436e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-002.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: rec2020</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-rec2020">
+<link rel="match" href="blacksquare-ref.html">
+<meta name="assert" content="rec2020 with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(rec2020 0 0 0); } /* black (sRGB #000000) converted to rec2020 */
+</style>
+<body>
+    <p>Test passes if you see a black square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-003-ref.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-003-ref.html
new file mode 100644
index 00000000000..da95008fcf4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-003-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: rec2020</title>
+<style>
+    body { background-color: grey; }
+    .test { background-color: rgb(99.993% 100% 100%); width: 12em; height: 12em; } /* color(rec2020 1 1 1) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-003.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-003.html
new file mode 100644
index 00000000000..6c6fc9d738b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-003.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: rec2020</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-rec2020">
+<link rel="match" href="rec2020-003-ref.html">
+<meta name="assert" content="rec2020 with no alpha">
+<style>
+    body { background-color: grey; }
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: rgb(99.993% 100% 100%); width: 12em; height: 6em; margin-bottom: 0; } /* color(rec2020 1 1 1) converted to sRGB */
+    .test { background-color: color(rec2020 1 1 1); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-004-ref.html
new file mode 100644
index 00000000000..68068041f9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-004-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: CSS Color 4: rec2020</title>
+<style>
+    .test { background-color: lab(85.7729% -160.7259 109.2319); width: 12em; height: 12em; } /* color(rec2020 0 1 0) converted to Lab */
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-004.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-004.html
new file mode 100644
index 00000000000..4719ba764ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-004.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: rec2020</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-rec2020">
+<link rel="match" href="rec2020-004-ref.html">
+<meta name="assert" content="rec2020 with no alpha">
+<style>
+    .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
+    .ref { background-color: lab(85.7729% -160.7259 109.2319); width: 12em; height: 6em; margin-bottom: 0; } /* color(rec2020 0 1 0) converted to Lab */
+    .test { background-color: color(rec2020 0 1 0); }
+</style>
+<body>
+    <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
+    <div class="ref"></div>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-005.html b/tests/wpt/web-platform-tests/css/css-color/rec2020-005.html
new file mode 100644
index 00000000000..74e2305e338
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/rec2020-005.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: rec2020</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#valdef-color-rec2020">
+<link rel="match" href="greensquare-display-p3-ref.html">
+<meta name="assert" content="rec2020 outside the sRGB gamut">
+<style>
+    .test { background-color: red; width: 12em; height: 12em; }
+    .test { background-color: color(rec2020 0.431836 0.970723 0.079208); } /* green color(display-p3 0 1 0) converted to rec2020 */
+</style>
+<body>
+    <p>Test passes if you see a green square, and no red.</p>
+    <div class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001-ref.html
similarity index 91%
rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001-ref.html
index 827ee9433be..7ca31dbcf99 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001-ref.html
@@ -16,13 +16,15 @@
         line-height: 1;
     }
     p > span {
-        position: absolute;
         color: initial;
         text-shadow: none;
+        position: absolute;
     }
     p > span > span {
         background: #C0C0C0;
         text-shadow: 0.5000em 0.5000em #3838E0;
+        /* force blue to paint over red */
+        position: relative;
     }
 </style>
 <p><span>q<span>uic</span>k</span>quick
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001.html
similarity index 67%
rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001.html
index 5a1004e0a07..2994527d8d8 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001.html
@@ -1,11 +1,12 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>CSS Pseudo-Elements Test: highlight painting order</title>
+<title>CSS Pseudo-Elements Test: highlight painting</title>
 <link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-painting">
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#painting">
 <link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html#painting-order">
-<link rel="match" href="highlight-painting-order-ref.html">
-<meta name="assert" value="highlight overlays are painted in the correct order, including both the element’s shadows and the highlight’s shadows">
+<link rel="match" href="highlight-painting-001-ref.html">
+<meta name="assert" value="::selection overlay is painted in the correct order, including both the element’s shadows and the highlight’s shadows">
+<script src="support/selections.js"></script>
 <style>
     p {
         font-size: 7em;
@@ -27,11 +28,9 @@
 <p>quick
 <script>
     const target = document.querySelector("p");
-    const range = document.createRange();
-    range.selectNodeContents(target);
-    range.setStart(target.childNodes[0], 1);
-    range.setEnd(target.childNodes[0], 4);
-    const selection = getSelection();
-    selection.removeAllRanges();
-    selection.addRange(range);
+    selectRangeWith(range => {
+        range.selectNodeContents(target);
+        range.setStart(target.childNodes[0], 1);
+        range.setEnd(target.childNodes[0], 4);
+    });
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002-ref.html
new file mode 100644
index 00000000000..81bf812d95e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002-ref.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta charset="utf-8">
+<style>
+    :root {
+        writing-mode: vertical-rl;
+    }
+    p {
+        font-size: 7em;
+        text-shadow: 0.1250em 0.1250em #C0C000C0;
+        position: relative;
+        color: transparent;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p > span {
+        color: #E03838C0;
+        text-shadow: none;
+        position: absolute;
+    }
+    p > span > span {
+        color: #707070C0;
+        background: #38E038C0;
+        text-shadow: 0.2500em 0.2500em #3838E0C0;
+        /* force blue to paint over red */
+        position: relative;
+    }
+</style>
+<p><span>q<span>uic</span>k</span>quick
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002.html
new file mode 100644
index 00000000000..213e943c000
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: highlight painting</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-painting">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#painting">
+<link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html#painting-order">
+<link rel="match" href="highlight-painting-002-ref.html">
+<meta name="assert" value="::selection overlay is painted in the correct order, including originating element shadows (but not text proper) where selected">
+<script src="support/selections.js"></script>
+<style>
+    :root {
+        writing-mode: vertical-rl;
+    }
+    p {
+        font-size: 7em;
+        color: #E03838C0;
+        text-shadow: 0.1250em 0.1250em #C0C000C0;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p::selection {
+        color: #707070C0;
+        background: #38E038C0;
+        text-shadow: 0.2500em 0.2500em #3838E0C0;
+    }
+</style>
+<p>quick
+<script>
+    const target = document.querySelector("p");
+    selectRangeWith(range => {
+        range.selectNodeContents(target);
+        range.setStart(target.childNodes[0], 1);
+        range.setEnd(target.childNodes[0], 4);
+    });
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003-ref.html
new file mode 100644
index 00000000000..2be2d97a3da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003-ref.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf-8">
+<style>
+    p {
+        font-size: 7em;
+        width: min-content;
+        height: 0.25em;
+        background: #C0C000C0;
+        position: relative;
+        color: transparent;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p > span {
+        position: absolute;
+    }
+    p > span:nth-child(1) {
+        color: #E03838C0;
+        text-decoration: #C0C000C0 solid line-through;
+    }
+    p > span:nth-child(1) > span {
+        visibility: hidden;
+    }
+    p > span:nth-child(2) {
+        color: transparent;
+    }
+    p > span:nth-child(2) > span {
+        color: #707070C0;
+        background: #38E038C0;
+        text-decoration: #3838E0C0 wavy line-through;
+    }
+</style>
+<p><span>q<span>uic</span>k</span><span>q<span>uic</span>k</span>quick
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003.html
new file mode 100644
index 00000000000..2ac68892543
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: highlight painting</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-painting">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#painting">
+<link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html#painting-order">
+<link rel="match" href="highlight-painting-003-ref.html">
+<meta name="assert" value="::selection overlay background and decorations are independent of those of the originating element, except that originating element decorations are suppressed where selected">
+<script src="support/selections.js"></script>
+<style>
+    p {
+        font-size: 7em;
+        width: min-content;
+        height: 0.25em;
+        color: #E03838C0;
+        background: #C0C000C0;
+        text-decoration: #C0C000C0 solid line-through;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p::selection {
+        color: #707070C0;
+        background: #38E038C0;
+        text-decoration: #3838E0C0 wavy line-through;
+    }
+</style>
+<p>quick
+<script>
+    const target = document.querySelector("p");
+    selectRangeWith(range => {
+        range.selectNodeContents(target);
+        range.setStart(target.childNodes[0], 1);
+        range.setEnd(target.childNodes[0], 4);
+    });
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-computed.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-computed.html
rename to tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-invalid.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-invalid.html
rename to tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-valid.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-valid.html
rename to tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html
diff --git a/tests/wpt/web-platform-tests/native-file-system/META.yml b/tests/wpt/web-platform-tests/file-system-access/META.yml
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/META.yml
rename to tests/wpt/web-platform-tests/file-system-access/META.yml
diff --git a/tests/wpt/web-platform-tests/file-system-access/README.md b/tests/wpt/web-platform-tests/file-system-access/README.md
new file mode 100644
index 00000000000..b007264cea5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/file-system-access/README.md
@@ -0,0 +1,2 @@
+This directory contains tests for the
+[File System Access](https://wicg.github.io/file-system-access/) specification.
diff --git a/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js b/tests/wpt/web-platform-tests/file-system-access/idlharness.https.any.js
similarity index 93%
rename from tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/idlharness.https.any.js
index 9e7b52261ce..ab182537356 100644
--- a/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/file-system-access/idlharness.https.any.js
@@ -5,7 +5,7 @@
 'use strict';
 
 idl_test(
-  ['native-file-system'],
+  ['file-system-access'],
   ['storage', 'permissions', 'streams', 'html', 'dom'],
   idl_array => {
     idl_array.add_objects({
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
index c68df06de9a..211b190aad3 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
 <script src="/IndexedDB/support-promises.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
index 1d13d8bab66..d2ddc2dbdcc 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemBaseHandle-isSameEntry.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
similarity index 91%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
index 07f8d9620d8..f395b0b4c17 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
 <script src="script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
similarity index 92%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
index 19fcb3ea716..67206e35096 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
@@ -9,7 +9,7 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
index 81e545c5190..35f23d8387d 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
index 1b583d0c395..922cbf556a1 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
similarity index 92%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
index 22d0bf5a723..22ef3ba37d3 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
index 6d5c5ab78ab..8eb90827082 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
index ad1e8e7bcf3..2137ea368c9 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
similarity index 91%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
index bc1fc5087a6..619a37cc972 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="resources/messaging-helpers.js"></script>
 <script src="resources/messaging-blob-helpers.js"></script>
 <script src="resources/messaging-serialize-helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
index 03672321e2d..63a88538e8b 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
index 94b31226f8d..d16771bf450 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemDirectoryHandle-getFileHandle.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
index 10d891098de..495ea5e0a09 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemDirectoryHandle-iteration.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
index cedb87587ce..765492e1e86 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemDirectoryHandle-removeEntry.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
index 9c001b366b9..0d539abb54e 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemDirectoryHandle-resolve.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
similarity index 85%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
index 5a0b1d97b05..9d8dede8894 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemFileHandle-getFile.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
similarity index 85%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
index 56ff51cd05a..2db242c708d 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemWritableFileStream.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
similarity index 88%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
index f6c6e6009aa..296f75412e1 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
@@ -6,6 +6,6 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="../streams/resources/recording-streams.js"></script>
 <script src="script-tests/FileSystemWritableFileStream-piped.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
index 280edc27e5a..eb9708740b5 100644
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
@@ -6,5 +6,5 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
-<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/local-fs-test-helpers.js"></script>
 <script src="script-tests/FileSystemWritableFileStream-write.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js b/tests/wpt/web-platform-tests/file-system-access/opaque-origin.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/opaque-origin.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/data/testfile.txt b/tests/wpt/web-platform-tests/file-system-access/resources/data/testfile.txt
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/data/testfile.txt
rename to tests/wpt/web-platform-tests/file-system-access/resources/data/testfile.txt
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/local-fs-test-helpers.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/local-fs-test-helpers.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target-dedicated-worker.js b/tests/wpt/web-platform-tests/file-system-access/resources/message-target-dedicated-worker.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/message-target-dedicated-worker.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/message-target-dedicated-worker.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target-service-worker.js b/tests/wpt/web-platform-tests/file-system-access/resources/message-target-service-worker.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/message-target-service-worker.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/message-target-service-worker.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target-shared-worker.js b/tests/wpt/web-platform-tests/file-system-access/resources/message-target-shared-worker.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/message-target-shared-worker.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/message-target-shared-worker.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target.html b/tests/wpt/web-platform-tests/file-system-access/resources/message-target.html
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/message-target.html
rename to tests/wpt/web-platform-tests/file-system-access/resources/message-target.html
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js b/tests/wpt/web-platform-tests/file-system-access/resources/message-target.js
similarity index 98%
rename from tests/wpt/web-platform-tests/native-file-system/resources/message-target.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/message-target.js
index 98c726eea06..1e9ef636a33 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js
+++ b/tests/wpt/web-platform-tests/file-system-access/resources/message-target.js
@@ -1,8 +1,8 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 // add_message_event_handlers() is the helper function used to setup all
 // message targets, including iframes and workers.
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-blob-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/messaging-blob-helpers.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/messaging-blob-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/messaging-blob-helpers.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/messaging-helpers.js
similarity index 99%
rename from tests/wpt/web-platform-tests/native-file-system/resources/messaging-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/messaging-helpers.js
index 279c5d1d12f..55fc04ab817 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-helpers.js
+++ b/tests/wpt/web-platform-tests/file-system-access/resources/messaging-helpers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // This script depends on the following script:
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/test-helpers.js
 //    /service-workers/service-worker/resources/test-helpers.sub.js
 
 // Define the URL constants used for each type of message target, including
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/messaging-serialize-helpers.js
similarity index 99%
rename from tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/messaging-serialize-helpers.js
index 3df2d48e086..ada68f43db5 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/messaging-serialize-helpers.js
+++ b/tests/wpt/web-platform-tests/file-system-access/resources/messaging-serialize-helpers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // This script depends on the following script:
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 // Serializes an array of FileSystemHandles where each element can be either a
 // FileSystemFileHandle or FileSystemDirectoryHandle.
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html b/tests/wpt/web-platform-tests/file-system-access/resources/opaque-origin-sandbox.html
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html
rename to tests/wpt/web-platform-tests/file-system-access/resources/opaque-origin-sandbox.html
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/sandboxed-fs-test-helpers.js
similarity index 84%
rename from tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/sandboxed-fs-test-helpers.js
index a7506b6b2f3..f6cfd4b0aab 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js
+++ b/tests/wpt/web-platform-tests/file-system-access/resources/sandboxed-fs-test-helpers.js
@@ -3,8 +3,8 @@
 // function in this file will return an empty directory in the sandboxed file
 // system.
 //
-// Another implementation of this function exists in native-fs-test-helpers.js,
-// where that version uses the native file system instead.
+// Another implementation of this function exists in local-fs-test-helpers.js,
+// where that version uses the local file system instead.
 
 async function cleanupSandboxedFileSystem() {
   const dir = await navigator.storage.getDirectory();
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/test-helpers.js b/tests/wpt/web-platform-tests/file-system-access/resources/test-helpers.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/resources/test-helpers.js
rename to tests/wpt/web-platform-tests/file-system-access/resources/test-helpers.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream.https.any.js b/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream.https.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/sandboxed_FileSystemWritableFileStream.https.any.js
rename to tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemWritableFileStream.https.any.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-IndexedDB.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-IndexedDB.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-IndexedDB.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-IndexedDB.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-isSameEntry.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-isSameEntry.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-isSameEntry.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-isSameEntry.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
similarity index 94%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
index 7daf65e39b6..6c3ae7d49bc 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
@@ -1,9 +1,9 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 //    /service-workers/service-worker/resources/test-helpers.sub.js
 
 // Sets up a new broadcast channel in |target|. Posts a message instructing
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
similarity index 96%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
index c4ae8363cc5..0b9dc6b033f 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 //    /common/get-host-info.sub.js
 //    /service-workers/service-worker/resources/test-helpers.sub.js
 
@@ -198,8 +198,8 @@ directory_test(async (t, root_dir) => {
   await do_send_message_error_test(t, root_dir, /*receiver=*/self,
     /*target=*/iframe.contentWindow, /*target_origin=*/'*',
     /*expected_has_source*/true, /*expected_origin=*/location.origin);
-  // Do not test receiving FileSystemHandles from the data URI iframe.
-  // Data URI iframes are insecure and do not expose the NativeFileSystem APIs.
+  // Do not test receiving FileSystemHandles from the data URI iframe. Data URI
+  // iframes are insecure and do not expose the File System Access APIs.
 }, 'Fail to send messages to a data URI iframe.');
 
 directory_test(async (t, root_dir) => {
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
index 29258cf65d2..89343f3948d 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 directory_test(
     async (t, root_dir) => {
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
similarity index 83%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
index cf70efaf2e7..78b3176bf81 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 directory_test(
     async (t, root_dir) => {
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
similarity index 84%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
index 756660a82a7..8e46edc88a9 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 //    /service-workers/service-worker/resources/test-helpers.sub.js
 
 directory_test(
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
similarity index 86%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
index e34b17fb414..009a030a4f0 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 directory_test(async (t, root_dir) => {
   const iframe = await add_iframe(t, {src: kDocumentMessageTarget});
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
similarity index 82%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
index 877795bbd23..83bf8c64297 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 
 directory_test(async (t, root_dir) => {
   const child_window = await open_window(t, kDocumentMessageTarget);
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
similarity index 83%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
index db8e55491f2..f7abf65554b 100644
--- a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js
+++ b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // This script depends on the following scripts:
-//    /native-file-system/resources/messaging-helpers.js
-//    /native-file-system/resources/messaging-blob-helpers.js
-//    /native-file-system/resources/messaging-serialize-helpers.js
-//    /native-file-system/resources/test-helpers.js
+//    /file-system-access/resources/messaging-helpers.js
+//    /file-system-access/resources/messaging-blob-helpers.js
+//    /file-system-access/resources/messaging-serialize-helpers.js
+//    /file-system-access/resources/test-helpers.js
 //    /service-workers/service-worker/resources/test-helpers.sub.js
 
 directory_test(async (t, root_dir) => {
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-getFileHandle.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-getFileHandle.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-getFileHandle.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-getFileHandle.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-iteration.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-iteration.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-iteration.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-iteration.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-removeEntry.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-removeEntry.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-removeEntry.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-removeEntry.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-resolve.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-resolve.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemDirectoryHandle-resolve.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-resolve.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemFileHandle-getFile.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemFileHandle-getFile.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemFileHandle-getFile.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemFileHandle-getFile.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-piped.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream-piped.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-piped.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream-piped.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream-write.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream-write.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream.js b/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/script-tests/FileSystemWritableFileStream.js
rename to tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemWritableFileStream.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/showDirectoryPicker-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/showDirectoryPicker-manual.https.html
similarity index 92%
rename from tests/wpt/web-platform-tests/native-file-system/showDirectoryPicker-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/showDirectoryPicker-manual.https.html
index 5dadbe1a9d5..d1abf93eafa 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showDirectoryPicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/showDirectoryPicker-manual.https.html
@@ -18,7 +18,7 @@
     await new Promise(resolve => step_timeout(resolve, 100));
 
     await window.test_driver.bless(
-      'show a directory picker.<br />Please select native-file-system/resources/data/');
+      'show a directory picker.<br />Please select file-system-access/resources/data/');
     const dir = await self.showDirectoryPicker();
     assert_true(dir instanceof FileSystemHandle);
     assert_true(dir instanceof FileSystemDirectoryHandle);
diff --git a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/showOpenFilePicker-manual.https.html
similarity index 94%
rename from tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/showOpenFilePicker-manual.https.html
index e6405a9c8c6..fd72b040c0c 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/showOpenFilePicker-manual.https.html
@@ -18,7 +18,7 @@
     await new Promise(resolve => step_timeout(resolve, 100));
 
     await window.test_driver.bless(
-      'show a file picker.<br />Please select native-file-system/resources/data/testfile.txt');
+      'show a file picker.<br />Please select file-system-access/resources/data/testfile.txt');
     const files = await self.showOpenFilePicker({
       multiple: false, types: [
         { description: 'Text files', accept: { ' text/plain ': ['.txt'] } },
@@ -40,7 +40,7 @@
 
   promise_test(async t => {
     await window.test_driver.bless(
-      'show a file picker.<br />Please select native-file-system/resources/data/testfile.txt');
+      'show a file picker.<br />Please select file-system-access/resources/data/testfile.txt');
     const files = await self.showOpenFilePicker({
       multiple: false,
       startIn: null,
diff --git a/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js b/tests/wpt/web-platform-tests/file-system-access/showPicker-errors.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
rename to tests/wpt/web-platform-tests/file-system-access/showPicker-errors.https.window.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html b/tests/wpt/web-platform-tests/file-system-access/showSaveFilePicker-manual.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
rename to tests/wpt/web-platform-tests/file-system-access/showSaveFilePicker-manual.https.html
index 3a20f1428d9..332a1a42730 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/file-system-access/showSaveFilePicker-manual.https.html
@@ -11,7 +11,7 @@
 
   promise_test(async t => {
     await window.test_driver.bless(
-      'show a file picker.<br />Please make a copy of native-file-system/resources/data/testfile.txt in a writable directory and pick that file');
+      'show a file picker.<br />Please make a copy of file-system-access/resources/data/testfile.txt in a writable directory and pick that file');
     const file = await self.showSaveFilePicker({
       multiple: false, types: [
         { description: 'Text files', accept: { 'text/plain': ['.txt'] } },
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html
new file mode 100644
index 00000000000..03f7b3197da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-owner.https.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<html>
+<head>
+<title>Check COEP reports are send for 'new Worker()' failure</title>
+<meta name="timeout" content="long">
+</head>
+<body>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script>
+const {ORIGIN} = get_host_info();
+const RESOURCES_PATH= new URL("resources", location).pathname;
+const iframe_path = "worker-owner-frame.html?pipe=";
+const worker_path = "universal-worker.js?pipe=";
+
+const coep_header= {
+  "coep-none"         : "",
+  "coep-report-only"  :
+    "header(Cross-Origin-Embedder-Policy-Report-Only,require-corp)",
+  "coep-require-corp" : "|header(Cross-Origin-Embedder-Policy,require-corp)",
+};
+
+function checkReport(report, url, blocked_url, disposition) {
+  assert_equals(report.type, "coep");
+  assert_equals(report.url, url);
+  assert_equals(report.body.type, "worker initialization");
+  assert_equals(report.body.blockedURL, blocked_url);
+  assert_equals(report.body.disposition, disposition);
+}
+
+// Test parameters:
+// - `iframe_coep` the COEP header of the iframe's document response.
+// - `worker_coep` the COEP header of the DedicatedWorker's script response.
+//
+// Test expectations:
+// - `length` the length of reports.
+// - `disposition`  the disposition in a report's body. Empty string if the
+//                  length of reports is expected to be 0.
+function check(
+  // Test parameters:
+  iframe_coep,
+  worker_coep,
+  // Test expectations:
+  length,
+  disposition) {
+  promise_test(async (t) => {
+    const worker_url = worker_path + coep_header[worker_coep];
+    const iframe_url = iframe_path + coep_header[iframe_coep];
+    const iframe = await with_iframe("./resources/" + iframe_url);
+    t.add_cleanup(() => iframe.remove());
+
+    const iframe_response = new Promise(resolve => window.onmessage = resolve);
+    iframe.contentWindow.startWorkerAndObserveReports(worker_url, length > 0);
+
+    const {data} = await iframe_response;
+    assert_equals(data.length, length);
+    if (data.length > 0) {
+      const blocked_url = `${ORIGIN}${RESOURCES_PATH}/${worker_url}`;
+      const url = `${ORIGIN}${RESOURCES_PATH}/${iframe_url}`;
+      checkReport(
+        data[0],
+        url,
+        blocked_url,
+        disposition
+      );
+    }
+  }, `Reporting to ${iframe_coep} frame with ${worker_coep} worker`);
+}
+
+// -----------------------------------------------------------------------------
+//    iframe_coep         , worker_coep         , length  , disposition
+// -----------------------------------------------------------------------------
+check("coep-none"         , "coep-none"         , 0       , "");
+check("coep-none"         , "coep-report-only"  , 0       , "");
+check("coep-none"         , "coep-require-corp" , 0       , "");
+check("coep-report-only"  , "coep-none"         , 1       , "reporting");
+check("coep-report-only"  , "coep-report-only"  , 1       , "reporting");
+check("coep-report-only"  , "coep-require-corp" , 0       , "");
+check("coep-require-corp" , "coep-none"         , 1       , "enforce");
+check("coep-require-corp" , "coep-report-only"  , 1       , "enforce");
+check("coep-require-corp" , "coep-require-corp" , 0       , "");
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html
new file mode 100644
index 00000000000..092fed9604e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<script>
+function startWorkerAndObserveReports(worker_url, wait_for_report) {
+  const worker = new Worker(worker_url);
+  const result_promise = new Promise(resolve => {
+    worker.onmessage = _ => resolve('success');
+    worker.onerror = _ => resolve('error');
+  });
+  worker.postMessage("postMessage('reply to frame from worker');");
+
+  const report_promise = new Promise(resolve => {
+    const observer = new ReportingObserver(reports => {
+      observer.disconnect();
+      resolve(reports.map(r => r.toJSON()));
+    });
+    observer.observe();
+  });
+
+  if (wait_for_report) {
+    Promise.all([result_promise, report_promise]).then(results => {
+      parent.postMessage(results[1]);
+    });
+  } else {
+    result_promise.then(result => {
+      parent.postMessage([]);
+    });
+  }
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/native-file-system.idl b/tests/wpt/web-platform-tests/interfaces/file-system-access.idl
similarity index 100%
rename from tests/wpt/web-platform-tests/interfaces/native-file-system.idl
rename to tests/wpt/web-platform-tests/interfaces/file-system-access.idl
diff --git a/tests/wpt/web-platform-tests/native-file-system/README.md b/tests/wpt/web-platform-tests/native-file-system/README.md
deleted file mode 100644
index 6905a68e790..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains (tentative) tests for the
-[Native File System](https://wicg.github.io/native-file-system/) specification.
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html
index 10b19f8474a..ef824dafd96 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html
@@ -69,6 +69,7 @@ function run() {
     document.addEventListener("pointerdown", setCaptureGreen);
 
     await new test_driver.Actions()
+                         .addPointer("mouse")
                          .pointerMove(25, 25, {origin: green})
                          .pointerDown()
                          .pointerMove(30, 30, {origin: green})
@@ -88,22 +89,23 @@ function run() {
     assert_equals(getComputedStyle(blue).backgroundColor, "rgb(0, 0, 255)", "blue should be blue.");
     document.removeEventListener("pointerdown", setCaptureGreen);
     // Release mouse button.
-    await new test_driver.Actions().pointerUp().send();
+    await new test_driver.Actions().addPointer("mouse").pointerUp().send();
   }, "Mouse down and capture to green.");
 
   promise_test (async() => {
     // Move to (0, 0) to reset hovering.
-    await new test_driver.Actions().pointerMove(0, 0).send();
+    await new test_driver.Actions().addPointer("mouse").pointerMove(0, 0).send();
     receivedEventList = [];
 
     // pointerdown at green -> set capture to blue -> blue receive the following moves.
     document.addEventListener("pointerdown", setCaptureBlue);
 
     await new test_driver.Actions()
+                         .addPointer("mouse")
                          .pointerMove(25, 25, {origin: green})
                          .pointerDown()
                          .pointerMove(30, 30, {origin: green})
-                         .pointerMove(30, 30, {origin: green})
+                         .pointerMove(31, 31, {origin: green})
                          .send();
 
     expectedEventList = ["green received pointerover",
@@ -123,12 +125,12 @@ function run() {
     assert_equals(getComputedStyle(blue).backgroundColor, "rgb(255, 0, 0)", "blue should be red (hover).");
     document.removeEventListener("pointerdown", setCaptureBlue);
     // Release mouse button.
-    await new test_driver.Actions().pointerUp().send();
+    await new test_driver.Actions().addPointer("mouse").pointerUp().send();
   }, "Mouse down at green and capture to blue.");
 
   promise_test (async() => {
     // Move to (0, 0) to reset hovering.
-    await new test_driver.Actions().pointerMove(0, 0).send();
+    await new test_driver.Actions().addPointer("mouse").pointerMove(0, 0).send();
     receivedEventList = [];
 
     // pointerdown at green -> set capture to green -> green receive first move -> release capture -> blue receive the next move
@@ -136,6 +138,7 @@ function run() {
     green.addEventListener("pointermove", releaseCapture);
 
     await new test_driver.Actions()
+                         .addPointer("mouse")
                          .pointerMove(25, 25, {origin: green})
                          .pointerDown()
                          .pointerMove(30, 30, {origin: blue})
@@ -161,7 +164,7 @@ function run() {
     green.removeEventListener("pointerdown", setCaptureBlue);
     green.removeEventListener("pointermove", releaseCapture);
     // Release mouse button.
-    await new test_driver.Actions().pointerUp().send();
+    await new test_driver.Actions().addPointer("mouse").pointerUp().send();
   }, "Mouse down and capture to green, move to blue and release capture");
 }
 </script>